sci-mathematics/num-utils: Bump EAPI=4, fix recursive-relative path in patches, #421787

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 31 insertions, 23 deletions

diff --git a/sci-mathematics/num-utils/ChangeLog b/sci-mathematics/num-utils/ChangeLog
index 43041552de85..c8dfcd5ea437 100644
--- a/sci-mathematics/num-utils/ChangeLog
+++ b/sci-mathematics/num-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/num-utils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/ChangeLog,v 1.9 2011/01/03 18:11:18 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/ChangeLog,v 1.10 2012/06/19 11:56:26 jlec Exp $
+
+  19 Jun 2012; Justin Lecher <jlec@gentoo.org> num-utils-0.5-r1.ebuild,
+  metadata.xml:
+  Bump EAPI=4, fix recursive-relative path in patches, #421787
 
 *num-utils-0.5-r1 (03 Jan 2011)
 
diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest
index 626b6ba9eb90..aec982493019 100644
--- a/sci-mathematics/num-utils/Manifest
+++ b/sci-mathematics/num-utils/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST num-utils-0.3.tar.gz 28208 RMD160 b6ac19c51fa9241dcaa32a9e4ae5ef03b7e469d4 SHA1 8c49d3e54a50220e278244ad1f744877e87209ae SHA256 2369fbd7ef094129d6bc60c54a22e98d2329e9ce7b1b958614991398ec1bff72
 DIST num-utils-0.5.tar.gz 31845 RMD160 54ed62109fdbeaf4fe2006a072e1e4e778ab146c SHA1 3fc6130874129fe1e98db6db8b3dc43f0e1a89ac SHA256 03592760fc7844492163b14ddc9bb4e4d6526e17b468b5317b4a702ea7f6c64e
 DIST num-utils_0.5-11.diff.gz 11702 RMD160 861df640cbf10713d0ac1df5186c29d1b27365e5 SHA1 25e662aab5eaf108598239716ab922b320056ff2 SHA256 6b4294671eff9378579f20904b27ef42ba4bfb2ac0af74007a81b08e6cc917ad
 EBUILD num-utils-0.3.ebuild 684 RMD160 a8ae593cf5bfafaeac82afed950e338f3eb97b5e SHA1 7e731c5cfd9bacc525f8b142e7c3d3727ceba9c9 SHA256 599671e41999bcbf5bdb069794c4035248f2834e4f62df725dee534a581bfb4d
-EBUILD num-utils-0.5-r1.ebuild 1188 RMD160 24084168cde23e458d6e9812ddcda6c997346a03 SHA1 6dabbf7bfdc2546d75f0a4ed9c2a22cadfa74671 SHA256 5d9a1461c2733e83ac6e01382f6b56bfd98d5054317085d7f347b6c6a4ca5f0f
-MISC ChangeLog 1604 RMD160 70b1b964cbd5990c4d4810695e37e65d8e810dd1 SHA1 8618b7d4c8e56d10b35befa1d24247bc4e322616 SHA256 5bc9382c5111276be129d0e4cd857418908c89af255507f2363c29498252d80d
-MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
+EBUILD num-utils-0.5-r1.ebuild 1219 RMD160 2bec1f091e0d20dcc31cd25efdceabf9676d9f4c SHA1 f6c7eec961195780cd7d4166130ec40d1447f7d3 SHA256 e894724c139f41830427c840c4de525e92b4114bb5ff17b08bfb2c58e4c12286
+MISC ChangeLog 1753 RMD160 a9766cd7124686d8699741bbe0dd0db996902be6 SHA1 08a684d74a4b3f713cc097f9106b903779fa082a SHA256 57a6aefe52a59d3a75e80b7cf70cd18921467f057bf4645f730da206574df945
+MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk0iEU8ACgkQ1ycZbhPLE2C+8ACfad7vyytSbHqcouifi1yA0g9O
-Dl8An3lKaddVqQGkmtiMV2dNRPvCmcFQ
-=PSYB
+iEYEAREKAAYFAk/gaO8ACgkQgAnW8HDreRb/FQCeMq4BCmpdBAfTDTU3bYM8YGN1
+1oYAoJ1RIXM0PZN/Z7HmJ44jgxCUXSbe
+=4o1m
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/num-utils/metadata.xml b/sci-mathematics/num-utils/metadata.xml
index 5a2f1c7b832e..2b0bd5314823 100644
--- a/sci-mathematics/num-utils/metadata.xml
+++ b/sci-mathematics/num-utils/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+	<herd>sci-mathematics</herd>
 </pkgmetadata>
diff --git a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
index 05745aaa05f4..9ca843030209 100644
--- a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
+++ b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
@@ -1,43 +1,46 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild,v 1.1 2011/01/03 18:11:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild,v 1.2 2012/06/19 11:56:26 jlec Exp $
+
+EAPI=4
 
-EAPI="3"
 inherit eutils
 
 DEB_PR=11
 
 DESCRIPTION="A set of programs for dealing with numbers from the command line"
-SRC_URI="http://suso.suso.org/programs/num-utils/downloads/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz"
-
 HOMEPAGE="http://suso.suso.org/programs/num-utils/"
+SRC_URI="
+	http://suso.suso.org/programs/num-utils/downloads/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_prepare() {
 	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_PR}.diff
+	sed \
+		-e 's:../orig/num-utils-0.5/::g' \
+		-i "${S}"/debian/patches/*.diff || die
 	epatch "${S}"/debian/patches/*.diff
+
 	local x
 	for x in average bound interval normalize random range round; do
 		mv $x num$x || die "renaming $x failed"
 	done
-	sed -i \
+
+	sed \
 		-e 's/^RPMDIR/#RPMDIR/' \
 		-e 's/COPYING//' \
 		-e 's/LICENSE//' \
 		-e '/^DOCS/s/MANIFEST//' \
-		Makefile || die "sed Makefile failed"
+		-i Makefile || die "sed Makefile failed"
 }
 
 src_install () {
-	emake ROOT="${ED}" install || die "emake install failed"
+	emake ROOT="${ED}" install
 }
 
 pkg_postinst() {