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

(Portage version: 2.1-r1)

5 files changed, 43 insertions, 9 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/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