Bump x11-plugins/wmbatppc to version 2.4. Closes #43256

6 files changed, 67 insertions, 6 deletions

diff --git a/x11-plugins/wmbatppc/ChangeLog b/x11-plugins/wmbatppc/ChangeLog
index 594cf5cdef5c..8d391189c994 100644
--- a/x11-plugins/wmbatppc/ChangeLog
+++ b/x11-plugins/wmbatppc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmbatppc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.5 2004/07/13 21:49:12 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.6 2004/07/17 19:11:59 s4t4n Exp $
+
+*wmbatppc-2.4 (17 Jul 2004)
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatppc-2.4.ebuild:
+  Version bump. Closes #43256, reported by John Steele Scott.
+  wmbatppc-1.0-r1.ebuild:
+  Fix SLOT value. Fix DEPEND.
 
   13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> * :
   Relocate this to x11-plugins, assign to the desktop-dock herd.
diff --git a/x11-plugins/wmbatppc/Manifest b/x11-plugins/wmbatppc/Manifest
index fc229c9565f3..e2e561b92778 100644
--- a/x11-plugins/wmbatppc/Manifest
+++ b/x11-plugins/wmbatppc/Manifest
@@ -1,4 +1,8 @@
-MD5 b715d95cdc25b663289dff63fad587f4 wmbatppc-1.0-r1.ebuild 594
-MD5 9306caf45ed74df24f9eb2543c2e4952 ChangeLog 870
+MD5 9306caf45ed74df24f9eb2543c2e4952 ChangeLog.~1.5.~ 870
+MD5 b715d95cdc25b663289dff63fad587f4 wmbatppc-1.0-r1.ebuild.~1.8.~ 594
+MD5 8d416c6c0a15a1753f6825c2e38e5d00 wmbatppc-1.0-r1.ebuild 594
+MD5 242a75f55950d11fa28d8cc7a38f8c01 ChangeLog 966
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 4b88dfddd3805f6f9cebfd7d102d81e3 wmbatppc-2.4.ebuild 636
+MD5 926ec328cde6d69edb946e570c91b184 files/digest-wmbatppc-2.4 63
 MD5 1c36fba32a1054874bc4086e7445478e files/digest-wmbatppc-1.0-r1 63
diff --git a/x11-plugins/wmbatppc/files/digest-wmbatppc-2.4 b/x11-plugins/wmbatppc/files/digest-wmbatppc-2.4
new file mode 100644
index 000000000000..7956db513286
--- /dev/null
+++ b/x11-plugins/wmbatppc/files/digest-wmbatppc-2.4
@@ -0,0 +1 @@
+MD5 4acab490d1fa722fc019fd067b689057 wmbatppc-2.4.tar.gz 37503
diff --git a/x11-plugins/wmbatppc/files/wmbatppc-2.4-cflags.patch b/x11-plugins/wmbatppc/files/wmbatppc-2.4-cflags.patch
new file mode 100644
index 000000000000..fea41a3ced6f
--- /dev/null
+++ b/x11-plugins/wmbatppc/files/wmbatppc-2.4-cflags.patch
@@ -0,0 +1,11 @@
+--- Makefile	2004-07-17 20:59:18.140689352 +0200
++++ Makefile	2004-07-17 21:00:09.883823200 +0200
+@@ -6,7 +6,7 @@
+ INSTALL = /usr/bin/install
+ LIBDIR = -L/usr/X11R6/lib
+ LIBS = -lXpm -lXext -lX11 -lm $(shell /usr/bin/xosd-config --libs)
+-FLAGS = -O2 -DENABLE_XOSD $(shell /usr/bin/xosd-config --cflags)
++FLAGS = ${CFLAGS} -DENABLE_XOSD $(shell /usr/bin/xosd-config --cflags)
+ OBJS = wmgeneral.o
+ 
+ default:all
diff --git a/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild b/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
index ca58be8f3cf4..53bedd40300f 100644
--- a/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
+++ b/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild,v 1.8 2004/07/13 21:49:12 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild,v 1.9 2004/07/17 19:11:59 s4t4n Exp $
 
 DESCRIPTION="small battery-monitoring dockapp for G3/G4 laptops"
 HOMEPAGE="http://titelou.free.fr/wmbatppc/"
 SRC_URI="http://titelou.free.fr/wmbatppc/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="1"
+SLOT="0"
 KEYWORDS="-* ppc"
 IUSE=""
 
 DEPEND="virtual/x11
-	app-laptop/pmud"
+	>=app-laptop/pmud-0.10.1-r2"
 
 S=${WORKDIR}/wmbatppc
 
diff --git a/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild b/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild
new file mode 100644
index 000000000000..8799fc614b91
--- /dev/null
+++ b/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild,v 1.1 2004/07/17 19:11:59 s4t4n Exp $
+
+inherit eutils
+
+DESCRIPTION="small battery-monitoring dockapp for G3/G4 laptops"
+HOMEPAGE="http://titelou.free.fr/wmbatppc/"
+SRC_URI="http://titelou.free.fr/wmbatppc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc"
+IUSE=""
+
+DEPEND="virtual/x11
+	>=app-laptop/pmud-0.10.1-r2
+	>=x11-libs/xosd-2.2.5-r1"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# Make it honour Gentoo CFLAGS
+	epatch ${FILESDIR}/wmbatppc-2.4-cflags.patch
+}
+
+src_compile()
+{
+	emake || die "Compilation failed"
+}
+
+src_install()
+{
+	dobin wmbatppc || die
+	doman wmbatppc.1
+}