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

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

4 files changed, 75 insertions, 4 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/Manifest b/media-libs/libcanberra/Manifest
index 2d620048c72e..86a4eb39c106 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,10 +1,11 @@
 AUX libcanberra-0.11-dont-crash-without-display.patch 2985 RMD160 44c4029f4103c3111a08f7762bbd8eef07aea55a SHA1 c28e51452ecb8d171f818d00e63caaa645cea586 SHA256 13d1251c96a69ef3271112096dc9e63e4e9c6f637705f1f8e701c6e24d2c2e74
+AUX libcanberra-0.14-am-gconf-source-2-m4.patch 2069 RMD160 92f29321e7c3b6bc131057e0f09f5ac1e240b6fa SHA1 296e5b150edfc256fbe92a0ef57105060881bcbf SHA256 648b40fcf5a146c60263be14f8295cae2f2e1c14b667ea08badff6e33d858245
 AUX libcanberra-0.14-backward-compatibility-libtool.patch 932 RMD160 32e5faad5b3355434388f629f393cad96e1ffe01 SHA1 e62707680ebd8c8168ed52a8fe5df397a4b5dd3e SHA256 60b0a068384047c34d2be124043b6c2b84ece2dfb3e1335980361546615f18a7
 DIST libcanberra-0.11.tar.gz 530273 RMD160 77a38ec12d0c9e5f2ee460fc2150298a81e595c7 SHA1 009b0c914970bf6f0fa19158483b6f7dfdf7021f SHA256 ea7c2731e31c77cdaa2a1319dff3bf9e4ee26a51e9ade8d2dec3147c28ce2e6d
 DIST libcanberra-0.14.tar.gz 451899 RMD160 cf62ada63c314368717cd0173dfd9863f9f9ffa4 SHA1 be6a70f597cd7604db30e8c9578fcf415e96ead2 SHA256 879f9ab798ae287048518ebb55132bbab905bea4b830a90f27a04df6d08d2a5e
 EBUILD libcanberra-0.11-r1.ebuild 1816 RMD160 056249040d6554e4eca90104f0eee876cdb168ee SHA1 1aefa5b1c4a3ab8d7fe053a37513a7d333e8460e SHA256 dce68d49a8c488ce1e3ade0008959c75e8e5fc41d94be97271aed47c048adf71
 EBUILD libcanberra-0.11-r5.ebuild 1932 RMD160 2b2fbbed37b56f4ea2d6aaf909940b4f7be0de7c SHA1 4042a90d9073a4f31ec8dde40c0feed0da1a0d39 SHA256 e5c384cef1177a3b35633471d90df6874d7d59305768b046c5204eb850acfa62
 EBUILD libcanberra-0.11.ebuild 1732 RMD160 4d2790467b94b5da9b6a5b4cad62f943a7397abd SHA1 130da73681b013e9a6c916b4cf9ba2474105eddd SHA256 76f10ee2d38e634647cd0abc688571f71b79da938c40c726693da057f0e7b894
-EBUILD libcanberra-0.14.ebuild 2106 RMD160 6880e8a344908966cae27b3826cc881fdc57bd68 SHA1 ce0884b1b0a7d7809f9eca8cc0fb00118b363072 SHA256 0d08a05dafe39979335898968c6f6f697ec4eb7b565cd2dd02805f113525791f
-MISC ChangeLog 3872 RMD160 2b4d87628591a4273f836e02a9f7f20b40dd89b9 SHA1 f47444dbb0f328334eecd55d605a4b7af0e4ce0a SHA256 96ee487f6345c8b53cb0738b718405ab1370956f5d937720e264d5de870fff76
+EBUILD libcanberra-0.14.ebuild 2461 RMD160 4e5e6175d65ab69c2d10c3c6911b1c6d7f4696a1 SHA1 90a5a478a7cbb3ec7a77616148be22685f6dcc69 SHA256 77f4f7749903c7e72830578220184aa6e03073b895fbc716ff5cb121b2a56155
+MISC ChangeLog 4143 RMD160 b40d78c75a56018b82ad2d8220bc6d63f129fecc SHA1 fcce4d5920104fcae91d91136316abfb310e2291 SHA256 8570ac56c8a63e45b899697564a91e14b46da433a3e06ab60926d89a90eabf19
 MISC metadata.xml 1022 RMD160 89b9e49f7b7947e3518d5f58200f968f81e979d0 SHA1 060fc19cc9434e073ca31ebe6326e975a52564cf SHA256 8f31b433f98332004cd0d74e9d706495de2ba9db4bdecb8dbf9c2dea54913a95
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"