Fixed bug #131813, bug #132031, bug #131675. See ChangeLog for details. Version 0.5.1 stable for x86, closing bug #140771.

Package-Manager: portage-2.1-r1

6 files changed, 73 insertions, 14 deletions

diff --git a/x11-misc/adesklets/ChangeLog b/x11-misc/adesklets/ChangeLog
index c2f86add691b..223a7425ecde 100644
--- a/x11-misc/adesklets/ChangeLog
+++ b/x11-misc/adesklets/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/adesklets
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.25 2006/04/30 16:49:27 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.26 2006/07/27 11:40:20 s4t4n Exp $
+
+  27 Jul 2006; Michele Noberasco <s4t4n@gentoo.org> adesklets-0.5.0.ebuild:
+  Added yet another modular X dep.
+  adesklets-0.6.1.ebuild:
+  Added patch to fix bug #131813.
+  Bumped up python version requirement to fix bug #132031.
+  Fixed python and perl script building. Closes bug #131675.
+  Stable for x86, closing bug #140771.
 
   30 Apr 2006; Sven Blumenstein <bazik@gentoo.org> adesklets-0.6.1.ebuild:
   Added ~sparc keyword.
diff --git a/x11-misc/adesklets/Manifest b/x11-misc/adesklets/Manifest
index ce46dbe08b4c..1a38dba81b25 100644
--- a/x11-misc/adesklets/Manifest
+++ b/x11-misc/adesklets/Manifest
@@ -1,7 +1,32 @@
-MD5 91574e6720d5407e80290d8d190a3069 ChangeLog 4115
-MD5 0cfa4270cecbff53815bd3070fa044a3 adesklets-0.5.0.ebuild 1771
-MD5 d45f010a325d0be02871072433de53b6 adesklets-0.6.1.ebuild 2866
+AUX adesklets-0.6.1-fix-as-needed.patch 836 RMD160 1f799d0e597a369b7100afe1badb15813229c287 SHA1 e1c83686e3e262864519249aac73e29eea0b2b44 SHA256 b79da39dcf10f0e8d6c59f70209ef6b8944766984f6993a3b7562c1e19bdb928
+MD5 8a0dc1e97e80eb18d3f389195abb66ca files/adesklets-0.6.1-fix-as-needed.patch 836
+RMD160 1f799d0e597a369b7100afe1badb15813229c287 files/adesklets-0.6.1-fix-as-needed.patch 836
+SHA256 b79da39dcf10f0e8d6c59f70209ef6b8944766984f6993a3b7562c1e19bdb928 files/adesklets-0.6.1-fix-as-needed.patch 836
+AUX adesklets-ctrlmenu.patch 776 RMD160 9895b6f002a9c67925c31dc06dce79bbb52d2dfc SHA1 c6fb7c4dc8395d151fef905487ec1e44d4ea34c7 SHA256 1d0859c7a033d8dd6673613b1d57683692530b3274fbdf23ce9d6a655d39f91e
 MD5 00a2cce2428caedc9eb20a9cdd3b40a0 files/adesklets-ctrlmenu.patch 776
