Move to EAPI=4, version Bump

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

4 files changed, 76 insertions, 15 deletions

diff --git a/dev-cpp/muParser/ChangeLog b/dev-cpp/muParser/ChangeLog
index 4df43e3a808c..60e72a2ef1eb 100644
--- a/dev-cpp/muParser/ChangeLog
+++ b/dev-cpp/muParser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/muParser
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/ChangeLog,v 1.17 2010/11/12 08:20:55 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/ChangeLog,v 1.18 2011/12/16 14:45:32 jlec Exp $
+
+*muParser-2.1.0 (16 Dec 2011)
+
+  16 Dec 2011; Justin Lecher <jlec@gentoo.org> muParser-1.34.ebuild,
+  +muParser-2.1.0.ebuild:
+  Move to EAPI=4, version Bump
 
   12 Nov 2010; Justin Lecher <jlec@gentoo.org> -muParser-1.28.ebuild,
   -muParser-1.30.ebuild, -muParser-1.32.ebuild:
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 1a2809cad72b..78e624958e5d 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX muParser-1.28-destdir.patch 799 RMD160 542672389ffd3d88abc7f1b9f7b0c159808e3c90 SHA1 c8ca147ac760522a03497adf0bbf570645a1b670 SHA256 250cf7042d6cc484dc5811571c79b0027f46deac07393d97951a4a0907fadc8b
 AUX muParser-1.28-gcc43.patch 747 RMD160 e14dcb0d22e17a36c8c7c99104f7190a8a960834 SHA1 b9beddee8309a01c1e2de20848cbaa9992190679 SHA256 767ea424460f2c2e9fe33253f44655e47bfb5d8b32a606637bec8ec2302a773a
@@ -8,14 +8,16 @@ AUX muParser-1.32-build.patch 337 RMD160 d3f7946717ca02cc29743676583b2ba5a31b4f8
 AUX muParser-1.32-parallel-build.patch 680 RMD160 ce219ed4e68f8a50d03c2e3ebf2daea54e1a8a5f SHA1 df103111a900c655dee83d7674fe588cb48a169e SHA256 bd68969e797530a11dd7bd8864131d0cf6878a9f754fdb005070760fc82dd948
 DIST muparser_v132.tar.gz 1009309 RMD160 a8c03084db33f0a62b9d927799134fc35c7a4d87 SHA1 ff9e7be4408cafbbd6d9256095eaf8ebb12611b1 SHA256 49dec550c0a5bddf506c3ce80e3d98c92f83dd021acb0e0d57ce4d3ea9df8f47
 DIST muparser_v134.tar.gz 1013841 RMD160 ee7e0e4ebedde6368d1bfa100da23ac3ce946500 SHA1 d6d834d3ba2bd3c316c9b3070369d32701703f78 SHA256 0e3d3dffe2d0bac9c381fc1320ee1e549993aff554d8c16d719caf23653f2276
+DIST muparser_v2_1_0.zip 1465893 RMD160 cf52e9baca5a094bee00e5dafda4e8aa60f9f393 SHA1 797a45593e6edb86cb01f9dfe02e984849b96675 SHA256 4babb0cf4073943cb369cf78cb7a1b2c3188cdcf5406becf3b229509ce6bd17d
 EBUILD muParser-1.32-r1.ebuild 1283 RMD160 7a26b50086fd9c11c1e8cac79f3ba15b1b79c298 SHA1 5e570ead258f503bda58bb0143302735814e90fa SHA256 526307d1c184250152b66d335fb9e62173f02ef556c9540742129f3566ee5370
