Revision bump, fixing bugs #123538 and #123402.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 183 insertions, 4 deletions

diff --git a/x11-misc/adesklets/ChangeLog b/x11-misc/adesklets/ChangeLog
index 064757784518..5d4d4d5f071e 100644
--- a/x11-misc/adesklets/ChangeLog
+++ b/x11-misc/adesklets/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2006/02/11 00:06:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.21 2006/02/24 10:23:15 s4t4n Exp $
+
+*adesklets-0.5.0-r1 (24 Feb 2006)
+
+  24 Feb 2006; Michele Noberasco <s4t4n@gentoo.org> +adesklets-0.5.0-r1.ebuild:
+  Revision bump. Fixing bugs #123402 and #123538.
 
   11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   -adesklets-0.4.10.ebuild:
diff --git a/x11-misc/adesklets/Manifest b/x11-misc/adesklets/Manifest
index 5621300152c2..e0484afdfd15 100644
--- a/x11-misc/adesklets/Manifest
+++ b/x11-misc/adesklets/Manifest
@@ -1,12 +1,24 @@
-MD5 aa4b7b74c415dc08b34dde453f637ce1 ChangeLog 3314
-RMD160 2ddbb08a639736ddd935e1fc363cdebfd4e0cb6e ChangeLog 3314
-SHA256 cde3098bfaf24fab9b10afbd3918eeb3c6215916b7315ef9f62c63967e940509 ChangeLog 3314
+MD5 ae37d3acc15e43cd1a882e1c6bcf2e25 ChangeLog 3477
+RMD160 af8ceba10fde622167a5ac214312b37ecd0a3fdc ChangeLog 3477
+SHA256 6ad0f2aede6a45e857737e98f8bb399223707353e39b9082c08f6f1aee537348 ChangeLog 3477
+MD5 234cc5824dc9aea74c1c73a83b82b6b0 adesklets-0.5.0-r1.ebuild 2685
+RMD160 ac48ba86ab41232c47db96ebe5dd2aa5b0cd2846 adesklets-0.5.0-r1.ebuild 2685
+SHA256 4d0bd7e062b05e82e8587cf1c71437d260e03dd78b9dd3a42b05c1c6ff77dddf adesklets-0.5.0-r1.ebuild 2685
 MD5 0cfa4270cecbff53815bd3070fa044a3 adesklets-0.5.0.ebuild 1771
 RMD160 b25029e4fbb38e255e3458f4362c33a228fbfab1 adesklets-0.5.0.ebuild 1771
 SHA256 07432f994ada5b2c690c9b32d5cee4cc87ec09851ad633e3d54c574cf1108a3d adesklets-0.5.0.ebuild 1771
+MD5 e045c26201a3144d26662d727f31e7a8 files/adesklets-0.5.0-adesklets_installer.patch 1743
+RMD160 bcf7c62f1e02d63e42f27dd34b90218fa362b76c files/adesklets-0.5.0-adesklets_installer.patch 1743
+SHA256 c00864541593c5252910815aa41334c97f8c86529f1093a53f01ca12d3096df4 files/adesklets-0.5.0-adesklets_installer.patch 1743
+MD5 95e1f8356960bb87a84066d9559ab12e files/adesklets-0.5.0-ctrlmenu.patch 416
+RMD160 81a696f9434d6f69eb0935062ce0de490bfa49f1 files/adesklets-0.5.0-ctrlmenu.patch 416
+SHA256 17735437ea32c766c5723986b3f5769d57cae76f84a22379b7c294a78c4bec17 files/adesklets-0.5.0-ctrlmenu.patch 416
 MD5 fe3a9d7095faf46cd0218977f42c9987 files/digest-adesklets-0.5.0 68
 RMD160 5003b8242afc6d81ace4f4cc9218c51415389c0b files/digest-adesklets-0.5.0 68
 SHA256 9a99220554722eaa0eef1eb41bffc3b666569156c15238985c45280cc785dbf9 files/digest-adesklets-0.5.0 68