-MD5 fe3a9d7095faf46cd0218977f42c9987 files/digest-adesklets-0.5.0 68
-MD5 a2ab582e0187319f71cf0f5af237f095 files/digest-adesklets-0.6.1 250
+RMD160 9895b6f002a9c67925c31dc06dce79bbb52d2dfc files/adesklets-ctrlmenu.patch 776
+SHA256 1d0859c7a033d8dd6673613b1d57683692530b3274fbdf23ce9d6a655d39f91e files/adesklets-ctrlmenu.patch 776
+DIST adesklets-0.5.0.tar.bz2 367220 RMD160 3ece06cd76567af3677006c881140bb731864322 SHA1 258bf44a947fc444f164aabe0893225dc507cd79 SHA256 fa28f0f0ecb2b4b44b5e81c6a2e7ecc8151a4ca928ff4e3361535e28e0265294
+DIST adesklets-0.6.1.tar.bz2 387553 RMD160 65cca6fe53f23f029c74cb101022e4481ee114d0 SHA1 bb81b4cedd5b0389b96d47c4ba57b3298fc05146 SHA256 9998e240715c34b5d4c8b31b5ed1fef38262a39fad08fa65be0b58a47eccc3c2
+EBUILD adesklets-0.5.0.ebuild 1788 RMD160 54c0f27d5d9e0a6e40aa29ad9ba806469ecca853 SHA1 a8f259566ed852be79334bc9a6e9d877b6408dd8 SHA256 2afa82507b7300217d4cde302a76d5fe870aebbfcf70d9d0784ef8e168f2cdc8
+MD5 332f06659f3d2f0953b5dd156324bb0a adesklets-0.5.0.ebuild 1788
+RMD160 54c0f27d5d9e0a6e40aa29ad9ba806469ecca853 adesklets-0.5.0.ebuild 1788
+SHA256 2afa82507b7300217d4cde302a76d5fe870aebbfcf70d9d0784ef8e168f2cdc8 adesklets-0.5.0.ebuild 1788
+EBUILD adesklets-0.6.1.ebuild 2881 RMD160 032c207ecded5eb28787b3b4589076c6c7fc6eb0 SHA1 39e96635f8cdb70aa58801736275acc19df41508 SHA256 6a1102a73c8030298cb866e1ac4c9fa3a757efbd6e8ea95e26f37646598dbe15
+MD5 0dc061c9121a54b34c3d047c81574c3f adesklets-0.6.1.ebuild 2881
+RMD160 032c207ecded5eb28787b3b4589076c6c7fc6eb0 adesklets-0.6.1.ebuild 2881
+SHA256 6a1102a73c8030298cb866e1ac4c9fa3a757efbd6e8ea95e26f37646598dbe15 adesklets-0.6.1.ebuild 2881
+MISC ChangeLog 4446 RMD160 2a5c9e62977d16e111a2f31b6279b746c1d521fb SHA1 50ca4e55c83e013d07a5e2b8665f733b2bca5d20 SHA256 8b8d6326e13374e59e22dbbcc4a18f72b05b415afd36e6163e69e55e3a12490d
+MD5 680498070361824a34bf722c666e8855 ChangeLog 4446
+RMD160 2a5c9e62977d16e111a2f31b6279b746c1d521fb ChangeLog 4446
+SHA256 8b8d6326e13374e59e22dbbcc4a18f72b05b415afd36e6163e69e55e3a12490d ChangeLog 4446
+MISC metadata.xml 551 RMD160 99b9eb03ca5c5ab03e1625584e1d09cd1724f7c3 SHA1 42da0483253593302e16025c8b416279aa7a870b SHA256 a6180c2f4d9890bb483e436f94c17de4a08b9e027d54d712240df00b62950e54
 MD5 ba2766b0b67886a694c4c93cdab3c972 metadata.xml 551
+RMD160 99b9eb03ca5c5ab03e1625584e1d09cd1724f7c3 metadata.xml 551
+SHA256 a6180c2f4d9890bb483e436f94c17de4a08b9e027d54d712240df00b62950e54 metadata.xml 551
+MD5 e6f4a2a5a7732e58c5381936ba23309e files/digest-adesklets-0.5.0 250
+RMD160 f9e88e6ecb2872b2b56be107db78da33041b828a files/digest-adesklets-0.5.0 250
+SHA256 7a044b6081b8b9f4f22e39c5a560ab0ee9aa4d105c54e85a15aca5703ff6bef9 files/digest-adesklets-0.5.0 250
+MD5 a2ab582e0187319f71cf0f5af237f095 files/digest-adesklets-0.6.1 250
+RMD160 48b082b853c5f1ef670c9531b9d734b314dc63f1 files/digest-adesklets-0.6.1 250
+SHA256 33691330baa736d4a7ff8f2413194e42e9071dc7d86bb63680d383d64a1c03ea files/digest-adesklets-0.6.1 250
diff --git a/x11-misc/adesklets/adesklets-0.5.0.ebuild b/x11-misc/adesklets/adesklets-0.5.0.ebuild
index 6a780d946b5c..6d361320e54a 100644
--- a/x11-misc/adesklets/adesklets-0.5.0.ebuild
+++ b/x11-misc/adesklets/adesklets-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.5.0.ebuild,v 1.4 2006/02/11 00:03:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.5.0.ebuild,v 1.5 2006/07/27 11:40:20 s4t4n Exp $
 
 DESCRIPTION="An interactive Imlib2 console for the X Window system"
 HOMEPAGE="http://adesklets.sf.net/"
@@ -14,7 +14,8 @@ IUSE="X python"
 RDEPEND="X? ( || ( (
 		x11-libs/libX11
 		x11-apps/xprop
-		x11-libs/libXt )
+		x11-libs/libXt
+		x11-apps/xwininfo )
 	virtual/x11 ) )"
 
 DEPEND=">=media-libs/imlib2-1.2.0-r2
