Stop using EXTRA_EMAKE, bug #437342 by Michał Górny. Drop old.

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

6 files changed, 26 insertions, 283 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 0d49d7207cd3..1bc8eaa01a46 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.269 2012/05/22 08:20:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.270 2012/10/06 09:50:59 pacho Exp $
+
+  06 Oct 2012; Pacho Ramos <pacho@gentoo.org>
+  -files/gconf-3.2.3-shutdown-crash.patch, -gconf-3.2.3-r1.ebuild,
+  -gconf-3.2.3.ebuild, gconf-2.32.4.ebuild:
+  Stop using EXTRA_EMAKE, bug #437342 by Michał Górny. Drop old.
 
   22 May 2012; Justin Lecher <jlec@gentoo.org> gconf-3.2.5.ebuild:
   Add small prefix fix, drop unnecessary die
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 89014d258d64..4ce9c8a28500 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,23 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c
-AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 RMD160 77e4fae8a19a57904d9e6706238a94172da5c223 SHA1 9deb172ce170e7333931e61e3cf2ae6ade24bb33 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0
-AUX gconf-3.2.3-shutdown-crash.patch 1542 RMD160 55401fbcc47142e0bdba289998605889405d5a59 SHA1 1d6607ebdddf90ee512fafe326bed363dd7e296f SHA256 652e1cd937de3dc1b01ecbdbcfe7a09da8958d447dd1e87be924ac0a2f3001bd
-DIST GConf-2.32.4.tar.xz 1326600 RMD160 d17c34f41179e8273ad05a5af3eb8207684f1fc6 SHA1 ff48bf293c59140f6bc585f2b036033c668fc38b SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025
-DIST GConf-3.2.3.tar.xz 1535476 RMD160 93b381dcf7879efd8bac52c6edb76e20ec15c13f SHA1 dfa87a2df31f87ce9370bd38a1790827892a77be SHA256 9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149
-DIST GConf-3.2.5.tar.xz 1525188 RMD160 8486d5c38548f581dddfcf575a7a32145795da9c SHA1 340b3cb634ef64f0c31af9d971d4f3da95d1787c SHA256 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
-EBUILD gconf-2.32.4.ebuild 2547 RMD160 000817ee454b716904cf4b2e4aaac9d70adbcbb3 SHA1 abceb823c0d44b63fc089a3b95f76092e3beaa4d SHA256 8945d93ebbd8d280090eb63d3ea8887539958cf7baf742fabb5c2aa04a2093f7
-EBUILD gconf-3.2.3-r1.ebuild 3123 RMD160 48be506056eece153a9082c1596ec7fb56e5e824 SHA1 a415e3f48f5ebfa670f802d8955b483e89835af6 SHA256 80edd43ad769e272264203f949212e5f1e6c81208446254f9c64531dcd686415
-EBUILD gconf-3.2.3.ebuild 2629 RMD160 f776138e3c529daca7e2f1c82e6100a814bda815 SHA1 c3f7001a67b6be8a386a40b39cb94757eb9215cb SHA256 3d99cf334aab85b703887f50c6f768d20f93fb5ea2c25bc35833f21266181831
-EBUILD gconf-3.2.5.ebuild 3003 RMD160 8724775168855d7db197f2cf6e263e1622439670 SHA1 b7cb78617927a145390adefb695a5c20ac35ed4e SHA256 f145ea3a8d25e8e0fc9fd1d4b30686e37c5b486a6c94ce3bfe2c286466262380
-MISC ChangeLog 35850 RMD160 ec71e9bc321ab676bf7728b440a40024311f1d68 SHA1 3750f4bfd5f95542a87108b81d4c85ad0797f5ed SHA256 91b1d8a7a72f00c61754545feabb9242ba136197e55a5d243f769a7282e005c2
-MISC metadata.xml 528 RMD160 72ffb555ed2893ad4cab16e98a8b78ac234efb3b SHA1 8260846fab125a9132012ac5de4f217af97c8370 SHA256 ea091b9834e15c95b73eb692468c72deca61f4e2170ce5cdad77c175cbeb7aa9
+AUX gconf-2.24.0-no-gconfd.patch 787 SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8 WHIRLPOOL 86c118fb0b571b5c47849fd4f7f09ade4ebf76324771fe9cccc64d95462cf3ab1a32de9a312412f843129025c41253d658a6546d7c3d9496451b9aacdf3b9451
+AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa WHIRLPOOL eddf3b88ddbec7e29f2a58e6ccf26859e0846ec9b01e821f28dc584a9ad297805f5313e29dca5e5d576cca704e1ddb458fd322a3380ed65ddd4bb7d6924d862c
+DIST GConf-2.32.4.tar.xz 1326600 SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025 SHA512 fabcd35ae9dd50969dc60219172e613fdb9f81ecaf182003a7e9d81745ffa9931fc279383dae9d6eb25817f594ab38e1ec2e910e14df402a1cb515eae258358f WHIRLPOOL 836491977e5af62a02fa8e70c92f2c2a07c350aabd44b75b0e9ab203c36d0fd53ed7605e26c81a01e498c8bb7d5e3089427ede8d7583964b65aecc46ddac7faf
+DIST GConf-3.2.5.tar.xz 1525188 SHA256 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
+EBUILD gconf-2.32.4.ebuild 2505 SHA256 47d776476935cf07b58bcd5c4e6f276b8cba7f8d9b01f1e852f5abd3b2dde189 SHA512 c730f7c0be1211499c477b462dfc0ecd7da9f4ccca8b889f14e58e49fe4c81faadf0927e284d33f0b542d686d5fa3019c779ec4b7054a1721dbffa2a1f6a6cff WHIRLPOOL e7e898b11d59b8d2296c873b81e92761ed78768eb62e6b5cdb5b0558519da35f4577ccb3c6eda0334c8ef8d80257b8338121bf56c5bc1e4b329c6fdf6c72272b
+EBUILD gconf-3.2.5.ebuild 3003 SHA256 f145ea3a8d25e8e0fc9fd1d4b30686e37c5b486a6c94ce3bfe2c286466262380 SHA512 ed31f25aa38c62ef8af56e0192e74bd78fa984565e5caee4d9cec93ea08c7143ff164d2d97cd88c243ac165e27d6c5334f89a745233e47a5cdc2095f0df5b3c9 WHIRLPOOL ab8881eeb691f0ae35f9776d7c80213b19361362fc4c7a5685ba0e4c90fe53022b3f052fd05d050209ea18c4f6bc12da9a51025ea5a72919dd2890927655c578
+MISC ChangeLog 36076 SHA256 9fb17ea4c2b1d5873d59012c2285239ae2cdb77f23bfc6a547365c27f9ffa4ed SHA512 d06edfec75aac3a3e1cb0ade977a5024b2489d029ae13c0586a2388219eba7e948ed42d2e37af6aef01b07f35c8ff19ad657a9d41888130586053ad52b47e455 WHIRLPOOL 5d6af85f0e57439a7f8fc9ba31183f425b1220138934b5f302959d68d9832d54a6605840d6845f9e1a6fb9353f2db28eaa36f1e0fd3fe0040ed5f4ac7ba6e0b4
+MISC metadata.xml 528 SHA256 ea091b9834e15c95b73eb692468c72deca61f4e2170ce5cdad77c175cbeb7aa9 SHA512 6b0b8ea2251d6bf9885798bc66dda29d1aba8a15a81054cd5f4649fd425e7904f25c6cd2be9afee6ee526d24106301c62014b7f2546a597477249d152cdf2e74 WHIRLPOOL b41a6632e7f54fd3549aab6b7b95857cece2e229290a520f7cade8a71f1edf12849e017ad4a564986714c3d88a201279e3069f4573500a5b372fecf81b11ec88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+7TF0ACgkQgAnW8HDreRb8vwCbBD4ZbxE83KJOflDyECSymTaF
-stkAoMZjZWmyySt3gIADXj4mVhZ3II6X
-=jiNK
+iEYEAREIAAYFAlBv/wUACgkQCaWpQKGI+9TJKgCeI9lpOz+7VeFm96tueyLD5fAg
+Az4An1Z/hv8YOvm0+xjJVeBgPf3JPtAe
+=m/j1
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/files/gconf-3.2.3-shutdown-crash.patch b/gnome-base/gconf/files/gconf-3.2.3-shutdown-crash.patch
deleted file mode 100644
index 6f36ee9e5c74..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.3-shutdown-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 6f3e127330cb0820a373be77be3cb2cacd0b352e Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 13 Feb 2012 23:35:06 -0500
-Subject: [PATCH] gconf-dbus: don't crash during sync if gconfd shutting down
-
-The gconfd shuts down after a bit of inactivity.  When that
-happens there's a window where it refuses requests from the
-client library with an error.  The library is resposible for
-gracefully handling this condition and reacting appropriately.
-
-There are many places in the code where the client library has
-this idiom:
-
-db = gconf_engine_get_database (conf, TRUE, err);
-
-if (db == NULL)
-  {
-    g_return_if_fail(err == NULL || *err != NULL);
-
-    return;
-  }
-
-In the event gconfd is shutting down, db will be NULL, and the
-code will return early from whatever (non-critical) operation
-it was doing.
-
-gconf_engine_suggest_sync has a similiar chunk of code, but it
-neglected the "return;" and then promptly crashed since it wasn't
-expecting db to be NULL.
-
-This commit adds the return;
-
-https://bugzilla.gnome.org/show_bug.cgi?id=670033
----
- gconf/gconf-dbus.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index 9f92125..442a94b 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -2029,6 +2029,7 @@ gconf_engine_suggest_sync(GConfEngine* conf, GError** err)
-   if (db == NULL)
-     {
-       g_return_if_fail (err == NULL || *err != NULL);
-+      return;
-     }
-   
-   message = dbus_message_new_method_call (GCONF_DBUS_SERVICE,
--- 
-1.7.8.5
-
diff --git a/gnome-base/gconf/gconf-2.32.4.ebuild b/gnome-base/gconf/gconf-2.32.4.ebuild
index 601237d189da..bfd4516cb800 100644
--- a/gnome-base/gconf/gconf-2.32.4.ebuild
+++ b/gnome-base/gconf/gconf-2.32.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.8 2012/05/05 05:38:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.9 2012/10/06 09:50:59 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -42,9 +42,6 @@ pkg_setup() {
 		$(use_with ldap openldap)
 		$(use_enable policykit defaults-service)"
 	kill_gconf
-
-	# Need host's IDL compiler for cross or native build, bug #262747
-	export EXTRA_EMAKE="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2"
 }
 
 src_prepare() {
@@ -57,6 +54,11 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
 }
 
+src_compile() {
+	# Need host's IDL compiler for cross or native build, bug #262747
+	emake ORBIT_IDL=/usr/bin/orbit-idl-2
+}
+
 src_install() {
 	gnome2_src_install
 
@@ -67,8 +69,8 @@ src_install() {
 
 	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
 	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf || die "doenv failed"
-	dodir /root/.gconfd || die
+	doenvd 50gconf
+	dodir /root/.gconfd
 }
 
 pkg_preinst() {
diff --git a/gnome-base/gconf/gconf-3.2.3-r1.ebuild b/gnome-base/gconf/gconf-3.2.3-r1.ebuild
deleted file mode 100644
index 2e6f68c433fa..000000000000
--- a/gnome-base/gconf/gconf-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.3-r1.ebuild,v 1.3 2012/05/05 05:38:09 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc +introspection ldap orbit policykit"
-
-RDEPEND=">=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-2.90:3
-	>=dev-libs/dbus-glib-0.74
-	>=sys-apps/dbus-1
-	>=dev-libs/libxml2-2:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	ldap? ( net-nds/openldap )
-	orbit? ( >=gnome-base/orbit-2.4:2 )
-	policykit? ( sys-auth/polkit )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-gtk
-		--disable-static
-		--enable-gsettings-backend
-		--with-gtk=3.0
-		$(use_enable introspection)
-		$(use_with ldap openldap)
-		$(use_enable orbit)
-		$(use_enable policykit defaults-service)
-		ORBIT_IDL=$(type -P orbit-idl-2)"
-		# Need host's IDL compiler for cross or native build, bug #262747
-	kill_gconf
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
-	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
-	# Fixes "D-BUS error: The GConf daemon is currently shutting down." error
-	epatch "${FILESDIR}/${P}-shutdown-crash.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf || die "doenv failed"
-	dodir /root/.gconfd || die
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-
-	if ! use orbit; then
-		ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
-		ewarn "<=gconf-3.2.3, or were previously using gconf with USE=orbit,"
-		ewarn "you will need to now restart your desktop session (for example,"
-		ewarn "by logging out and then back in)."
-		ewarn "Otherwise, gconf-based applications may crash with 'Method ..."
-		ewarn "on interface \"org.gnome.GConf.Server\" doesn't exist' errors."
-	fi
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/gconf-3.2.3.ebuild b/gnome-base/gconf/gconf-3.2.3.ebuild
deleted file mode 100644
index 5c65322e4d71..000000000000
--- a/gnome-base/gconf/gconf-3.2.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.3.ebuild,v 1.2 2012/05/05 05:38:09 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc +introspection ldap +orbit policykit"
-# orbit IPC is default for now (dbus IPC is somewhat experimental)
-
-RDEPEND=">=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-2.90:3
-	>=dev-libs/dbus-glib-0.74
-	>=sys-apps/dbus-1
-	>=dev-libs/libxml2-2:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	ldap? ( net-nds/openldap )
-	orbit? ( >=gnome-base/orbit-2.4:2 )
-	policykit? ( sys-auth/polkit )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-gtk
-		--disable-static
-		--enable-gsettings-backend
-		--with-gtk=3.0
-		$(use_enable introspection)
-		$(use_with ldap openldap)
-		$(use_enable orbit)
-		$(use_enable policykit defaults-service)
-		ORBIT_IDL=$(type -P orbit-idl-2)"
-		# Need host's IDL compiler for cross or native build, bug #262747
-	kill_gconf
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
-	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf || die "doenv failed"
-	dodir /root/.gconfd || die
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}