Version bump (for ACPI support). Avoiding x11-misc/imake because it's obsolete and keywording ~amd64.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 98 insertions, 14 deletions

diff --git a/x11-misc/xbattbar/ChangeLog b/x11-misc/xbattbar/ChangeLog
index 6e73fcecce77..31f90302d6ed 100644
--- a/x11-misc/xbattbar/ChangeLog
+++ b/x11-misc/xbattbar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xbattbar
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/ChangeLog,v 1.12 2007/07/22 03:28:31 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/ChangeLog,v 1.13 2010/07/08 15:47:01 ssuominen Exp $
+
+*xbattbar-1.4.3 (08 Jul 2010)
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> xbattbar-1.4.2.ebuild,
+  +xbattbar-1.4.3.ebuild, +files/xbattbar-1.4.3.patch:
+  Version bump (for ACPI support). Avoiding x11-misc/imake because it's
+  obsolete and keywording ~amd64.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   xbattbar-1.4.2.ebuild:
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
new file mode 100644
index 000000000000..ad5b9e49c1fa
--- /dev/null
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
@@ -0,0 +1,38 @@
+--- Makefile
++++ Makefile
+@@ -8,16 +8,16 @@
+ all: $(TARGET) $(APM_CHECK)
+ 
+ $(TARGET): obj/xbattbar.o
+-	gcc -o $@ $< -lX11
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11
+ 
+ obj/xbattbar.o: xbattbar.c obj/stamp
+-	gcc -MMD -o $@ -c $<
++	$(CC) $(CFLAGS) -MMD -o $@ -c $<
+ 
+ $(APM_CHECK): obj/xbattbar-check-apm.o
+-	gcc -o $@ $<
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+ 
+ obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
+-	gcc -MMD -D$(OS_TYPE) -o $@ -c $<
++	$(CC) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
+ 
+ obj/stamp:
+ 	mkdir obj
+@@ -29,11 +29,11 @@
+ 
+ 
+ install: $(TARGET) $(APM_CHECK)
+-	install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
++	install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)
+ 	install -d -m 0755 $(DESTDIR)/usr/bin
+ 	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
+-	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
+-	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
++	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
++	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
+ 	install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
+ 	install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
+ 
diff --git a/x11-misc/xbattbar/xbattbar-1.4.2.ebuild b/x11-misc/xbattbar/xbattbar-1.4.2.ebuild
index f9b0da7bab8d..8875719d3a80 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.2.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/xbattbar-1.4.2.ebuild,v 1.10 2007/07/22 03:28:31 dberkholz Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/xbattbar-1.4.2.ebuild,v 1.11 2010/07/08 15:47:01 ssuominen Exp $
 
 DESCRIPTION="Advanced Power Management battery status display for X"
 HOMEPAGE="http://iplab.aist-nara.ac.jp/member/suguru/xbattbar.html"
 SRC_URI="http://iplab.aist-nara.ac.jp/member/suguru/${P/-/_}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
@@ -19,15 +19,12 @@ DEPEND="${RDEPEND}
 	x11-libs/libX11"
 
 src_compile() {
-
-	xmkmf -a || die "xmkmf failed"
+	xmkmf -a || die
 	emake || die
 }
 
 src_install() {
-
-	dobin xbattbar
-
-	newman xbattbar.man xbattbar.1
-	dodoc README copyright
+	dobin xbattbar || die
+	newman xbattbar.man xbattbar.1 || die
+	dodoc README
 }
diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
new file mode 100644
index 000000000000..ce292116a6ce
--- /dev/null
+++ b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/xbattbar-1.4.3.ebuild,v 1.1 2010/07/08 15:47:01 ssuominen Exp $
+
+EAPI=2
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Advanced Power Management battery status display for X"
+HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	!ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM
+
+# XXX: Avoiding imake in purpose here.
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+
+	sed -i \
+		-e "s:usr/lib:usr/$(get_libdir):" \
+		xbattbar.c || die
+}
+
+src_compile() {
+	[[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64
+	tc-export CC
+	use kernel_linux && append-flags -Dlinux
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}