Ensure global Displays and Controls directories exist, force gdesklets-core to be rebuilt after a python upgrade, moved to EAPI 2, and removed blockers on packages that are no longer in the tree

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

3 files changed, 146 insertions, 2 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index ffe858474571..d5c56c0b7239 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.112 2009/10/12 18:51:56 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.113 2009/10/21 02:06:20 nixphoeni Exp $
+
+*gdesklets-core-0.36.1-r3 (21 Oct 2009)
+
+  21 Oct 2009; Joe Sapp <nixphoeni@gentoo.org>
+  +gdesklets-core-0.36.1-r3.ebuild:
+  Ensure global Displays and Controls directories exist and force
+  gdesklets-core to be rebuilt after a python upgrade. Also moved ebuild to
+  EAPI 2 and removed now nonexistent blockers desklet-calendar and
+  desklet-clock.
 
   10 Sep 2009; Joe Sapp <nixphoeni@gentoo.org>
   files/gdesklets-core-0.36.1-bash-completion:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 22aa389796bc..6c44ceaa7830 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -6,5 +6,6 @@ AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8d
 AUX gdesklets.desktop 265 RMD160 a6a84a28abf1120cc8df2e52505c119cdb82cca7 SHA1 a8a544d457cf613f939c45e29681bab307b0fa36 SHA256 8b38972217e4a923fb988b7982eb1e6655f1f885686a4b9585810999588c11ee
 DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
 EBUILD gdesklets-core-0.36.1-r2.ebuild 3771 RMD160 452b3a9b9ce642fca32a8e9ec283966036041efd SHA1 e28f5d2e2382c99999cff231cede6d9a51a1e083 SHA256 867e0905a2a2e48892790c2c195c9716755e5acd3549f8a030467ba2994c1b49
-MISC ChangeLog 21574 RMD160 1b8ed0d405a44fe7cceecba8010c382cdbc6c27a SHA1 8508ecb84082519ca225d87a2858de4a4be859be SHA256 c169004955ec03caec505da4499a63c740429a72f8cf633f59bb383be93862bb
+EBUILD gdesklets-core-0.36.1-r3.ebuild 3891 RMD160 679ecdaf2bd8a1f34b64cbfa84e3422cd20597b1 SHA1 0a82ff681b3d094b254d1117b1a61aa302c89b1b SHA256 c2852ed6a0f3ae55a619441edb6aa6a89be176cb0c30e3de2c29a934b6146b55
+MISC ChangeLog 21925 RMD160 a0da6e7f220cd82480867d6c8738532025cff8e3 SHA1 be430b3cf58f0ddcba2b31e63c0ab608d2b94f29 SHA256 a961849e6fccef22403ca6e34ffce113766b7b27fa568567243798878c3117fe
 MISC metadata.xml 313 RMD160 a292cb05998c995298fead8eda4d51d81832fd97 SHA1 ec75a2fe8a0668f263858cf395321641d839e968 SHA256 d913b0c409eb9c0725471cd13f4ed893899f5a09881dfef10dea6cd658a7aad9
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r3.ebuild
new file mode 100644
index 000000000000..1b600d7688ab
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2009 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.1-r3.ebuild,v 1.1 2009/10/21 02:06:20 nixphoeni Exp $
+
+EAPI=2
+# desklets don't run with USE=debug
+GCONF_DEBUG="no"
+
+# We want the latest autoconf and automake (the default)
+inherit gnome2 python eutils autotools multilib bash-completion
+
+MY_PN="gDesklets"
+MY_P="${PN/-core/}-${PV/_/}"
+S="${WORKDIR}/${MY_PN}-${PV/_/}"
+
+DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
+SRC_URI="http://gdesklets.de/files/${MY_P}.tar.gz"
+HOMEPAGE="http://www.gdesklets.de"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# is libgsf needed for runtime or just compiling?
+RDEPEND=">=dev-lang/python-2.3
+	>=dev-libs/glib-2.4
+	gnome-extra/libgsf
+	>=gnome-base/librsvg-2.8
+	>=gnome-base/libgtop-2.8.2
+	>=dev-python/pygtk-2.10
+	>=dev-python/gnome-python-2.6
+	>=dev-libs/expat-1.95.8
+	>=dev-python/pyxml-0.8.3-r1"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+# Parallel makes sometimes break during install phase
+MAKEOPTS="${MAKEOPTS} -j1"
+# Force using MAKEOPTS with emake
+USE_EINSTALL="0"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+
+	gnome2_src_prepare
+
+	# Postpone pyc compiling until pkg_postinst
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# Use po/LINGUAS - see gnome bug #506828
+	epatch "${FILESDIR}/${PN}-0.36_beta-linguas.patch"
+	# Install test-control.py - see https://bugs.launchpad.net/gdesklets/+bug/310339
+	epatch "${FILESDIR}/${PN}-${PV}-test-control.py-install-fix.patch"
+	# Fix for Python 2.6 - see bug #266151
+	epatch "${FILESDIR}/${PN}-0.36-python-2.6-fix.patch"
+
+	eautoreconf
+	intltoolize --force || die
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# Install bash completion script
+	BASH_COMPLETION_NAME="gDesklets" \
+		dobashcompletion "${FILESDIR}/${PN}-${PV}-bash-completion"
+
+	# Install autostart script
+	insinto "/etc/xdg/autostart"
+	doins "${FILESDIR}/gdesklets.desktop"
+
+	# Install the gdesklets-control-getid script
+	insinto "/usr/$(get_libdir)/gdesklets"
+	insopts -m0555
+	doins "${FILESDIR}/gdesklets-control-getid"
+
+	# Remove conflicts with x11-misc/shared-mime-info and auto-generated
+	# MIME info
+	rm -rf 	"${D}usr/share/mime"
+
+	# Ensure the global Displays and Controls directories exist
+	dodir "/usr/lib/gdesklets/Displays"
+	dodir "/usr/lib/gdesklets/Controls"
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+	python_need_rebuild
+	# Compile pyc files on target system
+	python_mod_optimize "${ROOT:-/}usr/$(get_libdir)/gdesklets"
+
+	echo
+	elog "gDesklets Displays are required before the library"
+	elog "will be usable.  Core Displays (Calendar, Clock, Quote-of-the-Day,"
+	elog "and the 15pieces game) are already installed in"
+	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/Displays"
+	elog "Additional Displays can be found in -"
+	elog "           x11-plugins/desklet-* ,"
+	elog "at http://www.gdesklets.de, or at http://archive.gdesklets.info"
+	elog
+	elog "Next you'll need to start gDesklets using"
+	elog "           ${ROOT}usr/bin/gdesklets start"
+	elog "If you're using GNOME this can be done conveniently through"
+	elog "Applications->Accessories->gDesklets or automatically each login"
+	elog "under System->Preferences->Sessions"
+	elog
+	elog "If you're updating from a version less than 0.35_rc1,"
+	elog "you can migrate your desklet configurations by"
+	elog "running"
+	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
+	elog "after the first time you run gDesklets"
+	elog
+
+	BASH_COMPLETION_NAME="gDesklets" bash-completion_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"
+
+}