Some cleanups from James

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 55 insertions, 16 deletions

diff --git a/app-arch/ipkg-utils/ChangeLog b/app-arch/ipkg-utils/ChangeLog
index 1468813b30c5..5de5d3ba7120 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.5 2006/06/07 17:44:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ChangeLog,v 1.6 2006/07/01 16:06:06 seemant Exp $
+
+  01 Jul 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/ipkg-utils-1.7-build_fixes.patch, ipkg-utils-1.7.ebuild:
+  Some cleanups from James
 
   07 Jun 2006; Seemant Kulleen <seemant@gentoo.org> metadata.xml:
   James Rowe is taking over maintainership of this package. I'll be acting as
diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
index a8075f002501..68305b8b107d 100644
--- a/app-arch/ipkg-utils/Manifest
+++ b/app-arch/ipkg-utils/Manifest
@@ -1,12 +1,16 @@
+AUX ipkg-utils-1.7-build_fixes.patch 855 RMD160 2f371569a47d02738b217d1c81a97d2dac8da3aa SHA1 2b7bc3ed2298a0a03c929877e3b45d5adf6a21fc SHA256 95527be98be707cb1f176f3db88fa60f8752635e7db9c49408f02c7da1324e32
+MD5 2648e3c60f90844028184eb06a0be837 files/ipkg-utils-1.7-build_fixes.patch 855
+RMD160 2f371569a47d02738b217d1c81a97d2dac8da3aa files/ipkg-utils-1.7-build_fixes.patch 855
+SHA256 95527be98be707cb1f176f3db88fa60f8752635e7db9c49408f02c7da1324e32 files/ipkg-utils-1.7-build_fixes.patch 855
 DIST ipkg-utils-1.7.tar.gz 19480
-EBUILD ipkg-utils-1.7.ebuild 1013 RMD160 796af00a21cc9b8b5cb6d74fbee92f01be3286c3 SHA1 2546d6c47826f98819e48fba08c9b15e53fd4602 SHA256 09fffc5a9a152bf0512dcf21b13cb0c0f3be4f276a3d4e4b80e3fb9a1e9af3e0
-MD5 a8fc045f26d689031bb38c868e55aef8 ipkg-utils-1.7.ebuild 1013
-RMD160 796af00a21cc9b8b5cb6d74fbee92f01be3286c3 ipkg-utils-1.7.ebuild 1013
-SHA256 09fffc5a9a152bf0512dcf21b13cb0c0f3be4f276a3d4e4b80e3fb9a1e9af3e0 ipkg-utils-1.7.ebuild 1013
-MISC ChangeLog 720 RMD160 19467d8d1aa6280da619bd90c73370dca61cb566 SHA1 7a480f59e48468dbae1e7d15bf800338e72bdb01 SHA256 f04dd89e0a0846cbccec1b1327f3573940ea4bb8b8eebd1f8439a9802f9a12a4
-MD5 782dee1c148e0f494809278c9d2c1e99 ChangeLog 720
-RMD160 19467d8d1aa6280da619bd90c73370dca61cb566 ChangeLog 720
-SHA256 f04dd89e0a0846cbccec1b1327f3573940ea4bb8b8eebd1f8439a9802f9a12a4 ChangeLog 720
+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 866 RMD160 6dd7738d3227487e2b4915a2fb21dc4d97a97aae SHA1 27afe92d19cc4440063524ede20d1cf218523777 SHA256 a09a81c170eeb1544f6a92eb3359d11a2706c6445d98e863c45eb28cacb2a4a0
+MD5 b8894ed6af1ee6fbca871ff48e5f0c2d ChangeLog 866
+RMD160 6dd7738d3227487e2b4915a2fb21dc4d97a97aae ChangeLog 866
+SHA256 a09a81c170eeb1544f6a92eb3359d11a2706c6445d98e863c45eb28cacb2a4a0 ChangeLog 866
 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/files/ipkg-utils-1.7-build_fixes.patch b/app-arch/ipkg-utils/files/ipkg-utils-1.7-build_fixes.patch
new file mode 100644
index 000000000000..c2044db72d77
--- /dev/null
+++ b/app-arch/ipkg-utils/files/ipkg-utils-1.7-build_fixes.patch
@@ -0,0 +1,29 @@
+Index: ipkg-utils-1.7/Makefile
+===================================================================
+--- ipkg-utils-1.7/Makefile	{cset 1fe36b83-662c-4d43-b5df-915184007abf}
++++ ipkg-utils-1.7/Makefile	{local clone}
+@@ -1,20 +1,19 @@
+ UTILS = ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ all: build
+ 
+ build: ipkg-compare-versions
+-	python setup.py build
+ 
+ ipkg-compare-versions: ipkg-compare-versions.c
+ 	$(CC) $(CFLAGS) -o ipkg-compare-versions ipkg-compare-versions.c
+ 
+ install: ${UTILS}
+-	cp ${UTILS} $(PREFIX)/bin
+-	python setup.py install
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
++	cp ${UTILS} $(DESTDIR)$(PREFIX)/bin
+ 	chmod agu+rx ipkg-make-index
+-	cp -f ipkg-make-index $(PREFIX)/bin
++	cp -f ipkg-make-index $(DESTDIR)$(PREFIX)/bin
+ 
+ binary: build
+ 	mkdir -p ipkg-build-binary/usr/bin
diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild
index f2df06c13de2..a5cd0bad8183 100644
--- a/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild
@@ -1,8 +1,8 @@
 # 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.5 2006/01/20 22:03:21 metalgod Exp $
+# $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 $
 
-inherit distutils
+inherit distutils eutils toolchain-funcs
 
 DESCRIPTION="Tools for working with the ipkg binary package format"
 HOMEPAGE="http://www.openembedded.org/"
@@ -14,13 +14,15 @@ KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
 
 DEPEND="dev-lang/python"
 
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	epatch ${FILESDIR}/${P}-build_fixes.patch
+}
+
 src_compile() {
-	sed -i -e 's#^PREFIX=.*#PREFIX=/usr#' Makefile || die 'prefix fix failed'
-	sed -i -e 's#$(PREFIX)#$(DESTDIR)$(PREFIX)#' Makefile || die 'destdir fix failed'
-	sed -i -e '/^install:/s#^\(.*\)$#\1\n\tmkdir -p $(DESTDIR)$(PREFIX)/bin#' Makefile || die 'mkdir fix failed'
-	sed -i -e '/python setup.py/d' Makefile || die 'sandbox fix failed'
 	distutils_src_compile
-	emake || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {