Bump x11-plugins/wmacpi to version 1.99_p7. Add fix for #60685. Stable for x86. Wipe out older version.

5 files changed, 27 insertions, 12 deletions

diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index fe29c08f8e5f..8f89fcdf70ea 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,10 +1,19 @@
 # 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.11 2004/08/13 19:32:26 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.12 2004/08/20 03:01:35 s4t4n Exp $
+
+*wmacpi-1.99_p7 (20 Aug 2004)
+
+  20 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpi-1.99_p7.ebuild:
+  Version bump. Add DEPEND on x11-libs/libdockapp, change acpi and acpi.1
+  names to acpi-batt-status and acpi-batt-status.1 to fix #60685.
+  Marking it stable for x86.
+  wmacpi-1.99_p6.ebuild, files/digest-wmacpi-1.99_p6:
+  Remove older version...
 
 *wmacpi-1.99_p6 (13 Aug 2004)
 
-  13 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpi-1.99_p3.ebuild:
+  13 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpi-1.99_p6.ebuild:
   Version bump. This version only supports acpi, so all apm related
   stuff was removed from ebuild... Closes #60237.
 
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 79308acab50c..f32a3087324b 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,8 +1,8 @@
+MD5 a5263514591fd78513728ae2f1a36f45 wmacpi-1.99_p7.ebuild 864
 MD5 6ac134652989d0589e446591df5833ce wmacpi-1.34.ebuild 952
-MD5 5b3a4df3c90731889ea9e3901178de5d wmacpi-1.99_p6.ebuild 676
-MD5 11ea0ceb448986f1c3f1b606677d1438 ChangeLog 1075
+MD5 faaafc98cc3b09f9e4c11e18717ef0be ChangeLog 1431
 MD5 4719e916cabe20df559a3e88d5f4722a metadata.xml 250
 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 43273d83d46a4945deecb86710aadc2c files/digest-wmacpi-1.99_p6 65
+MD5 3ced18da6e5bf0b6a8113eb56cb0f0cb files/digest-wmacpi-1.99_p7 65
diff --git a/x11-plugins/wmacpi/files/digest-wmacpi-1.99_p6 b/x11-plugins/wmacpi/files/digest-wmacpi-1.99_p6
deleted file mode 100644
index f29de2692f72..000000000000
--- a/x11-plugins/wmacpi/files/digest-wmacpi-1.99_p6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8aee1e3d28b410463932c72ff9c78cc wmacpi-1.99r6.tar.bz2 26365
diff --git a/x11-plugins/wmacpi/files/digest-wmacpi-1.99_p7 b/x11-plugins/wmacpi/files/digest-wmacpi-1.99_p7
new file mode 100644
index 000000000000..54c140cfadb2
--- /dev/null
+++ b/x11-plugins/wmacpi/files/digest-wmacpi-1.99_p7
@@ -0,0 +1 @@
+MD5 81b123f07c7e0264acb6ea2e321322db wmacpi-1.99r7.tar.bz2 27207
diff --git a/x11-plugins/wmacpi/wmacpi-1.99_p6.ebuild b/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
index 578232c8e5ca..6b2a8b63e532 100644
--- a/x11-plugins/wmacpi/wmacpi-1.99_p6.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.99_p6.ebuild,v 1.1 2004/08/13 19:32:26 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild,v 1.1 2004/08/20 03:01:35 s4t4n Exp $
 
 IUSE=""
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
 HOMEPAGE="http://himi.org/wmacpi-ng/"
-MY_PV="1.99r6"
+MY_PV="1.99r7"
 MY_P="${PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
 SRC_URI="http://himi.org/wmacpi-ng/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 
-DEPEND="virtual/x11"
+DEPEND="virtual/x11
+	>=x11-libs/libdockapp-0.4.0-r1"
 
 src_compile()
 {
@@ -23,7 +24,12 @@ src_compile()
 
 src_install()
 {
-	dobin wmacpi acpi
-	doman wmacpi.1 acpi.1
+	# 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
 }