Version bump, plus patch that adds windowed mode support. Closes #76885. Also updated copyright headers.

Package-Manager: portage-2.0.51-r14

8 files changed, 118 insertions, 11 deletions

diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index 5dfe915157a3..fdf3a1120d7a 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmacpi
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.15 2004/11/01 20:21:38 gustavoz Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.16 2005/01/25 09:32:31 s4t4n Exp $
+
+*wmacpi-2.1_rc1 (25 Jan 2005)
+
+  25 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmacpi-2.1_rc1.ebuild:
+  Version bump, plus patch that adds support for windowed mode.
+  Closes #76885, submitted (and patches provided) by Jochen Eisinger
+  <jochen.eisinger@gmx.de>
+  wmacpi-1.34.ebuild, wmacpi-1.99_p7.ebuild:
+  Update copyright headers...
 
   01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> wmacpi-1.34.ebuild,
   wmacpi-1.99_p7.ebuild:
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 10f50a70ade0..4aa25f6aa965 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,8 +1,12 @@
-MD5 f8ca86436d4063bb8ac73db76544b73c ChangeLog 1769
+MD5 e74f19ab68ac22ac3ff8c7b2eeb76a72 wmacpi-1.99_p7.ebuild 863
+MD5 ca080e792adfe63f79517fad382a6ca5 wmacpi-1.34.ebuild 950
+MD5 dc1a26d0086fe8ba49974454505ca4df wmacpi-2.1_rc1.ebuild 989
+MD5 b2556ef899fac73fedac279f7d29ca48 ChangeLog 2108
 MD5 4719e916cabe20df559a3e88d5f4722a metadata.xml 250
-MD5 996a78f8dca8c155780726908ade32fa wmacpi-1.34.ebuild 953
-MD5 a7278b164a93e4d8a52e2717325d0b8b wmacpi-1.99_p7.ebuild 866
-MD5 e5a0e14c3f7c1b1fd21560657bb64e88 files/1.34-acpi.patch 469
-MD5 419ea648d99ea0f0f1ce6fe742df1cab files/1.34-apm.patch 466
+MD5 700b8b4a46daa2ccab0929b285f36019 files/2.1rc1-windowed.patch 918
+MD5 551fb5d3e01599cf89e3670d19000ff8 files/digest-wmacpi-2.1_rc1 65
 MD5 965b453bc3b6385a827d50c8cc05af3f files/digest-wmacpi-1.34 62
+MD5 419ea648d99ea0f0f1ce6fe742df1cab files/1.34-apm.patch 466
+MD5 e5a0e14c3f7c1b1fd21560657bb64e88 files/1.34-acpi.patch 469
+MD5 a4e62d6f61f4a5d669dadf8d1a604c04 files/2.1rc1-nodeps.patch 544
 MD5 3ced18da6e5bf0b6a8113eb56cb0f0cb files/digest-wmacpi-1.99_p7 65