diff --git a/x11-misc/adesklets/adesklets-0.6.1.ebuild b/x11-misc/adesklets/adesklets-0.6.1.ebuild
index 3b9460320fdd..71fda90df8d2 100644
--- a/x11-misc/adesklets/adesklets-0.6.1.ebuild
+++ b/x11-misc/adesklets/adesklets-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1.ebuild,v 1.2 2006/04/30 16:49:27 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1.ebuild,v 1.3 2006/07/27 11:40:20 s4t4n Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/adesklets/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="X python perl debug ctrlmenu"
 
 RDEPEND="X? ( || ( (
@@ -25,7 +25,7 @@ RDEPEND="X? ( || ( (
 
 DEPEND=">=media-libs/imlib2-1.2.0-r2
 	X? ( || ( x11-proto/xproto virtual/x11 ) )
-	python? ( >=dev-lang/python-2.3.4-r1 )
+	python? ( >=dev-lang/python-2.4.3-r1 )
 	perl? ( >=dev-lang/perl-5.8.2 )"
 
 src_unpack()
@@ -36,11 +36,12 @@ src_unpack()
 	#Fix for bug #123538: control context menu fix
 	epatch ${FILESDIR}/${PN}-ctrlmenu.patch
 
+	#Fix for bug #131813: linker flags ordering
+	epatch ${FILESDIR}/${P}-fix-as-needed.patch
+
 	# when performing minor changes to src/adesklets.c or src/commands.c,
 	# touching these files will avoid unneeded processing
-	touch scripting/enums scripting/prototypes \
-		scripting/python/adesklets/commands.py \
-		scripting/perl/adesklets.pm
+	touch scripting/enums scripting/prototypes
 }
 
 src_compile()
diff --git a/x11-misc/adesklets/files/adesklets-0.6.1-fix-as-needed.patch b/x11-misc/adesklets/files/adesklets-0.6.1-fix-as-needed.patch
new file mode 100644
index 000000000000..4731433ddf8b
--- /dev/null
+++ b/x11-misc/adesklets/files/adesklets-0.6.1-fix-as-needed.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.am.orig	2006-03-13 20:54:13.000000000 +0100
++++ src/Makefile.am	2006-04-30 18:10:32.000000000 +0200
+@@ -13,7 +13,7 @@
+ 		    error.h types.h
+ 
+ adesklets_CFLAGS = @X_CFLAGS@ @IMLIB2_CFLAGS@ @FONTCONFIG_CFLAGS@
+-adesklets_LDFLAGS = @X_LIBS@ @IMLIB2_LIBS@ \
++adesklets_LDADD = @X_LIBS@ @IMLIB2_LIBS@ \
+                     @READLINE_LIBS@ @FONTCONFIG_LIBS@
+ 
+ dist_pkgdata_SCRIPTS = adesklets_debug.sh
+--- src/Makefile.in.orig	2006-03-31 03:19:11.000000000 +0200
++++ src/Makefile.in	2006-04-30 18:11:16.000000000 +0200
+@@ -211,7 +211,7 @@
+ 		    error.h types.h
+ 
+ adesklets_CFLAGS = @X_CFLAGS@ @IMLIB2_CFLAGS@ @FONTCONFIG_CFLAGS@
+-adesklets_LDFLAGS = @X_LIBS@ @IMLIB2_LIBS@ \
++adesklets_LDADD = @X_LIBS@ @IMLIB2_LIBS@ \
+                     @READLINE_LIBS@ @FONTCONFIG_LIBS@
+ 
+ dist_pkgdata_SCRIPTS = adesklets_debug.sh
diff --git a/x11-misc/adesklets/files/digest-adesklets-0.5.0 b/x11-misc/adesklets/files/digest-adesklets-0.5.0
index 4f25d063dac3..3f1117dfbc86 100644
--- a/x11-misc/adesklets/files/digest-adesklets-0.5.0
+++ b/x11-misc/adesklets/files/digest-adesklets-0.5.0
@@ -1 +1,3 @@
 MD5 a618289ea5c1512ec41085ac234341f3 adesklets-0.5.0.tar.bz2 367220
+RMD160 3ece06cd76567af3677006c881140bb731864322 adesklets-0.5.0.tar.bz2 367220
+SHA256 fa28f0f0ecb2b4b44b5e81c6a2e7ecc8151a4ca928ff4e3361535e28e0265294 adesklets-0.5.0.tar.bz2 367220