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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 103 insertions, 16 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/Manifest b/x11-misc/xbattbar/Manifest
index 364b970991c6..30038ce80154 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,4 +1,7 @@
+AUX xbattbar-1.4.3.patch 1206 RMD160 5cf6ea556a013591599be142da9eefeca546465d SHA1 64ce6ff6cd722d89942714bf6879f33e48602b78 SHA256 b84759e1152c5c9988f4e283e08773557b785c91261f022f5cddd8bbf5b49237
 DIST xbattbar_1.4.2.tar.gz 14079 RMD160 f28a273a1865a0919e32144bbb5b16b3c0340061 SHA1 14e9aafd62919e4a625d3f84df3b074b9eef8279 SHA256 55a5ed609282398f55e0141e473f9f04300d1ad3070810c7c6930f6c45970b4a
-EBUILD xbattbar-1.4.2.ebuild 763 RMD160 37ccb64edbe617bc73265aaa6f5527d9be7867ef SHA1 69e9ecf12f168bd4a9e7cced95bc27525b6f3033 SHA256 2a2634fb85058d2767a20e5b256d8101dda74d0b981615b09d74001e93123770
-MISC ChangeLog 1470 RMD160 9f9608d09803dbc8afdb40e62ea710fb4bee8b82 SHA1 6cdf8e8a9988b31d9f5fc3f2b3505f4fefcce128 SHA256 883ec0ffa88901f7e6644c2442c20e607709ddc1b7dc09b6e8d7f67f1cc320fd
+DIST xbattbar_1.4.3.orig.tar.gz 15722 RMD160 92faf39e1a1cec67bd0af8d2af77d18a7296c132 SHA1 6d76fc571b574ef7948429b180f5161ee8668727 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9
+EBUILD xbattbar-1.4.2.ebuild 756 RMD160 b1865a57b84e99ae29cd03445ddfc12b59d09262 SHA1 95dd8b5a039017bd86d5e81b2bb1bc40414bca1e SHA256 525ce7332924bc5abe7c7911fd5894a5871efc3f1ef0a1370813edab321b3424
+EBUILD xbattbar-1.4.3.ebuild 1020 RMD160 6bdf4bb0a5ca88497b20907493b74e4366060c13 SHA1 e42c786d31a600bb70f635f98167c96cf4847851 SHA256 3184ae27ed54bbecd4adabcd8f5f26dc2a94d5fb94e7eb4ca4c81c0b012b0e6c
+MISC ChangeLog 1740 RMD160 f20ec7bce4a8f912f651d493b8d7108f0550720b SHA1 e7ac123e197dc04902eafdc8b7b377de056c4fb9 SHA256 3c589573dd1d117696dc93a6d9b386c67f97b802dc68d2c2f12263eed91a3737
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
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
+}