Some cleanups from James in bug #142980. Also, explicitly setting RDEPEND

Package-Manager: portage-2.1.1_pre4-r3

4 files changed, 49 insertions, 23 deletions

diff --git a/app-arch/ipkg-utils/ChangeLog b/app-arch/ipkg-utils/ChangeLog
index f222cd49df54..0d31f75d16cc 100644
--- a/app-arch/ipkg-utils/ChangeLog
+++ b/app-arch/ipkg-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/ipkg-utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ChangeLog,v 1.7 2006/07/12 12:05:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ChangeLog,v 1.8 2006/08/06 14:44:34 seemant Exp $
+
+  06 Aug 2006; Seemant Kulleen <seemant@gentoo.org> ipkg-utils-1.7.ebuild,
+  ipkg-utils-1.7.050831.ebuild:
+  Some cleanups from James in bug #142980. Also, explicitly setting RDEPEND
 
 *ipkg-utils-1.7.050831 (12 Jul 2006)
 
diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
index 80798917b7e7..eaf6c3f2d4e4 100644
--- a/app-arch/ipkg-utils/Manifest
+++ b/app-arch/ipkg-utils/Manifest
@@ -4,18 +4,18 @@ RMD160 2f371569a47d02738b217d1c81a97d2dac8da3aa files/ipkg-utils-1.7-build_fixes
 SHA256 95527be98be707cb1f176f3db88fa60f8752635e7db9c49408f02c7da1324e32 files/ipkg-utils-1.7-build_fixes.patch 855
 DIST ipkg-utils-050831.tar.gz 29175 RMD160 0b41d3afa907013f105f704afe9327ddeda360b3 SHA1 482be22bca16fa7c04769ff39be7e43c348a6242 SHA256 1dde1111fbca85977855db9acb557097a32a5133d8764a05ea36a89a1205394b
 DIST ipkg-utils-1.7.tar.gz 19480
-EBUILD ipkg-utils-1.7.050831.ebuild 1064 RMD160 4977a29cde5b544fb269e2762512b54666180105 SHA1 043da93af0f23dde3857a82ab14406f23e20e070 SHA256 d9c6c122c32a490e209e6304eb0d3fb3b65062fc98d7a022672c7bf8a9477566
-MD5 fc16367738902e34d710ecc0f72ea1b1 ipkg-utils-1.7.050831.ebuild 1064
-RMD160 4977a29cde5b544fb269e2762512b54666180105 ipkg-utils-1.7.050831.ebuild 1064
-SHA256 d9c6c122c32a490e209e6304eb0d3fb3b65062fc98d7a022672c7bf8a9477566 ipkg-utils-1.7.050831.ebuild 1064
-EBUILD ipkg-utils-1.7.ebuild 799 RMD160 6e08a9c6995d2a05392fb4ef85092204ae7f492b SHA1 f0e0ffeada4a3370a111d9a710aec66017c1b88b SHA256 25983f00842523b20bbb043320e7753181dcfe23ee801ad7453db515d36f6e60
-MD5 9eab43a3deecf986dc9f93c060c27990 ipkg-utils-1.7.ebuild 799
-RMD160 6e08a9c6995d2a05392fb4ef85092204ae7f492b ipkg-utils-1.7.ebuild 799
-SHA256 25983f00842523b20bbb043320e7753181dcfe23ee801ad7453db515d36f6e60 ipkg-utils-1.7.ebuild 799
-MISC ChangeLog 1037 RMD160 3a5a60d4923c4ec4d34b73626a3a79280a1af083 SHA1 5658680a9b5b84130c9daac98d5e2a5c15192ddd SHA256 9500742d8f6d6f7589747a829fcd1160a8e9b58eae2d595b14a27a9d3a3b3a0c
-MD5 5c802a15080b3d8b68fb2e3861817f07 ChangeLog 1037
-RMD160 3a5a60d4923c4ec4d34b73626a3a79280a1af083 ChangeLog 1037
-SHA256 9500742d8f6d6f7589747a829fcd1160a8e9b58eae2d595b14a27a9d3a3b3a0c ChangeLog 1037
+EBUILD ipkg-utils-1.7.050831.ebuild 1346 RMD160 bedc6addbc2f2ff4f12fe2299bd82375449bf964 SHA1 c2169ddefe3856404e64d26a78248e9b59bc52db SHA256 416dc19f4a95d2ab0178fb80bf8da9dd1faf3c6cc7e59e890aed50616b2b1e5f
+MD5 35b9340e97f70a477eee60cdb257a974 ipkg-utils-1.7.050831.ebuild 1346
+RMD160 bedc6addbc2f2ff4f12fe2299bd82375449bf964 ipkg-utils-1.7.050831.ebuild 1346
+SHA256 416dc19f4a95d2ab0178fb80bf8da9dd1faf3c6cc7e59e890aed50616b2b1e5f ipkg-utils-1.7.050831.ebuild 1346
+EBUILD ipkg-utils-1.7.ebuild 1086 RMD160 bcb9ccf84154344046f3bba0a3ca92a0166e3d3a SHA1 31501e3e64f159ee5456b229a237d8b259b91c0e SHA256 96ab6363f6f4ae50d0ee446aa7b9426810813057a99700ff390d13afa9cf175c
+MD5 2e19617887d380675488c8915b7139e9 ipkg-utils-1.7.ebuild 1086
+RMD160 bcb9ccf84154344046f3bba0a3ca92a0166e3d3a ipkg-utils-1.7.ebuild 1086
+SHA256 96ab6363f6f4ae50d0ee446aa7b9426810813057a99700ff390d13afa9cf175c ipkg-utils-1.7.ebuild 1086
+MISC ChangeLog 1221 RMD160 17838999e900b2ff0903c9bd07427a30115e5c06 SHA1 0892dbff632b01bc34d6f7566b5d29d06b5df593 SHA256 a60265ad1a863540910ebea7f3f46bd91c2c6ffd67011bfc710f5851424161ef
+MD5 3fcdf4f28aa4bda5b8d507180a600cac ChangeLog 1221
+RMD160 17838999e900b2ff0903c9bd07427a30115e5c06 ChangeLog 1221
+SHA256 a60265ad1a863540910ebea7f3f46bd91c2c6ffd67011bfc710f5851424161ef ChangeLog 1221
 MISC metadata.xml 470 RMD160 0ee9229296e2447465a5749478b66b0a3232ee01 SHA1 044f9192a6036e1784e10555d0c0c61239dea1f1 SHA256 3d991c0f9bdb1ffbeb019aecf6542b7144d2de61da72ebbcb69933a243142f28
 MD5 6b8611791f64cdda78ca95bf5351176b metadata.xml 470
 RMD160 0ee9229296e2447465a5749478b66b0a3232ee01 metadata.xml 470
diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild
index dfa3208f6b71..e1a1b40618f7 100644
--- a/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.050831.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/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild,v 1.1 2006/07/12 12:05:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild,v 1.2 2006/08/06 14:44:34 seemant Exp $
 
 inherit distutils eutils toolchain-funcs versionator
 
@@ -10,17 +10,28 @@ DESCRIPTION="Tools for working with the ipkg binary package format"
 HOMEPAGE="http://www.openembedded.org/"
 SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz"
 LICENSE="GPL-2"
-IUSE=""
+IUSE="minimal"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
 S=${WORKDIR}/${MY_P}
 
-DEPEND="dev-lang/python"
+RDEPEND="dev-lang/python
+	!minimal? (
+		app-crypt/gnupg
+		net-misc/curl
+	)"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}; cd ${S}
 
-	epatch ${FILESDIR}/${PN}-1.7-build_fixes.patch
+	sed '/python setup.py build/d' -i Makefile
+
+	if use minimal; then
+		einfo "ipkg-upload is not installed when the \`minimal' USE flag is set.  If you"
+		einfo "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
+	fi
 }
 
 src_compile() {
@@ -30,7 +41,7 @@ src_compile() {
 
 src_install() {
 	distutils_src_install
-	make DESTDIR=${D} install || die
+	use minimal && rm ${D}/usr/bin/ipkg-upload
 }
 
 pkg_postinst() {
diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild
index a5cd0bad8183..5653d32f7752 100644
--- a/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.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/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild,v 1.6 2006/07/01 16:06:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild,v 1.7 2006/08/06 14:44:34 seemant Exp $
 
 inherit distutils eutils toolchain-funcs
 
@@ -8,16 +8,27 @@ DESCRIPTION="Tools for working with the ipkg binary package format"
 HOMEPAGE="http://www.openembedded.org/"
 SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${P}.tar.gz"
 LICENSE="GPL-2"
-IUSE=""
+IUSE="minimal"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
 
-DEPEND="dev-lang/python"
+RDEPEND="dev-lang/python
+	!minimal? (
+		app-crypt/gnupg
+		net-misc/curl
+	)"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}; cd ${S}
 
-	epatch ${FILESDIR}/${P}-build_fixes.patch
+	sed '/python setup.py build/d' -i Makefile
+
+	if use minimal; then
+		einfo "ipkg-upload is not installed when the \`minimal' USE flag is set.  If you"
+		einfo "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
+	fi
 }
 
 src_compile() {
@@ -27,5 +38,5 @@ src_compile() {
 
 src_install() {
 	distutils_src_install
-	make DESTDIR=${D} install || die
+	use minimal && rm ${D}/usr/bin/ipkg-upload
 }