+MD5 e6f4a2a5a7732e58c5381936ba23309e files/digest-adesklets-0.5.0-r1 250
+RMD160 f9e88e6ecb2872b2b56be107db78da33041b828a files/digest-adesklets-0.5.0-r1 250
+SHA256 7a044b6081b8b9f4f22e39c5a560ab0ee9aa4d105c54e85a15aca5703ff6bef9 files/digest-adesklets-0.5.0-r1 250
 MD5 ba2766b0b67886a694c4c93cdab3c972 metadata.xml 551
 RMD160 99b9eb03ca5c5ab03e1625584e1d09cd1724f7c3 metadata.xml 551
 SHA256 a6180c2f4d9890bb483e436f94c17de4a08b9e027d54d712240df00b62950e54 metadata.xml 551
diff --git a/x11-misc/adesklets/adesklets-0.5.0-r1.ebuild b/x11-misc/adesklets/adesklets-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..e5072ab79305
--- /dev/null
+++ b/x11-misc/adesklets/adesklets-0.5.0-r1.ebuild
@@ -0,0 +1,106 @@
+# 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-r1.ebuild,v 1.1 2006/02/24 10:23:15 s4t4n Exp $
+
+inherit eutils
+
+DESCRIPTION="An interactive Imlib2 console for the X Window system"
+HOMEPAGE="http://adesklets.sf.net/"
+SRC_URI="mirror://sourceforge/adesklets/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X python debug ctrlmenu"
+
+RDEPEND="X? ( || ( (
+		x11-libs/libX11
+		x11-apps/xprop
+		x11-libs/libXt )
+	virtual/x11 ) )"
+
+DEPEND=">=media-libs/imlib2-1.2.0-r2
+	X? ( || ( x11-proto/xproto virtual/x11 ) )
+	python? ( >=dev-lang/python-2.3.4-r1 )"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	#Fix for bug #123402: adesklets_installer
+	epatch ${FILESDIR}/${P}-${PN}_installer.patch
+
+	#Fix for bug #123538: control con context menu fix
+	epatch ${FILESDIR}/${P}-ctrlmenu.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
+}
+
+src_compile()
+{
+	local myconf=""
+
+	use X || myconf="--without-x"
+	use python || myconf="${myconf} --without-python-support"
+	myconf="${myconf} $(use_enable debug)"
+	use ctrlmenu && myconf="--enable-control-on-context-menu"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install()
+{
+	dodir usr/share/info
+	dodir usr/share/man/man1
+	make DESTDIR=${D} install || die
+	doinfo doc/*.info || die "info page installation failed"
+	doman doc/*.1 || die "man page installation failed"
+	dodoc ChangeLog NEWS TODO AUTHORS
+	use debug &&
+	{
+		echo 'ADESKLETS_LOG="/tmp/adesklets_log"' > 70adesklets
+		doenvd 70adesklets
+	}
+}
+
+pkg_postinst()
+{
+	use X ||
+	{
+		ewarn "You did not install the X Window support for ${P}"
+		ewarn "If you intend to use it to display desklets, this"
+		ewarn "is a mistake."
+		echo
+		ewarn "Type USE=\"X\" emerge adesklets to correct this."
+		echo
+		einfo "Please also note that if it is what you intended"
+		einfo "to do, you need also to install imlib2 without"
+		einfo "X support to effectively remove all dependencies."
+		echo
+	}
+
+	use python ||
+	{
+		ewarn "You did not install the python bindings for ${P}"
+		ewarn "If you intend to use it to display desklets, this"
+		ewarn "is most probably an error."
+		echo
+		ewarn "Type USE=\"python\" emerge adesklets to correct this."
+		echo
+	}
+
+	use debug &&
+	{
+		ewarn "You installed a debug build. Make sure you do:"
+		echo
+		ewarn "source /etc/profile"
+		echo
+		ewarn "If you want to use adesklets from your already"
+		ewarn "opened sessions. The sessions log are automatically"
+		ewarn "saved to /tmp/adesklets_log.pid*."
+	}
+}
diff --git a/x11-misc/adesklets/files/adesklets-0.5.0-adesklets_installer.patch b/x11-misc/adesklets/files/adesklets-0.5.0-adesklets_installer.patch
new file mode 100644
index 000000000000..fc706a75165b
--- /dev/null
+++ b/x11-misc/adesklets/files/adesklets-0.5.0-adesklets_installer.patch
@@ -0,0 +1,43 @@
+--- a/utils/adesklets_installer
++++ b/utils/adesklets_installer
+@@ -470,7 +470,7 @@ try:
+                         self.lines = data.splitlines()
+                     else:
+                         self.lines = data
+-                    for i, line in zip(xrange(len(self.lines)), self.lines):
++                    for i, line in zip(range(len(self.lines)), self.lines):
+                         self.pad.addstr(i, 0, line)
+                     self.scroll(0)
+                 else:
+@@ -496,9 +496,10 @@ try:
+                     new = 0
+                 elif new >= len(self.lines):
+                     new = len(self.lines)-1
+-                
+-                self.pad.addstr(self.cur, 0, self.lines[self.cur])
+-                self.pad.addstr(new, 0, self.lines[new], self.hl)
++
++                if len(self.lines)>1:
++                    self.pad.addstr(self.cur, 0, self.lines[self.cur])
++                    self.pad.addstr(new, 0, self.lines[new], self.hl)
+                 self.cur = new
+                 self.refresh()
+ 
+@@ -620,14 +621,14 @@ warranty; not even for MERCHANTABILITY o
+     opts, args= p.parse_args()
+ 
+     # Just instanciate the right GUI to start up the application
+-    # In orger, we try to instanciate the Tk, curses and raw
++    # In order, we try to instanciate the Tk, curses and raw
+     # interface, falling to the next in case of unavailability or
+     # initialization errors
+-    #
++    #    
+     select = opts.raw + opts.curses + opts.Tk
+     for ui in ('Tk', 'curses', 'raw'):
+         if (globals().has_key('%sGUI' % ui) and
+-            getattr(opts, ui) or select==0 or ui=='raw'):
++            (getattr(opts, ui) or select==0 or ui=='raw')):
+                 if globals()['%sGUI' % ui](): break
+
+
diff --git a/x11-misc/adesklets/files/adesklets-0.5.0-ctrlmenu.patch b/x11-misc/adesklets/files/adesklets-0.5.0-ctrlmenu.patch
new file mode 100644
index 000000000000..a5913865bb95
--- /dev/null
+++ b/x11-misc/adesklets/files/adesklets-0.5.0-ctrlmenu.patch
@@ -0,0 +1,10 @@
+--- src/adesklets.c.old	2006-02-14 01:49:01.000000000 -0500
++++ src/adesklets.c	2006-02-14 01:49:54.000000000 -0500
+@@ -2910,6 +2910,7 @@
+ #ifdef CONTROL_ON_CONTEXT_MENU
+ 	      } else {
++		XUngrabPointer(adesklets.display, ev.xbutton.time);
+ 		ev.xbutton.window = adesklets.root ;
+ 		XSendEvent(adesklets.display, ev.xbutton.window, 
+ 			   False, ButtonPressMask, &ev);
+ 		debug("menu call redirected to root\n");
diff --git a/x11-misc/adesklets/files/digest-adesklets-0.5.0-r1 b/x11-misc/adesklets/files/digest-adesklets-0.5.0-r1
new file mode 100644
index 000000000000..3f1117dfbc86
--- /dev/null
+++ b/x11-misc/adesklets/files/digest-adesklets-0.5.0-r1
@@ -0,0 +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