-EBUILD muParser-1.34.ebuild 1128 RMD160 08b8271aee870f6d271efef2c1794b02047f1f3d SHA1 e7135aacbbd5593efd6765777786cf707bdc4d8f SHA256 a2655e72a16d991c041489c6ba0d4c0411e5e55a4415648c01e099d84fa88bd9
-MISC ChangeLog 2550 RMD160 e2e181f00a2b3549dfaa5652928482fa42e83dcc SHA1 47adb7909b32cf517d86738d5c6d567a2fd766d7 SHA256 d3756fc01e2fb4431e82e3620cce4c28f46f946fbf188070dac6d35e493b0cde
+EBUILD muParser-1.34.ebuild 1080 RMD160 7e856d833154503330ef4c20eada208b85205993 SHA1 8a1e0a426f9e341682295db6dd318e0fa1933ab2 SHA256 0e3f35077ac7f6c0170a413b8885095f0ba8dd558e2d0156de037ed9d4bf08ed
+EBUILD muParser-2.1.0.ebuild 1196 RMD160 43bb9f034a23a620c6cf4073dc37a0d9b5989ca7 SHA1 435396c5ddab78555a41f7d4c250a9705ff5d47b SHA256 1c88f6f38a04a32b0dd8b7a65e9c59793ab9bd1b8e2d19a712ff1328496df096
+MISC ChangeLog 2708 RMD160 c8de798fb2709d43c6a735de4be10c94bbb7a8e4 SHA1 2c4c1ea92d40f88fe2f08c95202769ac78639bc3 SHA256 3f2b9a0a21a40bd25b014439ff6a2c5af7fe60036cc5f27ab3d8c888a4735e9e
 MISC metadata.xml 371 RMD160 cf1f5ffe20bac0026d986b4629f1db0b32e1bf77 SHA1 a3fb90c57b2c5ced1868d4be2d88d3af6bc773cd SHA256 75fe203bdedd4e649cf290eeaaa575116a85ef7303f7663a3876accf1de2c4ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkzc+OwACgkQgAnW8HDreRZO3QCgyfDCLrNIFocWdW9jOrN26O9B
-CrgAn07j7VYx7RDUAEF9MjUxzUFqMjtz
-=Z7ze
+iEYEAREKAAYFAk7rWaAACgkQgAnW8HDreRa3twCgjElXBisd4XvhAqX/v8EIW0JJ
+oecAnjiZwocYyl2HJSZAiSEomxBCkl5t
+=QoL0
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/muParser/muParser-1.34.ebuild b/dev-cpp/muParser/muParser-1.34.ebuild
index 83e186d670a4..ad9600f86d82 100644
--- a/dev-cpp/muParser/muParser-1.34.ebuild
+++ b/dev-cpp/muParser/muParser-1.34.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.34.ebuild,v 1.1 2010/11/11 17:00:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.34.ebuild,v 1.2 2011/12/16 14:45:32 jlec Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	epatch \
@@ -32,7 +32,7 @@ src_configure() {
 
 src_test() {
 	cat > test.sh <<- EOFTEST
-	LD_LIBRARY_PATH=${S}/lib samples/example1/example1 << EOF
+	LD_LIBRARY_PATH=${S}/lib samples/example1/example1 <<- EOF
 	quit
 	EOF
 	EOFTEST
@@ -40,7 +40,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	dodoc Changes.txt  Credits.txt || die "dodoc failed"
 	if use doc; then
 		insinto /usr/share/doc/${PF}
diff --git a/dev-cpp/muParser/muParser-2.1.0.ebuild b/dev-cpp/muParser/muParser-2.1.0.ebuild
new file mode 100644
index 000000000000..38d46529cb4c
--- /dev/null
+++ b/dev-cpp/muParser/muParser-2.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-2.1.0.ebuild,v 1.1 2011/12/16 14:45:32 jlec Exp $
+
+EAPI=4
+
+inherit eutils
+
+MY_PN=${PN/P/p}
+MY_P=${MY_PN}_v${PV/./}
+
+DESCRIPTION="Library for parsing mathematical expressions"
+HOMEPAGE="http://muparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/P/p}/${PN/P/p}/Version%20${PV}/${PN/P/p}_v${PV//./_}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"/${PN/P/p}_v${PV//./_}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.32-build.patch \
+		"${FILESDIR}"/${PN}-1.32-parallel-build.patch
+}
+
+src_configure() {
+	chmod +x configure || die
+	econf $(use_enable test samples)
+}
+
+src_test() {
+	cat > test.sh <<- EOFTEST
+	LD_LIBRARY_PATH=${S}/lib samples/example1/example1 <<- EOF
+	quit
+	EOF
+	EOFTEST
+	sh ./test.sh || die "test failed"
+}
+
+src_install() {
+	default
+	dodoc Changes.txt  Credits.txt || die "dodoc failed"
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/html || die
+	fi
+}