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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 60 insertions, 2 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/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