Version bump. Closing bug #124866

(Portage version: 2.1_pre5-r4)

5 files changed, 142 insertions, 1 deletions

diff --git a/x11-misc/adesklets/ChangeLog b/x11-misc/adesklets/ChangeLog
index 5d4d4d5f071e..c66f3e507205 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.21 2006/02/24 10:23:15 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.22 2006/03/06 12:31:35 s4t4n Exp $
+
+*adesklets-0.5.1 (06 Mar 2006)
+
+  06 Mar 2006; Michele Noberasco <s4t4n@gentoo.org> +adesklets-0.5.1.ebuild:
+  Version bump. Fixing bug #124866.
 
 *adesklets-0.5.0-r1 (24 Feb 2006)
 
diff --git a/x11-misc/adesklets/Manifest b/x11-misc/adesklets/Manifest
index e0484afdfd15..d32e8c21b5b8 100644
--- a/x11-misc/adesklets/Manifest
+++ b/x11-misc/adesklets/Manifest
@@ -7,18 +7,27 @@ SHA256 4d0bd7e062b05e82e8587cf1c71437d260e03dd78b9dd3a42b05c1c6ff77dddf adesklet
 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 4174aa4767afc1a09fdd4176b05f4c67 adesklets-0.5.1.ebuild 2646
+RMD160 1fd161d471561656c0536a3723f8705c59a83b2b adesklets-0.5.1.ebuild 2646
+SHA256 9953b84bca78522d862f7e77b72a0d96f1751a4a92c051fb4551e161036d676f adesklets-0.5.1.ebuild 2646
 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 00a2cce2428caedc9eb20a9cdd3b40a0 files/adesklets-ctrlmenu.patch 776
+RMD160 9895b6f002a9c67925c31dc06dce79bbb52d2dfc files/adesklets-ctrlmenu.patch 776
+SHA256 1d0859c7a033d8dd6673613b1d57683692530b3274fbdf23ce9d6a655d39f91e files/adesklets-ctrlmenu.patch 776
 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 8b28d9ec3ec7addd58df0bb0e5f7b88c files/digest-adesklets-0.5.1 250
+RMD160 56c36dea0c26ee3fc7f51579c09bd0a2dcc62d1a files/digest-adesklets-0.5.1 250
+SHA256 9d3dbfac7263c54aa412a9a039cdbe5c018de6db8e1a7c3711e2c55fc4bc5502 files/digest-adesklets-0.5.1 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.1.ebuild b/x11-misc/adesklets/adesklets-0.5.1.ebuild
new file mode 100644
index 000000000000..5079e3d1b3c7
--- /dev/null
+++ b/x11-misc/adesklets/adesklets-0.5.1.ebuild
@@ -0,0 +1,104 @@
+# 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.1.ebuild,v 1.1 2006/03/06 12:31:35 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 #123538: control context menu fix
+	epatch ${FILESDIR}/${PN}-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 \
+		scripting/python/adesklets/commands.py
+}
+
+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-ctrlmenu.patch b/x11-misc/adesklets/files/adesklets-ctrlmenu.patch
new file mode 100644
index 000000000000..cef5569c2309
--- /dev/null
+++ b/x11-misc/adesklets/files/adesklets-ctrlmenu.patch
@@ -0,0 +1,20 @@
+####
+Workaround provided by Philip Kovacs, based on an idea found in
+the event_forward_to_rootwin() function from xfdesktop:
+
+http://svn.xfce.org/svn/xfce/xfdesktop/trunk/src/main.c
+
+It allows a more consistent menu behavior under Xfce4; see 
+http://adesklets.sourceforge.net/forum/viewtopic.php?p=1658#1658
+for details.
+####
+--- src/adesklets.c.old 2006-03-03 00:00:00.000000000 -0500
++++ src/adesklets.c     2006-03-03 00:00:01.000000000 -0500
+@@ -2909,6 +2909,7 @@ if(imlib_context_get_filter()) {\
+ 		  event("menufire 0 %s\n",menu_str);
+ #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);
diff --git a/x11-misc/adesklets/files/digest-adesklets-0.5.1 b/x11-misc/adesklets/files/digest-adesklets-0.5.1
new file mode 100644
index 000000000000..b4c19c3fb1a3
--- /dev/null
+++ b/x11-misc/adesklets/files/digest-adesklets-0.5.1
@@ -0,0 +1,3 @@
+MD5 325a8d2b9a3d421e8d7b270ed0b80cee adesklets-0.5.1.tar.bz2 368575
+RMD160 745ef0d1f03cfcac691ff86465d175651917c5f4 adesklets-0.5.1.tar.bz2 368575
+SHA256 47124e3633af480561a53bcc133f013b4545f4553011756767f102144cbe8021 adesklets-0.5.1.tar.bz2 368575