Add libgnome dependency, needed at runtime for its gconf keys (thanks to Rafał Mużyło for reporting); update py-compile idiom for automake-1.11.2 compatibility (bug #396585).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 27 insertions, 16 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 5e491877659e..aa3b476aa0ed 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.127 2011/11/06 02:49:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.128 2011/12/31 20:50:06 tetromino Exp $
+
+  31 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  devhelp-2.32.0.ebuild, devhelp-3.2.0.ebuild:
+  Add libgnome dependency, needed at runtime for its gconf keys (thanks to
+  Rafał Mużyło for reporting); update py-compile idiom for automake-1.11.2
+  compatibility (bug #396585).
 
   06 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   devhelp-3.2.0.ebuild:
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 5967c0a3bc40..cf773d883f25 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 AUX devhelp-2.32.0-fix-schema.patch 424 RMD160 32c3009b653c55d1002c42a0808409c74dbc6431 SHA1 c844213a63d60cf031040a4676d17b89dcae07d2 SHA256 4438ed134cc923c62b3beebac732a8be7b61e23cca43f5469e8885e2513c2da6
 DIST devhelp-2.32.0.tar.bz2 503689 RMD160 934697815ec13a5629db775bb3b8585c80c8c6f0 SHA1 8a7c15a17ccfb0b39b1f1f8b57f77e544fb3b2b8 SHA256 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4
 DIST devhelp-3.2.0.tar.xz 486576 RMD160 314ec9db1f3e7c05a32ee485888b0f416e52fee2 SHA1 b76492d5130ec078e32f0fa359b1be88a988ee34 SHA256 974b4418036fa9a63a8f275257ed9ec1b7cae61a97e8e001e56e460c8a8e310e
-EBUILD devhelp-2.32.0.ebuild 1851 RMD160 1d591fdd12f0f8e81c68a81e872a908bdcf677b6 SHA1 39f2d6f12e75a406e39593966c22b823a552aa01 SHA256 70e1969b5589076e63004851cde9b644cc1a38c278275426d97206bea25a8cd6
-EBUILD devhelp-3.2.0.ebuild 1595 RMD160 0f372b358b7f38ab0da655d30afea34e546c2bc8 SHA1 a087244cc342d61f1844b5bfa436b713a732c703 SHA256 a26589f4e9358a7f639c464e71ab0d8a2d7343742d582083d3b83d430a972167
-MISC ChangeLog 16766 RMD160 34095ccfeedcbfb416732c622d67e921a32ab10a SHA1 811faeb3e82dfb5d841863c3af74af5e60ac5e26 SHA256 da67d10e25560ba9f6686e0362cc8ca9fa720d3028ba1b06062175fde093f68e
+EBUILD devhelp-2.32.0.ebuild 1956 RMD160 3ee6f6c44ac6006b92cea13f17bc60df1d4912c0 SHA1 ea966e950e51711178c4c7c7fed80a002d4386bb SHA256 7c6b87da6546eaa3ff6cc48cf512b166b15294c3b2a8e63eb7d09220f243b0aa
+EBUILD devhelp-3.2.0.ebuild 1713 RMD160 bc6d020841571646d990e7390c262b23efb532a9 SHA1 0dcc15a00bbd696c160df36c80d9653344ecd7ac SHA256 d5883654e1b06b9e943e02ce96e83a778f1b5bce0b270e62961ced5d5607001d
+MISC ChangeLog 17057 RMD160 b37e5aa5991e698dfce2b8a0a6b4f93fe47ea096 SHA1 95cb30b6273583c83c60ff1bfbb33773125e542f SHA256 0194543a481f56a3887d917c41a56ae587d3aea012ce4a5b9e4dd9f57afe0814
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk619bcACgkQdjK8w9WeBnCwvgD+JMdeHHmSH1bGhfOXD7Few6Rt
-STUEEJ9Rta6CJrUP074BAIHh9Q04sDYK49eZbgxbi7Oxlf4SvuVU0+MNZKVWhx7M
-=kDoM
+iF4EAREIAAYFAk7/dYQACgkQdjK8w9WeBnBZ1gD9GVPL0mGdoSKsJsn+JEcYTjvi
+vEMk4Lo+J6ou5H6EqEQA/2OBOj5/SRSPup0F1hPaCLFOVJs6vEK14RdIMu/48ZZv
+=fgUq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/devhelp/devhelp-2.32.0.ebuild b/dev-util/devhelp/devhelp-2.32.0.ebuild
index dd9c59997ec6..b5fea5efdd4a 100644
--- a/dev-util/devhelp/devhelp-2.32.0.ebuild
+++ b/dev-util/devhelp/devhelp-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.32.0.ebuild,v 1.8 2011/03/31 04:13:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.32.0.ebuild,v 1.9 2011/12/31 20:50:06 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,13 +15,16 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2.6:2
+COMMON_DEPEND=">=gnome-base/gconf-2.6:2
 	>=x11-libs/gtk+-2.10:2
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/libwnck-2.10:1
 	>=net-libs/webkit-gtk-1.1.13:2
 	>=dev-libs/libunique-1:1"
-DEPEND="${RDEPEND}
+# libgnome is needed for /desktop/gnome/interface/* gconf keys
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/libgnome"
+DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9"
@@ -39,8 +42,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# disable pyc compiling
-	rm py-compile
-	ln -s $(type -P true) py-compile
+	echo '#!/bin/sh' > py-compile
 
 	# Fix build with older libunique, bug #286890
 	sed -e 's/-DG.*_SINGLE_INCLUDES//' \
diff --git a/dev-util/devhelp/devhelp-3.2.0.ebuild b/dev-util/devhelp/devhelp-3.2.0.ebuild
index aa724ed6077f..8c3fdc1a4d4d 100644
--- a/dev-util/devhelp/devhelp-3.2.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.2.0.ebuild,v 1.2 2011/11/06 02:49:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.2.0.ebuild,v 1.3 2011/12/31 20:50:06 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -17,12 +17,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2.6:2
+COMMON_DEPEND=">=gnome-base/gconf-2.6:2
 	>=dev-libs/glib-2.25.11:2
 	>=x11-libs/gtk+-3.0.2:3
 	x11-libs/libwnck:3
 	net-libs/webkit-gtk:3"
-DEPEND="${RDEPEND}
+# libgnome is needed for /desktop/gnome/interface/* gconf keys
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/libgnome"
+DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9"
@@ -41,7 +44,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# disable pyc compiling
-	ln -sfn $(type -P true) build-aux/py-compile
+	echo '#!/bin/sh' > build-aux/py-compile
 }
 
 pkg_preinst() {