Fix bug 270807 by Duncan <1i5t5.duncan@cox.net>. autoreconf needs the gconf-2 macro file even with USE=-gcdmaster. Patched into acinclude.m4.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 63 insertions, 4 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 20fd1328d06a..da5923b7ff25 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.130 2009/05/22 05:07:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.131 2009/05/22 20:50:01 loki_val Exp $
+
+  22 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  cdrdao-1.2.3_rc2.ebuild, +files/cdrdao-1.2.3-autoconf-update.patch:
+  Fix bug 270807 by Duncan <1i5t5.duncan@cox.net>. autoreconf needs the
+  gconf-2 macro file even with USE=-gcdmaster. Patched into acinclude.m4.
 
 *cdrdao-1.2.3_rc2 (22 May 2009)
 
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 885c015f54b5..faeb60301c1b 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -6,6 +6,7 @@ AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d
 AUX cdrdao-1.2.2-toc2cue.patch 629 RMD160 b53522e02d545848b586303d95d94083ef20946b SHA1 15c2ff1a8e226f60050d5ac7bd7e37420087c1be SHA256 b3a4d3a88e4a53571480195d7167541b80c2142db1537d57c63522d9e1d39164
 AUX cdrdao-1.2.2-tocparser.patch 907 RMD160 90d1e2796d33f206e77e20be3a39693f04c2ff7d SHA1 41eaaac74873d554d4fc922c69e2b9e3999bb89f SHA256 bef2e99cf391ffe9724cee2e0849a880b44e53e0e98d48248da0205899a3a4b0
 AUX cdrdao-1.2.2-use-new-sigc++-API.patch 481 RMD160 48f39ef4b6f9db81a00b6fbbe6b44c0f0cd49a5b SHA1 092bd7a492026d5dd47e9c2ff9e2b2acf3f8a3bc SHA256 3d0159dfa815c92f82d16407977fe875f005224d28ccc00238a73df2474bba63
+AUX cdrdao-1.2.3-autoconf-update.patch 1988 RMD160 69dcb4f730fa6bd11e9558d41a79e023742f7274 SHA1 00e9b111c50e381f8cb4fcbc837cc4293dc21648 SHA256 2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74
 AUX cdrdao-1.2.3-gcc44.patch 726 RMD160 7499c6b1f9549b2143744cefd0aa943b815e7be4 SHA1 da12a8a436d46ddd8c962e3954cca4ac25ed8b10 SHA256 cb98595d20dbd41ed8f9c71e02914fa5f94529e289b71433b126c36828b1411f
 AUX cdrdao-1.2.3-k3b.patch 380 RMD160 81115cf91fc8b9f63b0cdbc463329a350ba83c33 SHA1 e4f9fc95df1e1084791146e1dc0c040f6cdf873e SHA256 6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0
 AUX cdrdao-1.2.3-pkg-config.patch 488 RMD160 8e01ba0009de4ff1a7509ea2529116cb68764e51 SHA1 3ba7170c1959086fa83280571eb92c1bb4ad0c19 SHA256 8627b0ada00732cac93dfad873890184ebc9df11794018b231e3641b428b541a
@@ -15,6 +16,6 @@ DIST cdrdao-1.2.2.tar.bz2 1408344 RMD160 c537c535a4106655f89f7cfa5895ffcb5b9464e
 DIST cdrdao-1.2.3rc2.tar.bz2 1435808 RMD160 60410652940fd271b272b74d4554986c86115787 SHA1 d23c756400f728cecbcc901ecadb1eea44c70e97 SHA256 2cd174111ed3de68d3b93333ae85cd376455598d6d355bcef94771bf047a5e08
 EBUILD cdrdao-1.2.2-r2.ebuild 2099 RMD160 11a65ea4439b883339fa195ff135a415487aa2fe SHA1 bbdfc4f5160bc1ba3590559f438a6b58a6df3a9c SHA256 4ef6d4fc2323dd18fb7bdab6c340a0b4a746f75bdaece5d8af2c7ee637e3d81a
 EBUILD cdrdao-1.2.2-r3.ebuild 2871 RMD160 59b32675dc9e3307734bce4cb422126104c744a8 SHA1 3fb2dee06ac774707c1440bf2878969b107e9c00 SHA256 7bce2f1a73405a7822e01a843cc56dac9bc00f7d82843ab2a5b25d3e3bc70e26
-EBUILD cdrdao-1.2.3_rc2.ebuild 2183 RMD160 5a4857e37d865e010934791ea88ae0edeb41c39d SHA1 e454297364cbc2dee0724e30846a864efb0e9be8 SHA256 faf872e32d9ac57fdd0e23f096487b96a3495c8fa5097d5ee18696e75f815cfd
-MISC ChangeLog 17951 RMD160 4a08c72e7d699ce188715d87312dccd23e9c67e0 SHA1 9a02aed85604ad2c2342b23a974965471d601bd9 SHA256 012f32bc922e37b4165698bcd4d5818baed172144d8c79196e02d2c63af0b95b
+EBUILD cdrdao-1.2.3_rc2.ebuild 2239 RMD160 a0ff5ccb8fae14a07423931588c1f018410e2cdf SHA1 41c00f624f4f0bb98f2bd1c56588353910183acf SHA256 b08016bbd3c1ba63c0155f3963f149ae242dded3898368cf3d964cc47848a5c7
+MISC ChangeLog 18221 RMD160 ce4d3d0b21a37c478e39c33f592457125f7bc2c8 SHA1 36946a0fcbf18b61de39674ae1f53e373248833f SHA256 e93f9a03d35604a0445de878272256ee6eca97e43019717a61a21153e736ffa6
 MISC metadata.xml 500 RMD160 79fdf7f14c4f6005c79b4f676e2f48490d7a7b1c SHA1 3f3774af0497ff0d9f6d36047dec11541b9f9f26 SHA256 fe82d0fc06eec0e484da4786b5829d5d17b84e2b7f39cc5d190d86a6e376e935
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
index b515cc78677f..a894555ad39c 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild,v 1.1 2009/05/22 05:07:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild,v 1.2 2009/05/22 20:50:01 loki_val Exp $
 
 EAPI=2
 inherit eutils flag-o-matic eutils autotools
@@ -60,6 +60,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-1.2.3-gcc44.patch
 	epatch "${FILESDIR}"/${PN}-1.2.3-pkg-config.patch
+	epatch "${FILESDIR}"/${PN}-1.2.3-autoconf-update.patch
 
 	epatch "${FILESDIR}"/${PN}-1.2.3-k3b.patch
 	eautoreconf
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch
new file mode 100644
index 000000000000..4eb1ade7e71e
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch
@@ -0,0 +1,52 @@
+--- cdrdao-1.2.3rc2/acinclude.m4.orig	2009-02-21 11:30:02.000000000 +0100
++++ cdrdao-1.2.3rc2/acinclude.m4	2009-05-22 22:38:15.448770972 +0200
+@@ -1,5 +1,49 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl  you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  else
++    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++  fi
++
++  AC_ARG_WITH([gconf-source],
++	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
++			     [Config database for installing schema files.]),
++	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
++
++  AC_ARG_WITH([gconf-schema-file-dir],
++	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++			     [Directory for installing schema files.]),
++	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++  AC_ARG_ENABLE(schemas-install,
++  	AC_HELP_STRING([--disable-schemas-install],
++		       [Disable the schemas installation]),
++     [case ${enableval} in
++       yes|no) ;;
++       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++      esac])
++  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
+ # Configure paths for GTK--
+ # Erik Andersen	30 May 1998
+ # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+ 
+ dnl Check and configure include and link paths for lame library