Revision bump, adding support for gtk2 USE flag. Closes bug #86703. Also added some magic sed to honour Gentoo CFLAGS. Updated copyright headers. Removed older package version.

(Portage version: 2.0.51.19)

6 files changed, 55 insertions, 14 deletions

diff --git a/x11-plugins/wmdrawer/ChangeLog b/x11-plugins/wmdrawer/ChangeLog
index bd90407d974d..fa53cba8330a 100644
--- a/x11-plugins/wmdrawer/ChangeLog
+++ b/x11-plugins/wmdrawer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/wmdrawer
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.11 2004/10/19 08:54:20 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.12 2005/03/29 13:51:30 s4t4n Exp $
+
+*wmdrawer-0.10.5-r1 (29 Mar 2005)
+
+  29 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmdrawer-0.10.5-r1.ebuild:
+  Revision bump, adding support for gtk2 USE flag. Add added some magic sed
+  to honour Gentoo CFLAGS.
+  wmdrawer-0.10.4.1.ebuild:
+  Wiped out older ebuild.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmdrawer-0.10.5.ebuild:
   Stable on amd64.
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index 082e96f0acee..6298fcc61d87 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,6 +1,7 @@
+MD5 9844a38509c0d83281852f9ee2279d11 wmdrawer-0.10.5-r1.ebuild 984
+MD5 6f7d5d7410952c5e337f9ce21da45419 wmdrawer-0.10.5.ebuild 900
 MD5 ce762d84c75603c98bee94d5ce020e4b ChangeLog 1597
 MD5 3c43064285561d1783722ecf8d694c51 metadata.xml 302
-MD5 fb913f182d384442b5705d467e48f0eb wmdrawer-0.10.4.1.ebuild 832
-MD5 6f7d5d7410952c5e337f9ce21da45419 wmdrawer-0.10.5.ebuild 900
-MD5 497354cebefb9568434814e5e350def6 files/digest-wmdrawer-0.10.4.1 68
+MD5 5ad9832d22021a0946294d43574d3a8e files/digest-wmdrawer-0.10.5-r1 66
+MD5 94bb15f1aab434295518a9a3cb0a4afe files/wmdrawer-0.10.5-gtk+-2.patch 370
 MD5 5ad9832d22021a0946294d43574d3a8e files/digest-wmdrawer-0.10.5 66
diff --git a/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.4.1 b/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.4.1
deleted file mode 100644
index 5c95ee7288d6..000000000000
--- a/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13c81b349170535bb81f3638039dc97c wmdrawer-0.10.4.1.tar.gz 50174
diff --git a/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.5-r1 b/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.5-r1
new file mode 100644
index 000000000000..a66feaac7bf8
--- /dev/null
+++ b/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.5-r1
@@ -0,0 +1 @@
+MD5 b8c4a5d5abd593a29504dfe4c30c8925 wmdrawer-0.10.5.tar.gz 49413
diff --git a/x11-plugins/wmdrawer/files/wmdrawer-0.10.5-gtk+-2.patch b/x11-plugins/wmdrawer/files/wmdrawer-0.10.5-gtk+-2.patch
new file mode 100644
index 000000000000..f378c73400ba
--- /dev/null
+++ b/x11-plugins/wmdrawer/files/wmdrawer-0.10.5-gtk+-2.patch
@@ -0,0 +1,14 @@
+diff -ur wmdrawer-0.10.5/Makefile wmdrawer-0.10.5~/Makefile
+--- wmdrawer-0.10.5/Makefile	2004-06-26 20:16:04.000000000 +0200
++++ wmdrawer-0.10.5~/Makefile	2005-03-25 22:08:08.000000000 +0100
+@@ -16,8 +16,8 @@
+ DOCDIR = $(PREFIX)/share/doc
+ 
+ # Image library
+-USE_GDKPIXBUF = 1
+-#USE_GDKPIXBUF2 = 1
++#USE_GDKPIXBUF = 1
++USE_GDKPIXBUF2 = 1
+ #USE_IMLIB = 1
+ 
+ DEFS = $(OS)
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.4.1.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r1.ebuild
index 55e0715c092b..32c8cf7a6483 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.4.1.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r1.ebuild
@@ -1,25 +1,43 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.4.1.ebuild,v 1.7 2004/07/31 22:41:36 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5-r1.ebuild,v 1.1 2005/03/29 13:51:30 s4t4n Exp $
 
-IUSE=""
+inherit eutils
+
+IUSE="gtk2"
 DESCRIPTION="wmDrawer is a dock application (dockapp) which provides a drawer (retractable button bar) to launch applications"
 SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
 HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~sparc ppc"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
 
 DEPEND="virtual/x11
-	media-libs/gdk-pixbuf
-	>=app-arch/gzip-1.3.3-r4"
+	gtk2? (	>=x11-libs/gtk+-2 )
+	!gtk2? ( >=media-libs/gdk-pixbuf-0.22.0 )
+	>=app-arch/gzip-1.3.3-r4
+	>=sys-apps/sed-4"
+
+src_unpack ()
+{
+	unpack ${A}
+	cd ${S}
+	if use gtk2 ; then
+		epatch ${FILESDIR}/${P}-gtk+-2.patch
+	fi
+
+	# Honour Gentoo CFLAGS
+	sed -i -e "s|-O3|${CFLAGS}|" Makefile
+}
 
-src_compile() {
+src_compile()
+{
 	emake || die "make failed!"
 }
 
-src_install() {
+src_install()
+{
 	dobin wmdrawer
 	dodoc COPYING INSTALL README TODO AUTHORS ChangeLog wmdrawerrc.example
 	gzip -cd doc/wmdrawer.1x.gz > wmdrawer.1