fix RDEPEND; touchups

Package-Manager: portage-2.1.1_pre5-r3

3 files changed, 20 insertions, 27 deletions

diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index fbab96804582..8bba79347c29 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/hwsetup
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.43 2006/07/25 19:16:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.44 2006/08/26 05:30:06 mr_bones_ Exp $
+
+  26 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org> hwsetup-1.1.ebuild:
+  fix RDEPEND; touchups
 
   25 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   files/hwsetup-1.1-gentoo.patch:
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index 108cd9224c05..18179466a4c3 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hwsetup-1.1-dyn_blacklist.patch 1978 RMD160 523ca0c33b4877635a098ce0eb6139a3a3992007 SHA1 78b4028bc58feb35c5a8f63698be842607c5f3e3 SHA256 44f3ed169dfc4882d20ade009b747ce6bd04846b9b678979185e8d7c1ac07f6a
 MD5 d374ea118a38b12a7372efa0eb41a3ad files/hwsetup-1.1-dyn_blacklist.patch 1978
 RMD160 523ca0c33b4877635a098ce0eb6139a3a3992007 files/hwsetup-1.1-dyn_blacklist.patch 1978
@@ -14,14 +11,14 @@ MD5 ad0bc16bdb6e632f71a2768e270c9372 files/hwsetup-1.1-gentoo.patch 4249
 RMD160 d2579ab52220879030408bfbbd8bf304c5650cdd files/hwsetup-1.1-gentoo.patch 4249
 SHA256 3e5531d98e293c8c2c0d0107f6bfdcd9fe8f503da83882b2ec8defe2d93ec4cd files/hwsetup-1.1-gentoo.patch 4249
 DIST hwsetup_1.1-1.tar.gz 9062 RMD160 e0728e9d79b83e815586c6af8e70baae0ac913c4 SHA1 b784b2ac947e2c98321875c83cb23fb2e3e8b342 SHA256 86fa767b6ceb74ce71fc6895e9db43445058025e4c0d6834a2c60159e3ea1199
-EBUILD hwsetup-1.1.ebuild 1301 RMD160 389a12c2a708e46983e589fb4a296f012fddf7e7 SHA1 3147e26b6e0943452a4167b4327a0f8a27865f13 SHA256 e15fa4feed51ca45a09327961159dd701ec4710e79ccf57c7c5d21909c4c7399
-MD5 f4c065fa81fc503dc09c2ae77242b8da hwsetup-1.1.ebuild 1301
-RMD160 389a12c2a708e46983e589fb4a296f012fddf7e7 hwsetup-1.1.ebuild 1301
-SHA256 e15fa4feed51ca45a09327961159dd701ec4710e79ccf57c7c5d21909c4c7399 hwsetup-1.1.ebuild 1301
-MISC ChangeLog 6551 RMD160 eb8e2e1d0832d0bb93fc19eb313b01ff3b31ad0f SHA1 08625f384951b29123502d930b066563b6273feb SHA256 da94868c7c42835e39ec28038427f3eaab142fd139aaa4d154618e2161e9f21d
-MD5 d46cb4168abfb1eeb8a70bb2b90a49da ChangeLog 6551
-RMD160 eb8e2e1d0832d0bb93fc19eb313b01ff3b31ad0f ChangeLog 6551
-SHA256 da94868c7c42835e39ec28038427f3eaab142fd139aaa4d154618e2161e9f21d ChangeLog 6551
+EBUILD hwsetup-1.1.ebuild 1296 RMD160 9e6d42574c0e5efa5c0167f42df1b298f1ed7038 SHA1 a1742f07561a43216734493719e907178285570d SHA256 65b37f6ddfdadd7d3af29a4a379b5c7dd2e1b7f44ce2bbb8b6c7b41bc78d0246
+MD5 69c8389dfb983a9f94f2bcf569b41116 hwsetup-1.1.ebuild 1296
+RMD160 9e6d42574c0e5efa5c0167f42df1b298f1ed7038 hwsetup-1.1.ebuild 1296
+SHA256 65b37f6ddfdadd7d3af29a4a379b5c7dd2e1b7f44ce2bbb8b6c7b41bc78d0246 hwsetup-1.1.ebuild 1296
+MISC ChangeLog 6652 RMD160 79f5a1c4c63d66fd184c15047dfb77e05681cc8b SHA1 7278914e3f950ff87799066b9b31dc7a7ae2fc7b SHA256 1d9afbe149337ead58ad2bdfa5e3a72afc5c91565aa42553997ebbd4561d3418
+MD5 1b9c8a41153f3b51747559e4717f0756 ChangeLog 6652
+RMD160 79f5a1c4c63d66fd184c15047dfb77e05681cc8b ChangeLog 6652
+SHA256 1d9afbe149337ead58ad2bdfa5e3a72afc5c91565aa42553997ebbd4561d3418 ChangeLog 6652
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
@@ -29,10 +26,3 @@ SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d metadata
 MD5 dc992bac6f5f8dfb9dbb29a6543d072f files/digest-hwsetup-1.1 235
 RMD160 2a96256e2cb11c05b062b141c94ecbb07f56772a files/digest-hwsetup-1.1 235
 SHA256 95efc35c3ca6de4f79085ffa3e41c0bd9bc5498d2ebbdbe92423da33c56b06cf files/digest-hwsetup-1.1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFExm4LkT4lNIS36YERAvG3AKCMH8Y6JLjkH7HxxkLcQanONR7SUgCeJTHE
-9yy0BhT7z0mZipMDAk/mmsU=
-=SS0t
------END PGP SIGNATURE-----
diff --git a/sys-apps/hwsetup/hwsetup-1.1.ebuild b/sys-apps/hwsetup/hwsetup-1.1.ebuild
index 126f14b027d6..55b4e684ea6f 100644
--- a/sys-apps/hwsetup/hwsetup-1.1.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.1.ebuild,v 1.14 2006/06/22 19:06:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.1.ebuild,v 1.15 2006/08/26 05:30:06 mr_bones_ Exp $
 
 inherit eutils
 
@@ -18,22 +18,22 @@ IUSE=""
 DEPEND="sys-libs/libkudzu
 	sys-apps/pciutils"
 RDEPEND="${DEPEND}
-	|| ( sys-apps/hwdata-gentoo
-		sys-apps/hwdata )"
+	sys-apps/hwdata-gentoo"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-dyn_blacklist.patch
-	epatch ${FILESDIR}/${P}-fastprobe.patch
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch \
+		"${FILESDIR}"/${P}-dyn_blacklist.patch \
+		"${FILESDIR}"/${P}-fastprobe.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
-	emake  || die
+	emake  || die "emake failed"
 }
 
 src_install() {
-	einstall DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
+	einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
 }
 
 pkg_postinst() {