Make modular X friendly, remove media-libs/xpm dependency

(Portage version: 2.0.54)

5 files changed, 85 insertions, 18 deletions

diff --git a/x11-plugins/wmium/ChangeLog b/x11-plugins/wmium/ChangeLog
index bcba93156c42..3e4bcf82ae85 100644
--- a/x11-plugins/wmium/ChangeLog
+++ b/x11-plugins/wmium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmium
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.15 2005/07/18 13:51:15 dragonheart Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.16 2006/01/22 02:21:35 vanquirius Exp $
+
+*wmium-1.0.9b-r1 (22 Jan 2006)
+
+  22 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> wmium-1.0.9b.ebuild,
+  +wmium-1.0.9b-r1.ebuild:
+  Make modular X friendly, remove media-libs/xpm dependency (it's a dummy
+  ebuild these days).
 
   18 Jul 2005; Daniel Black <dragonheart@gentoo.org> -wmium-1.0.9.ebuild,
   wmium-1.0.9b.ebuild:
diff --git a/x11-plugins/wmium/Manifest b/x11-plugins/wmium/Manifest
index 3018990bd296..e70e0f06e7f5 100644
--- a/x11-plugins/wmium/Manifest
+++ b/x11-plugins/wmium/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8c8cbf007e24732a84b706a8cf701979 ChangeLog 2269
-MD5 75bf1a2523c837fdd89f903e4b8252a4 metadata.xml 385
-MD5 9e47f72279a569c74d6aaffe78cbdb2e wmium-1.0.9b.ebuild 1297
 MD5 e420d58fe2bc90bec34c26a6e31cc60b files/digest-wmium-1.0.9b 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC27PsmdTrptrqvGERAt6DAJ9ylb4vcBmTWafWgtUnNLqdmSIYzgCfakqX
-DovI6NnXEkIvlN24cZHEfKY=
-=ZT0M
------END PGP SIGNATURE-----
+MD5 e420d58fe2bc90bec34c26a6e31cc60b files/digest-wmium-1.0.9b-r1 63
+MD5 75bf1a2523c837fdd89f903e4b8252a4 metadata.xml 385
+MD5 4af444eecbae36e9e7ab43530da95d2d wmium-1.0.9b-r1.ebuild 1514
+MD5 2e11d73513b1abf5eb4ffb7d750005a9 wmium-1.0.9b.ebuild 1265
diff --git a/x11-plugins/wmium/files/digest-wmium-1.0.9b-r1 b/x11-plugins/wmium/files/digest-wmium-1.0.9b-r1
new file mode 100644
index 000000000000..daedf27e758a
--- /dev/null
+++ b/x11-plugins/wmium/files/digest-wmium-1.0.9b-r1
@@ -0,0 +1 @@
+MD5 ae94efe5d534894b94e1d87b958df58c wmium-1.0.9b.tar.gz 53977
diff --git a/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild b/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild
new file mode 100644
index 000000000000..6106135af8da
--- /dev/null
+++ b/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild,v 1.1 2006/01/22 02:21:35 vanquirius Exp $
+
+IUSE="gtk"
+
+DESCRIPTION="WindowMaker DockApp/Grellm2 plugin that fetches the DSL usage information for Australian ISP Internode"
+HOMEPAGE="http://www.earthmagic.org/?software"
+SRC_URI="http://www.earthmagic.org/files/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND="virtual/libc
+	dev-libs/openssl
+	gtk? (
+		>=x11-libs/gtk+-2
+		app-admin/gkrellm
+		dev-util/pkgconfig
+	)
+	( || (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libXext-1.0.0
+	>=x11-libs/libXpm-3.5.4.2
+	>=x11-proto/xextproto-7.0.2 )
+	virtual/x11 )
+	)"
+
+RDEPEND="virtual/libc
+	dev-libs/openssl
+	gtk? (
+		>=x11-libs/gtk+-2
+		app-admin/gkrellm
+	)
+	!gtk? ( x11-wm/windowmaker )
+	( || (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libXext-1.0.0
+	>=x11-libs/libXpm-3.5.4.2
+	>=x11-proto/xextproto-7.0.2 )
+	virtual/x11 )
+	)"
+
+src_compile() {
+	emake build || die
+	if use gtk; then
+		emake build-gk2 || die
+	fi
+}
+
+src_install() {
+	if use gtk; then
+		exeinto /usr/lib/gkrellm2/plugins
+		doexe src-gk2/wmium-gk2.so
+	fi
+
+	dobin src/wmium
+
+	dodoc BUGS INSTALL-GK2  README dot.wmiumrc.sample \
+		CHANGES  INSTALL README-GK2
+
+	doman src/wmium.1
+
+	einfo
+	einfo "To configure look at the /usr/share/doc/${PF}/dot.wmiumrc.sample"
+	einfo "(if using /usr/bin/wmium with WINDOWMAKER ONLY)"
+	einfo
+	einfo "or use the preferences within gkrellm2"
+}
+
diff --git a/x11-plugins/wmium/wmium-1.0.9b.ebuild b/x11-plugins/wmium/wmium-1.0.9b.ebuild
index 4840b472cf77..7b2f02f27b45 100644
--- a/x11-plugins/wmium/wmium-1.0.9b.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.9b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b.ebuild,v 1.2 2005/07/18 13:51:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b.ebuild,v 1.3 2006/01/22 02:21:35 vanquirius Exp $
 
 IUSE="gtk"
 
@@ -12,7 +12,6 @@ SLOT="0"
 KEYWORDS="x86"
 DEPEND="virtual/libc
 	virtual/x11
-	media-libs/xpm
 	dev-libs/openssl
 	gtk? (
 		>=x11-libs/gtk+-2
@@ -22,7 +21,6 @@ DEPEND="virtual/libc
 
 RDEPEND="virtual/libc
 	virtual/x11
-	media-libs/xpm
 	dev-libs/openssl
 	gtk? (
 		>=x11-libs/gtk+-2