Fix deps and a few other things.

Package-Manager: portage-2.1.2_pre3-r7

5 files changed, 48 insertions, 40 deletions

diff --git a/sys-power/acpi/ChangeLog b/sys-power/acpi/ChangeLog
index 23740c395243..ecb863164d96 100644
--- a/sys-power/acpi/ChangeLog
+++ b/sys-power/acpi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/acpi
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi/ChangeLog,v 1.3 2005/04/23 13:14:24 swegener Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi/ChangeLog,v 1.4 2006/10/26 16:33:29 peper Exp $
+
+  26 Oct 2006; Piotr Jaroszyński <peper@gentoo.org> acpi-0.06-r5.ebuild:
+  Fix deps and a few other things.
 
 *acpi-0.09 (22 Apr 2005)
 
diff --git a/sys-power/acpi/Manifest b/sys-power/acpi/Manifest
index f2a16177474d..c1eb6eeed992 100644
--- a/sys-power/acpi/Manifest
+++ b/sys-power/acpi/Manifest
@@ -2,35 +2,35 @@
 Hash: SHA1
 
 DIST acpi-0.09.tar.gz 83515 RMD160 c20dba1674bf8fadd917c2f5619a909817f4bf06 SHA1 2dcf9415680d19b780ad607ce4326d7bfbe3f6a9 SHA256 c1eee19abd174f6bf3d519e6423a2c23d8c05c929211dab7a4c9b237eafa3c86
-DIST acpi_0.06-5.diff.gz 2627
-DIST acpi_0.06.orig.tar.gz 42907
+DIST acpi_0.06-5.diff.gz 2627 RMD160 b60e6b933d7a706a3557d83eaddcbd2f582560c9 SHA1 54924181fabfed2666cb03161c96e0f8e62171bb SHA256 c93f6947350965d3a74aa5f7b9f7a5174db15bfdc51cd89f040461a4122ee169
+DIST acpi_0.06.orig.tar.gz 42907 RMD160 04aa175c560d03d354ef6bc337755a0d67ba8c71 SHA1 8064b0203149e4c8fc439659e519fa1c325bb053 SHA256 18e0f2865787db68bac3562730185bcd02c1d571877cd6128c18642d772b23fc
 DIST acpi_0.09-1.diff.gz 3622 RMD160 8727005aff15ffd45829a27b7b512a8836d4af4e SHA1 f8e447b07b78d104a681240b83155a6b9c6cba94 SHA256 914d5f8cd5981d713bddd7554d0bd73bf8e8b732b89e49009fac9f9016a090b7