diff --git a/x11-plugins/wmacpi/files/2.1rc1-nodeps.patch b/x11-plugins/wmacpi/files/2.1rc1-nodeps.patch
new file mode 100644
index 000000000000..60c29ace2543
--- /dev/null
+++ b/x11-plugins/wmacpi/files/2.1rc1-nodeps.patch
@@ -0,0 +1,20 @@
+--- wmacpi-2.1rc1/Makefile.orig	2005-01-25 09:55:01.637030220 +0100
++++ wmacpi-2.1rc1/Makefile	2005-01-25 09:55:19.265329634 +0100
+@@ -34,7 +34,7 @@
+ WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
+ 
+ # include per-file dependencies
+-include $(WMOBJ:.o=.d)
++#include $(WMOBJ:.o=.d)
+ 
+ wmacpi:	$(WMOBJ)
+ 	$(CC) $(LDFLAGS) -o $@ $^
+@@ -44,7 +44,7 @@
+ ifdef BUILD_CLI
+ CLSRC := acpi.c libacpi.c
+ CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
+-include $(CLOBJ:.o=.d)
++#include $(CLOBJ:.o=.d)
+ 
+ acpi: $(CLOBJ)
+ 	$(CC) $(LDFLAGS) -o $@ $^
diff --git a/x11-plugins/wmacpi/files/2.1rc1-windowed.patch b/x11-plugins/wmacpi/files/2.1rc1-windowed.patch
new file mode 100644
index 000000000000..844183727eec
--- /dev/null
+++ b/x11-plugins/wmacpi/files/2.1rc1-windowed.patch
@@ -0,0 +1,29 @@
+--- wmacpi-2.1rc1/wmacpi.c.orig	2005-01-05 07:16:09.000000000 +0100
++++ wmacpi-2.1rc1/wmacpi.c	2005-01-25 10:03:47.933403683 +0100
+@@ -574,7 +574,8 @@
+ 	   "\t\t\tdefault 20 (once every three seconds)\n"
+ 	   "-f\t\t\tforce the use of capacity mode for calculating time remaining\n"
+ 	   "-n\t\t\tdo not blink\n"
+-	   "-w\t\t\trun in command line mode\n"
++	   "-w\t\t\trun in windowed mode\n"
++	   "-x\t\t\trun in command line mode\n"
+ 	   "-a <samples>\t\tsamples to average over (cli mode only)\n"
+ 	   "-v\t\t\tincrease verbosity\n"
+ 	   "\t\t\tcan be used multiple times to increase verbosity further\n"
+@@ -728,9 +729,15 @@
+ 	case 'n':
+ 	    dockapp->blink = 0;
+ 	    break;
+-	case 'w':
++	case 'x':
+ 	    cli = 1;
+ 	    break;
++	case 'w':
++	    {
++		char *args[] = { "", "-w" };
++		DAParseArguments(2, args, NULL, 0, "", "");
++	    }
++	    break;
+ 	case 'a':
+ 	    if(optarg != NULL) {
+ 		samples = atoi(optarg);
diff --git a/x11-plugins/wmacpi/files/digest-wmacpi-2.1_rc1 b/x11-plugins/wmacpi/files/digest-wmacpi-2.1_rc1
new file mode 100644
index 000000000000..fd7f3369f97a
--- /dev/null
+++ b/x11-plugins/wmacpi/files/digest-wmacpi-2.1_rc1
@@ -0,0 +1 @@
+MD5 899d021713609ec71d8ec2d98b6c41dd wmacpi-2.1rc1.tar.bz2 28051
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
index dddfd38b1579..9a5bcb6b7674 100644
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
@@ -1,6 +1,6 @@
-# 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/wmacpi/wmacpi-1.34.ebuild,v 1.11 2004/11/01 20:21:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.34.ebuild,v 1.12 2005/01/25 09:32:32 s4t4n Exp $
 
 inherit eutils
 
diff --git a/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild b/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
index 87ef18b12e79..95fc9c8940c7 100644
--- a/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
@@ -1,6 +1,6 @@
-# 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/wmacpi/wmacpi-1.99_p7.ebuild,v 1.4 2004/11/01 20:21:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild,v 1.5 2005/01/25 09:32:32 s4t4n Exp $
 
 IUSE=""
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
diff --git a/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
new file mode 100644
index 000000000000..748f74b268be
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild,v 1.1 2005/01/25 09:32:32 s4t4n Exp $
+
+inherit eutils
+
+IUSE=""
+DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
+HOMEPAGE="http://himi.org/wmacpi/"
+MY_PV="2.1rc1"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://himi.org/wmacpi/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -sparc ~amd64 -ppc"
+
+DEPEND="virtual/x11
+	>=x11-libs/libdockapp-0.5.0"
+
+src_unpack()
+{
+	unpack ${A}
+	epatch ${FILESDIR}/${MY_PV}-windowed.patch
+	epatch ${FILESDIR}/${MY_PV}-nodeps.patch
+}
+
+src_compile()
+{
+	emake OPT="${CFLAGS}" || die
+}
+
+src_install()
+{
+	# Fix for #60685:
+	# acpi and acpi.1 conflict with package sys-apps/acpi
+	mv acpi   acpi-batt-status
+	mv acpi.1 acpi-batt-status.1
+
+	dobin wmacpi acpi-batt-status
+	doman wmacpi.1 acpi-batt-status.1
+	dodoc AUTHORS ChangeLog README
+}