Use dobashcomp instead of dobashcompletion wrt #421549. Empty py-compile script instead of symlinking it to /path/to/true for compability with recent automake. Call gnome2_src_prepare last in src_prepare() and remove unnecessary call to intltoolize.

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

3 files changed, 43 insertions, 28 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 0daf5ceb7b1f..8dda4c38cf29 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.154 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.155 2012/06/17 11:36:28 ssuominen Exp $
+
+  17 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  gdesklets-core-0.36.3-r3.ebuild:
+  Use dobashcomp instead of dobashcompletion wrt #421549. Empty py-compile
+  script instead of symlinking it to /path/to/true for compability with recent
+  automake. Call gnome2_src_prepare last in src_prepare() and remove
+  unnecessary call to intltoolize.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gdesklets-core-0.36.3-r3.ebuild:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index b4fbb13063b3..7094f5cc7810 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdesklets-control-getid 1025 RMD160 8683ec0a308d50040352902962bdca70e7b013a1 SHA1 7fbbbd8c1ef9ca1cc5c0ab2432ded19b5df3ccf0 SHA256 5f53ea065e32ac686c9234935d55fce2a23693c9ba8a145eaca31d30b7795def
 AUX gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch 312 RMD160 f37835015fb90857ee53b4001c53ccf1efd3bb08 SHA1 d51901a750bf901d5428734b79280c30d6b6f201 SHA256 eec96d7fa8c17b4c9a6ec037bc8ac8c4165c5bc652a35cceddd4ad13e97c0dfa
 AUX gdesklets-core-0.36.3-.in-files.patch 5186 RMD160 9c5fac538853f625d103ef07d34e90419cb03e84 SHA1 f0176794ef4ba93ba7160464df9b813f71f0188e SHA256 eeb4f3caf962e1c454b2054d7390bfdec641111741a9915238d949e169ee5530
 AUX gdesklets-core-0.36.3-CFLAGS.patch 1091 RMD160 04837984101cc1ed089a0ea5a3504566fdbc9208 SHA1 1fc4e943bcb7f91d25e16095aad9b1d0e9d8aa80 SHA256 8a1e813adc30a16a4a5fc57f724a348f436c59189cf8dba91c6bbca2ac1ea78a
 AUX gdesklets-core-getid-fix.patch 580 RMD160 d2be1e31658768b9d34d7500f9b6b76d524cec87 SHA1 b54a6a7b06b8634f9d07c0d98662db0164814ca5 SHA256 2be4b77748dc3ac89ad9709ff5f1fd014b78a4468542fad93183df539d77016a
 DIST gdesklets-0.36.3.tar.bz2 3745626 RMD160 86da28930621071fca32d2bc9c0ebfe1a41d03f9 SHA1 0ad58885bf50f43aaa0cf186ba0678251f5de26a SHA256 805b0343635e5dcfd24d23ab10f0153ab5135dc971ba1712fbf4bddbeee26af5
-EBUILD gdesklets-core-0.36.3-r3.ebuild 3411 RMD160 0720f45f533f05d47480590a449e50a22bd5233e SHA1 8a733f839bf745df022e565f9b877a19405e8846 SHA256 26f8fc58f760373e612769de45457e65d524dde9d0c85f20ac46b2fd57b82ab5
-MISC ChangeLog 28333 RMD160 1b13fbddcfa865d24163664d59c546f3a93055bd SHA1 ce810f6943a4a7a194bcd939124a2f3757102c16 SHA256 53d1e5d9e69022f8e7cdb40b858ec93d74c0d2f6064099edc684fa3480f27122
+EBUILD gdesklets-core-0.36.3-r3.ebuild 3322 RMD160 1ec3f4ebe34f040eaf19b7af3b9472f5ee81ad9f SHA1 72906b65ddde82cb5a269386191addeac6b0881a SHA256 84ef54eeee48c7950b1100d3cec614c17eb1d74a3b70fcee8304685cbcd3f569
+MISC ChangeLog 28684 RMD160 b3fbc4e461ecbc87190493abc0bab218eb3c6750 SHA1 3a2f99307079f9fbf1296f56c9f8353f4766a229 SHA256 d3ab4b310901a5ba8810ae0f426100f8b9024f73f1a2869524d7eeb2c5f4310a
 MISC metadata.xml 393 RMD160 e2b43a43703079b731adbfe7ef2d112265b9fdaf SHA1 36dc36c90800e7d73ec015f5d92da2822c6f3b25 SHA256 b4b0b139bfb5f5f2b03813fc571937bf021bdf7d158d26816ffab10aa654f5cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP3cA2AAoJEEdUh39IaPFNaqcH/RaOjEWobNkhFPlmgn4s1L8m
