Added patch to fix duplicate filenames in a Makefile - see bug #319443

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

4 files changed, 157 insertions, 2 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 4afe4940f544..262f173f9436 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.127 2010/07/03 16:12:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.128 2010/07/12 02:13:20 nixphoeni Exp $
+
+*gdesklets-core-0.36.2-r3 (12 Jul 2010)
+
+  12 Jul 2010; Joe Sapp <nixphoeni@gentoo.org>
+  +gdesklets-core-0.36.2-r3.ebuild,
+  +files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch:
+  Added patch to fix duplicate filenames in a Makefile - see bug #319443
 
   03 Jul 2010; Raúl Porcel <armin76@gentoo.org>
   gdesklets-core-0.36.2-r2.ebuild:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index fcac8514745a..02612062c726 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -2,6 +2,7 @@ AUX gdesklets-control-getid 1025 RMD160 8683ec0a308d50040352902962bdca70e7b013a1
 AUX gdesklets-core-0.36-python-2.6-fix.patch 531 RMD160 81940f4dfc1f8b21470eee369f0fdfe5187a7c9f SHA1 e1c801522b9039e9c57a09c824662093fa9cb776 SHA256 1281220ff4f599c1c0b513c4ef0d89670b0af04331cefed0d895b3dbd5a737a0
 AUX gdesklets-core-0.36.1-bash-completion 1425 RMD160 87724e2766e3d9ece61051b146210cc2ccaf0e94 SHA1 4e82336bbd694ed73824a533e1933d357d4df9eb SHA256 640f242d3481c9465a25a704fdbf3e3b370b91cad353fcfa2025b591345ee757
 AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
+AUX gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch 312 RMD160 f37835015fb90857ee53b4001c53ccf1efd3bb08 SHA1 d51901a750bf901d5428734b79280c30d6b6f201 SHA256 eec96d7fa8c17b4c9a6ec037bc8ac8c4165c5bc652a35cceddd4ad13e97c0dfa
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
 AUX gdesklets-core-getid-fix.patch 580 RMD160 d2be1e31658768b9d34d7500f9b6b76d524cec87 SHA1 b54a6a7b06b8634f9d07c0d98662db0164814ca5 SHA256 2be4b77748dc3ac89ad9709ff5f1fd014b78a4468542fad93183df539d77016a
 AUX gdesklets.desktop 265 RMD160 a6a84a28abf1120cc8df2e52505c119cdb82cca7 SHA1 a8a544d457cf613f939c45e29681bab307b0fa36 SHA256 8b38972217e4a923fb988b7982eb1e6655f1f885686a4b9585810999588c11ee
@@ -9,5 +10,6 @@ DIST gDesklets-0.36.2.tar.bz2 3423236 RMD160 93b6c21848fe05cfda539173192901c5c32
 DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
 EBUILD gdesklets-core-0.36.1-r3.ebuild 3892 RMD160 d16f6037e98d2073b2ceef694fb232d71820112c SHA1 f1ddc5a5cf0a2dc5f08507b7c1b939e5b7fb252b SHA256 2f82efafe8e5caf32f00db20bea53f592a6d11897eecb8d10bb6c399c36b01de
 EBUILD gdesklets-core-0.36.2-r2.ebuild 3676 RMD160 45b05ca714a22ced29206437df60697c094e7b45 SHA1 38c973fcc7997249e9c769e01904047a69c2e6b8 SHA256 6f40cbe8a1cfa9d2fd1ab85f8309a42d3e2e56409acbecc1d6e5a67996d14f40
-MISC ChangeLog 24101 RMD160 2e7a3e1ecf1fa45f54768d6877aee762bd329338 SHA1 b57f957d7a0876eb4b399ac6bced04a541b5e611 SHA256 a7379299b028d753c1ccc8c835eb1405bcf65ca3e69e925819d386bb8c7b5dde
+EBUILD gdesklets-core-0.36.2-r3.ebuild 3716 RMD160 d87c04bce918bafc1aa8a9a669d09f15d83dab2a SHA1 1c29d07c10ef6451b941293c8fc34679d4748b32 SHA256 09510b9bcf23711a452912e09fc727fc3ad3cb9ea8667235ab30a04cce0aed38
+MISC ChangeLog 24361 RMD160 f3cce0bdc44152d68a9588453f6fd66108c15dba SHA1 39675715707c0f8fde277b68a095b508a60026c9 SHA256 7a67fa680d179a64ba9a64519a4def23542d7d78fd5171b7d9103bc42bb3bace
 MISC metadata.xml 313 RMD160 a292cb05998c995298fead8eda4d51d81832fd97 SHA1 ec75a2fe8a0668f263858cf395321641d839e968 SHA256 d913b0c409eb9c0725471cd13f4ed893899f5a09881dfef10dea6cd658a7aad9
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch
new file mode 100644
index 000000000000..8d9b3dc10c98
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch
@@ -0,0 +1,12 @@
+=== modified file 'config/Makefile.am'
+--- config/Makefile.am	2008-12-29 15:33:52 +0000
++++ config/Makefile.am	2010-05-01 17:24:06 +0000
+@@ -21,7 +21,6 @@
+ 	ConfigUnit.py     \
+ 	ConfigURI.py      \
+ 	ConfigDialog.py   \
+-	ConfigWidget.py   \
+ 	ConfigManager.py  \
+ 	ConfigWidget.py   \
+ 	DaemonConfigger.py  \
+
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
new file mode 100644
index 000000000000..a589eef995dd
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2010 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.2-r3.ebuild,v 1.1 2010/07/12 02:13:20 nixphoeni Exp $
+
+EAPI=2
+# desklets don't run with USE=debug
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
+
+inherit gnome2 python eutils autotools multilib bash-completion
+
+MY_PN="gDesklets"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
+SRC_URI="http://archive.gdesklets.info/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+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-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"
+CONVERT_SHEBANGS="ctrlinfo gdesklets gdesklets-daemon gdesklets-logview \
+	gdesklets-shell test-control.py contrib/gdesklets-migration-tool"
+
+pkg_setup() {
+
+	python_set_active_version 2
+
+}
+
+src_prepare() {
+
+	epatch "${FILESDIR}/${PN}-getid-fix.patch"
+	epatch "${FILESDIR}/${P}-ConfigWidget-dupe-fix.patch"
+	gnome2_src_prepare
+
+	# Postpone pyc compiling until pkg_postinst
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	eautoreconf
+	intltoolize --force || die
+
+	python_convert_shebangs 2 ${CONVERT_SHEBANGS}
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# Install bash completion script
+	BASHCOMPLETION_NAME="gDesklets" \
+		dobashcompletion "contrib/bash/gdesklets"
+
+	# Install autostart script
+	insinto "/etc/xdg/autostart"
+	doins "contrib/gdesklets.desktop"
+
+	# Install the gdesklets-control-getid script
+	insinto "/usr/$(get_libdir)/gdesklets"
+	insopts -m0555
+	doins "${FILESDIR}/gdesklets-control-getid"
+
+	# Ensure the global Displays and Controls directories exist
+	dodir "/usr/$(get_libdir)/gdesklets/Displays"
+	dodir "/usr/$(get_libdir)/gdesklets/Controls"
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+	python_need_rebuild
+	# Compile pyc files on target system
+	python_mod_optimize "/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/contrib/gdesklets-migration-tool"
+	elog "after the first time you run gDesklets"
+	elog
+
+	BASHCOMPLETION_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"
+
+}