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.

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

2 files changed, 27 insertions, 26 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/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
 
 }