-EBUILD acpi-0.06-r5.ebuild 1067 RMD160 d68ce0496074da6b92403eba401a75eade23801c SHA1 b7dd201f07ab893f5d3952787a71d9f7edc9f693 SHA256 885ce934ef8044b1de9e82eeb34d38260bbdbbf006276a95801d76325462fe3e
-MD5 888509fdd5db3c736c9eaee4c987970e acpi-0.06-r5.ebuild 1067
-RMD160 d68ce0496074da6b92403eba401a75eade23801c acpi-0.06-r5.ebuild 1067
-SHA256 885ce934ef8044b1de9e82eeb34d38260bbdbbf006276a95801d76325462fe3e acpi-0.06-r5.ebuild 1067
-EBUILD acpi-0.09.ebuild 809 RMD160 97dd1da9c80f4c4cfa25b1487e9885c244a6e7b1 SHA1 9d76b15780a52ea7ced8ae4ab94f3136e96db76f SHA256 2a5197c1c1661a90e564e281f0de4a80a1a7cd7ef21e28868c8d43d0f17710a8
-MD5 8d48c8b2f8a1dbf760c9935e57916e50 acpi-0.09.ebuild 809
-RMD160 97dd1da9c80f4c4cfa25b1487e9885c244a6e7b1 acpi-0.09.ebuild 809
-SHA256 2a5197c1c1661a90e564e281f0de4a80a1a7cd7ef21e28868c8d43d0f17710a8 acpi-0.09.ebuild 809
-MISC ChangeLog 1173 RMD160 48aece3c38558c1fe093049de68c2e0c6c8eaa75 SHA1 66cce6bd076e2f1ec31329ebb429f43330165780 SHA256 979f9a076d51a84decbc4df72603440ef57136c386e9793a5333aec4362f55fa
-MD5 8086b22be59b67ab3ed775ab99dc092b ChangeLog 1173
-RMD160 48aece3c38558c1fe093049de68c2e0c6c8eaa75 ChangeLog 1173
-SHA256 979f9a076d51a84decbc4df72603440ef57136c386e9793a5333aec4362f55fa ChangeLog 1173
+EBUILD acpi-0.06-r5.ebuild 1104 RMD160 5ae8adfa4fcaed6373d8f09dba3794cc63b2125d SHA1 4e35297eb5e6f4eb03521dc15d9044f501a54a2c SHA256 adb4f50a6179fe0ef271cf04d01ddd05d2400f6202e51b79af389f721ade54f7
+MD5 6b788dea01b4600520afb86114504344 acpi-0.06-r5.ebuild 1104
+RMD160 5ae8adfa4fcaed6373d8f09dba3794cc63b2125d acpi-0.06-r5.ebuild 1104
+SHA256 adb4f50a6179fe0ef271cf04d01ddd05d2400f6202e51b79af389f721ade54f7 acpi-0.06-r5.ebuild 1104
+EBUILD acpi-0.09.ebuild 808 RMD160 0795720f2654878fbf74fa551775ca9a393fb1fd SHA1 755937cbee1d714cc97d932c0b1bd039b7d8f286 SHA256 66e1a52abe7c325e240128e59f316496515db598f8f6c465ac6247a778253946
+MD5 e59c1921b7c44979ba4ed4e2541d6b28 acpi-0.09.ebuild 808
+RMD160 0795720f2654878fbf74fa551775ca9a393fb1fd acpi-0.09.ebuild 808
+SHA256 66e1a52abe7c325e240128e59f316496515db598f8f6c465ac6247a778253946 acpi-0.09.ebuild 808
+MISC ChangeLog 1280 RMD160 f53b28f633e6bb1f83979cf4ed0d1b1a4303ea96 SHA1 f7bfa46e9723000d9c4aeb251125913cb5e5ace6 SHA256 8caddfc188a6a98c6c2557da545ebd78656ab433bc9cbd4b1d4ea9886d108399
+MD5 207a269a6d112b2e0078998ed58b4993 ChangeLog 1280
+RMD160 f53b28f633e6bb1f83979cf4ed0d1b1a4303ea96 ChangeLog 1280
+SHA256 8caddfc188a6a98c6c2557da545ebd78656ab433bc9cbd4b1d4ea9886d108399 ChangeLog 1280
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
 SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
-MD5 110e12e115d1d3af995c88fa9db2639b files/digest-acpi-0.06-r5 127
-RMD160 f9eeaea7e2fa64d756fa7ad6afa2cdb0b5206562 files/digest-acpi-0.06-r5 127
-SHA256 c29d2882a92761f4c24455af8b036bf56f6221556f0701086f1c0b4fb26ab75f files/digest-acpi-0.06-r5 127
+MD5 0772b424a56d8e15631f3d384f04100e files/digest-acpi-0.06-r5 473
+RMD160 262af07a6a21f7a0eb38fe7aaea10c44f47213d5 files/digest-acpi-0.06-r5 473
+SHA256 9352b9c357ff8ecd877f16df090c355c963801dd0fcbac350bc99465aed15aaa files/digest-acpi-0.06-r5 473
 MD5 3be98278288ef518002a247a7ef04ec2 files/digest-acpi-0.09 458
 RMD160 2e88502a5f7aebbe397cc7b3d1fce704eaaf62c3 files/digest-acpi-0.09 458
 SHA256 3e24de7247fbaa0e61e9dd2e2e3d8fd43b3fbe8bfac0a2c04d91d3fbfaff3fed files/digest-acpi-0.09 458
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE599zamhnQswr0vIRAnJxAJkBG+rkFEJ92qQKKdTliXr1wS/aZgCgtsCl
-MoNfQZ7JE/FxLe9LwAjKK0U=
-=/Id1
+iD8DBQFFQOMuppoStNGKGywRAqIpAJ0eNyQemM3L9A76RJMH3r6ljywf4gCgtkjN
+j0JSWQwEz/gSLaGwzJrOPGw=
+=XYUI
 -----END PGP SIGNATURE-----
