old, quoting

(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc3 x86_64)

2 files changed, 9 insertions, 52 deletions

diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
index 7b8f6cdf4ca7..a3739054a838 100644
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
@@ -1,37 +1,37 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.13 2006/01/15 14:31:56 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.34.ebuild,v 1.14 2008/06/29 13:08:38 drac Exp $
 
 inherit eutils
 
-IUSE="acpi apm"
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 -sparc amd64 ppc"
+KEYWORDS="amd64 ppc -sparc x86"
+IUSE="acpi apm"
 
 DEPEND="x11-libs/libdockapp"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
+		epatch "${FILESDIR}"/${PV}-acpi.patch
 	else
-		epatch ${FILESDIR}/${PV}-apm.patch
+		epatch "${FILESDIR}"/${PV}-apm.patch
 	fi
 }
 
 src_compile() {
-	emake OPT="${CFLAGS}" || die
+	emake OPT="${CFLAGS}" || die "emake failed."
 }
 
 src_install() {
-	dobin wmacpi
+	dobin wmacpi || die "dobin failed."
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
deleted file mode 100644
index e13c64bb1614..000000000000
--- a/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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.5 2007/03/04 20:13:48 peper 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="amd64 -ppc -sparc x86"
-
-DEPEND="x11-libs/libdockapp"
-
-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-power/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
-}