patches to fix acpi/apm support #27685

4 files changed, 55 insertions, 10 deletions

diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index 549e5718ca4f..c264160ed3a5 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for x11-plugins/wmacpi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.6 2003/06/26 00:35:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.7 2003/09/04 17:10:26 vapier Exp $
 
 *wmacpi-1.34 (23 Feb 2003)
 
+  04 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patches to remove apm/acpi parts ... this way only support for
+  one is include at a time #27685.
+
   25 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
   Unmasked because older version is broke with newer kernels #22973.
 
diff --git a/x11-plugins/wmacpi/files/1.34-acpi.patch b/x11-plugins/wmacpi/files/1.34-acpi.patch
new file mode 100644
index 000000000000..76a94e57f77e
--- /dev/null
+++ b/x11-plugins/wmacpi/files/1.34-acpi.patch
@@ -0,0 +1,17 @@
+--- Makefile.orig	2003-09-04 13:00:48.784055072 -0400
++++ Makefile	2003-09-04 13:03:41.399813488 -0400
+@@ -11,11 +11,11 @@
+ #OPT	= -pg -g -DPRO -DACPI
+ 
+ CC	= gcc
+-CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include
++CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include -DACPI
+ LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+-SRCS	= wmacpi.c libapm.c libacpi.c
+-OBJS	= wmacpi.o libapm.o libacpi.o
++SRCS	= wmacpi.c libacpi.c
++OBJS	= wmacpi.o libacpi.o
+ 
+ all:	wmacpi
+ 
diff --git a/x11-plugins/wmacpi/files/1.34-apm.patch b/x11-plugins/wmacpi/files/1.34-apm.patch
new file mode 100644
index 000000000000..6b640b781b13
--- /dev/null
+++ b/x11-plugins/wmacpi/files/1.34-apm.patch
@@ -0,0 +1,17 @@
+--- Makefile.orig	2003-09-04 13:00:48.784055072 -0400
++++ Makefile	2003-09-04 13:04:23.297444080 -0400
+@@ -11,11 +11,11 @@
+ #OPT	= -pg -g -DPRO -DACPI
+ 
+ CC	= gcc
+-CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include
++CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include -DAPM
+ LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+-SRCS	= wmacpi.c libapm.c libacpi.c
+-OBJS	= wmacpi.o libapm.o libacpi.o
++SRCS	= wmacpi.c libapm.c
++OBJS	= wmacpi.o libapm.o
+ 
+ all:	wmacpi
+ 
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
index 5626e6dda881..788c61f337af 100644
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
@@ -1,24 +1,31 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.2 2003/06/26 00:35:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.34.ebuild,v 1.3 2003/09/04 17:10:26 vapier Exp $
 
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 
 DEPEND="virtual/x11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use apm && use acpi && eerror "APM and ACPI are in USE ... defaulting to ACPI"
+	use apm || use acpi || eerror "Neither APM or ACPI are in USE ... defaulting to ACPI"
+	if [ `use acpi` ] || [ ! `use apm` ] ; then
+		epatch ${FILESDIR}/${PV}-acpi.patch
+	else
+		epatch ${FILESDIR}/${PV}-apm.patch
+	fi
+}
+
 src_compile() {
-	use apm && use acpi && eerror "APM and ACPI is in USE ... defaulting to ACPI"
-	use apm || use acpi || eerror "Neither APM or ACPI is in USE ... defaulting to ACPI"
-	[ `use acpi` ] \
-		&& export CFLAGS="${CFLAGS} -DACPI" \
-		|| export CFLAGS="${CFLAGS} -DAPM"
-	emake CFLAGS="${CFLAGS}" || die
+	emake OPT="${CFLAGS}" || die
 }
 
 src_install() {