diff --git a/sys-power/acpi/acpi-0.06-r5.ebuild b/sys-power/acpi/acpi-0.06-r5.ebuild
index db46c120b750..a2dd79572936 100644
--- a/sys-power/acpi/acpi-0.06-r5.ebuild
+++ b/sys-power/acpi/acpi-0.06-r5.ebuild
@@ -1,41 +1,42 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi/acpi-0.06-r5.ebuild,v 1.1 2005/04/22 18:19:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi/acpi-0.06-r5.ebuild,v 1.2 2006/10/26 16:33:29 peper Exp $
 
 inherit eutils
 
 SRC_URI_BASE="http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}"
 SRC_URI_TGZ="${PN}_${PV}.orig.tar.gz"
 SRC_URI_PATCH="${PN}_${PV}-${PR/r}.diff.gz"
-DESCRIPTION="Attempts to replicate the functionality of the 'old' apm command on ACPI systems, including battery and thermal information."
+DESCRIPTION="Attemp to replicate the functionality of the 'old' apm command on ACPI systems."
 HOMEPAGE="http://packages.debian.org/unstable/utils/acpi.html"
-SRC_URI="${SRC_URI_BASE}/${SRC_URI_TGZ} ${SRC_URI_BASE}/${SRC_URI_PATCH}"
+SRC_URI="${SRC_URI_BASE}/${SRC_URI_TGZ}
+	${SRC_URI_BASE}/${SRC_URI_PATCH}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* x86 ~amd64"
 IUSE=""
 
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-devel/gcc"
+DEPEND="=sys-devel/automake-1.4*
+	sys-apps/help2man"
+RDEPEND=""
 
 src_unpack() {
 	unpack ${SRC_URI_TGZ}
 	mv ${PN} ${P}
-	epatch ${DISTDIR}/${SRC_URI_PATCH}
+	epatch "${DISTDIR}/${SRC_URI_PATCH}"
 }
 
 src_compile() {
-	econf || die
-	emake || die
-	# build docs
-	emake -C doc || die
+	econf || die "econf failed"
+	emake || die "emake failed"
+
+	# build manpage
+	emake -C doc || die "emake doc failed"
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die "make install failed"
 	doman doc/acpi.1
 	dodoc AUTHORS CREDITS ChangeLog README
 }
diff --git a/sys-power/acpi/acpi-0.09.ebuild b/sys-power/acpi/acpi-0.09.ebuild
index fa017654a072..c92a6eeb48fd 100644
--- a/sys-power/acpi/acpi-0.09.ebuild
+++ b/sys-power/acpi/acpi-0.09.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi/acpi-0.09.ebuild,v 1.2 2006/08/20 04:03:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi/acpi-0.09.ebuild,v 1.3 2006/10/26 16:33:29 peper Exp $
 
 inherit eutils
 
diff --git a/sys-power/acpi/files/digest-acpi-0.06-r5 b/sys-power/acpi/files/digest-acpi-0.06-r5
index ad9386f877ca..6aedcbf8007e 100644
--- a/sys-power/acpi/files/digest-acpi-0.06-r5
+++ b/sys-power/acpi/files/digest-acpi-0.06-r5
@@ -1,2 +1,6 @@
-MD5 062a77b38b929fe34120c3f258fd01ba acpi_0.06.orig.tar.gz 42907
 MD5 94e1da7fdab883fc45edb96d812cb1f1 acpi_0.06-5.diff.gz 2627
+RMD160 b60e6b933d7a706a3557d83eaddcbd2f582560c9 acpi_0.06-5.diff.gz 2627
+SHA256 c93f6947350965d3a74aa5f7b9f7a5174db15bfdc51cd89f040461a4122ee169 acpi_0.06-5.diff.gz 2627
+MD5 062a77b38b929fe34120c3f258fd01ba acpi_0.06.orig.tar.gz 42907
+RMD160 04aa175c560d03d354ef6bc337755a0d67ba8c71 acpi_0.06.orig.tar.gz 42907
+SHA256 18e0f2865787db68bac3562730185bcd02c1d571877cd6128c18642d772b23fc acpi_0.06.orig.tar.gz 42907