Fix bug #278354, backport gconf-2.m4 from aclocal system dir to m4/ source directory, in case where gconf is not installed on the system

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

3 files changed, 72 insertions, 2 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 952ca6209e6a..882fa310087a 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.24 2009/07/19 17:29:45 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.25 2009/07/21 06:17:23 mrpouet Exp $
+
+  21 Jul 2009; Romain Perier <mrpouet@gentoo.org> libcanberra-0.14.ebuild,
+  +files/libcanberra-0.14-am-gconf-source-2-m4.patch:
+  Fix bug #278354, backport gconf-2.m4 from aclocal system dir to m4/ source
+  directory, in case where gconf is not installed on the system
 
   20 Jul 2009; Romain Perier <mrpouet@gentoo.org> libcanberra-0.14.ebuild:
   Fix bug #278269, src_unpack() failed due to unnecessary quotes around rm
diff --git a/media-libs/libcanberra/files/libcanberra-0.14-am-gconf-source-2-m4.patch b/media-libs/libcanberra/files/libcanberra-0.14-am-gconf-source-2-m4.patch
new file mode 100644
index 000000000000..9d4b096d261c
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.14-am-gconf-source-2-m4.patch
@@ -0,0 +1,57 @@
+backport copy of /usr/share/aclocal/gconf-2.m4 into m4/ source directory,
+in case where gconf isn't installed on the system.
+Never use aclocal.m4 as reference , see diego's blog about that.
+
+ m4/gconf-2.m4 |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 44 insertions(+), 0 deletions(-)
+
+diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4
+new file mode 100644
+index 0000000..4a0936e
+--- /dev/null
++++ m4/gconf-2.m4
+@@ -0,0 +1,44 @@
++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])
++])
diff --git a/media-libs/libcanberra/libcanberra-0.14.ebuild b/media-libs/libcanberra/libcanberra-0.14.ebuild
index 146163ada264..463b6122ac82 100644
--- a/media-libs/libcanberra/libcanberra-0.14.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.14.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/media-libs/libcanberra/libcanberra-0.14.ebuild,v 1.4 2009/07/19 17:29:45 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.14.ebuild,v 1.5 2009/07/21 06:17:23 mrpouet Exp $
 
 EAPI="1"
 
@@ -31,8 +31,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Fix bug 277739, replace LT_PREREQ and LT_INIT by AC_LIBTOOL*
+	# macros (equivalent for earlier version), preserve backward
+	# compatibility with libtool-1
 	epatch "${FILESDIR}/${P}-backward-compatibility-libtool.patch"
 
+	# Fix bug 278354, Backport AM_GCONF_SOURCE_2 macro to m4/ dir
+	# in case where gconf isn't installed on the system
+	# (eautoconf could fail)
+	epatch "${FILESDIR}/${P}-am-gconf-source-2-m4.patch"
+
 	rm lt*    || die "clean-up ltmain.sh failed"
 	rm m4/lt* || die "clean-up lt scripts failed"
 	rm m4/libtool* || die "clean-up libtool script failed"