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).

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 21 insertions, 10 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/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() {