5 files changed, 11 insertions, 37 deletions
diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index 26af93089272..549e5718ca4f 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,9 +1,12 @@
 # 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.5 2003/02/23 21:39:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.6 2003/06/26 00:35:51 vapier Exp $
 
 *wmacpi-1.34 (23 Feb 2003)
 
+  25 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Unmasked because older version is broke with newer kernels #22973.
+
   23 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump for #15967.
 
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 2a9a8d4b306b..025a202b57b4 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,5 +1,3 @@
-MD5 d07c0885449051685a67b63de85d6ccd ChangeLog 481
-MD5 2d8a439b78f0c55eb347251d496309c1 wmacpi-1.21.ebuild 628
-MD5 8f4f6503364ebabf2ece7b79c324efc1 wmacpi-1.34.ebuild 866
-MD5 2b0fb14aea35a66fd0806d35b5b74216 files/digest-wmacpi-1.21 62
 MD5 965b453bc3b6385a827d50c8cc05af3f files/digest-wmacpi-1.34 62
+MD5 da3cbb77df1a750de1d9ffd74bba710a ChangeLog 603
+MD5 3ef6bab2fc468354392183c159e3ff6c wmacpi-1.34.ebuild 854
diff --git a/x11-plugins/wmacpi/files/digest-wmacpi-1.21 b/x11-plugins/wmacpi/files/digest-wmacpi-1.21
deleted file mode 100644
index 615ce7a03c5b..000000000000
--- a/x11-plugins/wmacpi/files/digest-wmacpi-1.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff34b91c5dcfb06b9e91403b2c8d2e3c wmacpi-1.21.tar.gz 11557
diff --git a/x11-plugins/wmacpi/wmacpi-1.21.ebuild b/x11-plugins/wmacpi/wmacpi-1.21.ebuild
deleted file mode 100644
index 7dd818399b89..000000000000
--- a/x11-plugins/wmacpi/wmacpi-1.21.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.21.ebuild,v 1.4 2003/02/23 21:39:37 vapier Exp $
-
-DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/${P}.tar.gz"
-HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
-DEPEND="virtual/x11"
-
-S="${WORKDIR}/wmapm-${PV}"
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	newbin wmapm wmacpi
-	dodoc AUTHORS ChangeLog COPYING README
-}
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
index 22ff68d95755..5626e6dda881 100644
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2003/02/23 21:39:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.34.ebuild,v 1.2 2003/06/26 00:35:51 vapier Exp $
 
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
@@ -8,18 +8,16 @@ HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc"
 
 DEPEND="virtual/x11"
 
 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"
-	if [ `use acpi` ] ; then
-		export CFLAGS="${CFLAGS} -DACPI"
-	else
-		export CFLAGS="${CFLAGS} -DAPM"
-	fi
+	[ `use acpi` ] \
+		&& export CFLAGS="${CFLAGS} -DACPI" \
+		|| export CFLAGS="${CFLAGS} -DAPM"
 	emake CFLAGS="${CFLAGS}" || die
 }