+5YSJEVjzyX2b5O/84YzZC4G5/45xUq1AWYcNSOSPXbk158uN8NfLAvlo7CHXI1ab
+G/RRLUG+vzne23TWdMpqycGg7QZhZZunN/BP5I9VDYPoDfI+bzZ3s42g+FG4LBbm
+jf6C3ctLL9QrjRXPtYC39cqYFNJmP6OARW/jSRoOkUotFmwKst70bR+LhCgYOoxp
+Qjh5TUJm0SBnrkFM0TNN0YeTts86TKS03NXuz39/NVeOaEKNuxxL/bBL3pfFTzgc
+ZigWlo+U1y8PI4HSmudmk+SHyDAtY+i/0EMnAY1YvD3vyY38RXqz222K8aT5crY=
+=QDsw
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
index 73a76546716d..6d0d96e58700 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.12 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.13 2012/06/17 11:36:28 ssuominen Exp $
 
 EAPI=3
 # desklets don't run with USE=debug
-GCONF_DEBUG="no"
-PYTHON_USE_WITH="xml"
+GCONF_DEBUG=no
+PYTHON_USE_WITH=xml
 PYTHON_DEPEND="2:2.5"
 
 inherit gnome2 python eutils autotools multilib bash-completion-r1
 
-MY_PN="${PN/-core}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
+MY_PN=${PN/-core}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
 SRC_URI="http://gdesklets.de/files/${MY_P}.tar.bz2"
@@ -47,48 +47,43 @@ CONVERT_SHEBANGS="ctrlinfo gdesklets gdesklets-daemon gdesklets-logview \
 	gdesklets-shell test-control.py contrib/gdesklets-migration-tool"
 
 pkg_setup() {
-
 	python_set_active_version 2
-
+	python_pkg_setup
 }
 
 src_prepare() {
-
-	epatch "${FILESDIR}/${P}-.in-files.patch"
-	epatch "${FILESDIR}/${P}-CFLAGS.patch"
-	gnome2_src_prepare
+	epatch \
+		"${FILESDIR}"/${P}-.in-files.patch \
+		"${FILESDIR}"/${P}-CFLAGS.patch
 
 	# Postpone pyc compiling until pkg_postinst
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-	intltoolize --force || die
+	>py-compile
 
 	python_convert_shebangs 2 ${CONVERT_SHEBANGS}
 
+	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_install() {
-
 	gnome2_src_install
 
 	# Install bash completion script
-	dobashcompletion "contrib/bash/gdesklets"
+	dobashcomp contrib/bash/gdesklets
 
 	# Install the gdesklets-control-getid script
-	insinto "/usr/$(get_libdir)/gdesklets"
+	insinto /usr/$(get_libdir)/gdesklets
 	insopts -m0555
-	doins "${FILESDIR}/gdesklets-control-getid"
+	doins "${FILESDIR}"/gdesklets-control-getid
 
 }
 
 pkg_postinst() {
-
 	gnome2_pkg_postinst
 	python_need_rebuild
 	# Compile pyc files on target system
-	python_mod_optimize "/usr/$(get_libdir)/gdesklets"
+	python_mod_optimize /usr/$(get_libdir)/gdesklets
 
 	echo
 	elog "gDesklets Displays are required before the library"
@@ -115,10 +110,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-
 	gnome2_pkg_postrm
 	# Cleanup after our cavalier python compilation
 	# The function takes care of ${ROOT} for us
-	python_mod_cleanup "/usr/$(get_libdir)/gdesklets"
+	python_mod_cleanup /usr/$(get_libdir)/gdesklets
 
 }