Fix displayed versioning

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

8 files changed, 44 insertions, 157 deletions

diff --git a/sci-mathematics/msieve/ChangeLog b/sci-mathematics/msieve/ChangeLog
index e08fe81e6559..488971f05727 100644
--- a/sci-mathematics/msieve/ChangeLog
+++ b/sci-mathematics/msieve/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/msieve
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/ChangeLog,v 1.7 2012/11/28 08:15:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/ChangeLog,v 1.8 2012/11/30 08:52:07 patrick Exp $
+
+*msieve-1.50-r4 (30 Nov 2012)
+
+  30 Nov 2012; Patrick Lauer <patrick@gentoo.org> +files/fix-version.patch,
+  +files/fix-version2.patch, +msieve-1.50-r4.ebuild, -msieve-1.50-r1.ebuild,
+  -msieve-1.50-r2.ebuild, -msieve-1.50-r3.ebuild, -msieve-1.50.ebuild:
+  Fix displayed versioning
 
   28 Nov 2012; Patrick Lauer <patrick@gentoo.org> msieve-1.50-r3.ebuild:
   Removing erroneous dep
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index a602cfc95108..9fe6d7208e96 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,8 +1,7 @@
+AUX fix-version.patch 499 SHA256 1c748921c35d34af3267020704a26feb14d3043ce58a9ff7855dbf989e8d213b SHA512 9ea8b52377cf11e6dc34860d3231dee364a8018d860a25ca25901fc00e948adb11ba767106df67e5769e6328fcb703638a14178666f53f9518c0e07b15d36767 WHIRLPOOL 916b1a0b4cfde68a440cdb57a2d411049eb44f9903df5b130da018893903dfa707243a42f9895b6555975a943ce6d48f4228dd94275d727190a3f76751d4c798
+AUX fix-version2.patch 560 SHA256 a3806f9159a0a760ac49872883631bae85fb137a357ee1d3ec9022ca76c10eb1 SHA512 c745b63461a76a20d32c3d022c120ed1ee201a05ed372f01381d71f4cc9601d92089acfc07bfe6930180740c4f4711b88b129d126065558d2cf6d7dd81bf78d8 WHIRLPOOL 26b2205eaf577233fc0b3f0faa7e943cfaefdc2badecdc06a016bf69c533322b600ffbaf6efe2ac02d133028f3b9adfbffdc309cde5370e23b3806d5ac094327
 AUX reduce-printf.patch 2105 SHA256 b576d46577c411b1ad814ab48e4fce595927b225e93e311789e6f2135a68a01e SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98 WHIRLPOOL 75a55e0ff6da1e99c96bb2395ce75fbfac1aad1c3bfaf4bb924c957bc821141afd4a805e79bbd4fb47ebeae101c488a2291ca900198fb25cc8f94badfc1eb139
 DIST msieve150src.tar.gz 547458 SHA256 42e58975fe03ba8d3ffae096962aa4d53d381aa0f9cfb5e6244da11eadcce676 SHA512 f6a722d2dd87c44f07ec713b35cf22efdeb1149e06b2e8c02abefc0681a0c2b9dc68cad97a39f8fa84f739ad67993699eaad84c105ad7a01ca56da540b24dd03 WHIRLPOOL 6886e643f93d1426b794b53ca95f1e5ae18b69d653f71c00a1a2c481035142afe302a37709b4f8825239a8e1d6bc65c5e6fdda7f47219ca0e7c40e8ad1475c36
-EBUILD msieve-1.50-r1.ebuild 1271 SHA256 72511c405a69609abe99fb51c912a5122ed7cb3d506159e0b19873ed0e86b106 SHA512 42b8da23dbf156b54887ce7eb3c1159c3558523a2a0a600541076e76a3ddc9bc5ee2fb8ad48c49280097faec0ae794bcf4139a86797f62d9bf64170e8a3e2e44 WHIRLPOOL c713e7b927c143d6e7b22eb175a559aee90ec3b181d195ef780700fd3495b8d89dea4b7a79a29f7b468bf6bdde013b4ce4c5d2667cbb065f90ec62d451b94e91
-EBUILD msieve-1.50-r2.ebuild 1429 SHA256 17dd2b846735e08dc2a03010827749880da553e6a15925f0af0663fabddc50c4 SHA512 1b900adf9bcb91dc0efc011f0aa838783810590c58fcdb607ba6ea046129a540d102e64917255003f86b06754a147205968d08e0e8a5874064399c86b99f03b3 WHIRLPOOL 0788d8e84b291f5eea8a29bbe2a690f69ec81e74647b95d14274c99b1c054116e7f482cafa08a980747c45f2b47d15bca172562a98bae4ccb9c7c75086e00c7a
-EBUILD msieve-1.50-r3.ebuild 1516 SHA256 96ba4e08ad8f67eb57862716262b191fc3d2d920a58cf6a4b1bb0a47eaaccde7 SHA512 0a36deb15d1ef532f2a51c24b43f27dd1b30541c2b0b809e2f44720f5035eecf5c3ffe4a3db3f2a5e11106e9bb7cf250dcad5391bdce9f8a292621c8cd898bbe WHIRLPOOL c8f6069f0ff5b82593fcbe6d70c909de2c6ffb79f279b6731e996ff5f6b5b20991bc020dcb15509d54d9c2e0cb0b2cabb9c68722d7b3d181a8614044b4427ce8
-EBUILD msieve-1.50.ebuild 1256 SHA256 b75b91bfde9a4eb76e7d6d4b88a0540a2d1651ae7d25255f24fb029ddabf91c3 SHA512 5b211f37581b8f8a103c53e9dd41630bce5b64c3c64394d50f414bae3e3bf81c47dc5d221e896c2a8bca4f3c6cfec3590043bf971988eb76dc69a23abdc5720c WHIRLPOOL a775aebf33bcdca8840b3bdd178fa26fe7a5f6fd31ef38e4e41e6ad05bcabe2d6180f5a7deb67ed6ae5f182fad2b3ac374d7fe7752da44fb53097b264837da36
-MISC ChangeLog 1143 SHA256 435dac6b18a428ad56b81231e690162b5a816a7c924c2f82382f0e0bd421316b SHA512 eb60e197bab55f2b8a1df41ac9260c1f00116ca7277903359ad5bf69c9766fc53532bedd39623e1ea71ceb07d94688b9dbb0927b574d1be231f07a59246c753d WHIRLPOOL 2450975210d30800b7341511348c9bd440059f317f292d8a5a945a77b462337f14b2e9609de4081a7aacc236f28e4430848f0ad493b720f4b2e07f2751cdc6bd
+EBUILD msieve-1.50-r4.ebuild 1613 SHA256 915e12ce468b82f3a29f477dde3c717fd2ff026f636e8b313e5ad40af4737af3 SHA512 7d199924207b3fa304fa679ad5a228f50c9ac3ba38282dd310a0831ef3166130abc0824152e86a5df7b7bd7d2240311034d5fb925c10c4cfca365d4a4303e4b1 WHIRLPOOL 0a80f3d15a62b680dd6e1584e6159c75615e4e82be474bdb61d63457f076271da19d7653667a39f37fcf012ffba7f24b8060ee69df84c13c841204f9680c55aa
+MISC ChangeLog 1426 SHA256 3b31a13b7c7376accd7a907c3dba68dc5e9eefa897543caea9eb3ae507b119b2 SHA512 67cdec4b4f70ea4bb965bc009a328fc45a75f9eded5c57a9dcc0d1c4cc9b28d9d7a00af23c12b283e71047700bd76563945ffb8338530b90dcf974659905ef88 WHIRLPOOL ef85a7ce9caa68f2650d2aef142c1dc5c2cd64ea180e77f770327d60a0aff07340c6ccd75b94446312d34e7c969a596a15e7f6f1d7651a28d85223390973e5d5
 MISC metadata.xml 313 SHA256 cd226e0c19b92e49618bd4fe78419349e9821735756d4b1e19dcf52e8a62c5cb SHA512 bc088c0f8d8cb0ecdd4fd65082d618d6a0acefe855ee426c34b36da5dcdd93e39052de80cbb94cd8ca0803caaa3e4664b01a127d869c326a446163011c74169f WHIRLPOOL 08ede2862edbced89cd8faaa42f76410d7a8214e303bbb2885761aa45b9f3dca0eb4eb19333e46c508645d5daadf3bef887ac9dd1a3a4221ae7859ec819c5481
diff --git a/sci-mathematics/msieve/files/fix-version.patch b/sci-mathematics/msieve/files/fix-version.patch
new file mode 100644
index 000000000000..748a7ae8c68c
--- /dev/null
+++ b/sci-mathematics/msieve/files/fix-version.patch
@@ -0,0 +1,15 @@
+--- common/driver.c	2011-05-02 09:10:50.000000000 +0800
++++ common/driver.c.new	2012-11-30 16:43:59.067925006 +0800
+@@ -191,10 +191,9 @@
+ 
+ 	logprintf(obj, "\n");
+ 	logprintf(obj, "\n");
+-	logprintf(obj, "Msieve v. %d.%02d (SVN %s)\n", 
++	logprintf(obj, "Msieve v. %d.%02d\n", 
+ 				MSIEVE_MAJOR_VERSION, 
+-				MSIEVE_MINOR_VERSION,
+-				MSIEVE_SVN_VERSION);
++				MSIEVE_MINOR_VERSION);
+ 	start_time = time(NULL);
+ 	if (obj->flags & MSIEVE_FLAG_LOG_TO_STDOUT) {
+ 		printf("%s", ctime(&start_time));
diff --git a/sci-mathematics/msieve/files/fix-version2.patch b/sci-mathematics/msieve/files/fix-version2.patch
new file mode 100644
index 000000000000..6e956897bdf0
--- /dev/null
+++ b/sci-mathematics/msieve/files/fix-version2.patch
@@ -0,0 +1,14 @@
+--- demo.c	2011-11-25 00:25:28.000000000 +0800
++++ demo.c.new	2012-11-30 16:46:50.417333847 +0800
+@@ -81,9 +81,8 @@
+ /*--------------------------------------------------------------------*/
+ void print_usage(char *progname) {
+ 
+-	printf("\nMsieve v. %d.%02d (SVN %s)\n", MSIEVE_MAJOR_VERSION, 
+-					MSIEVE_MINOR_VERSION,
+-					MSIEVE_SVN_VERSION);
++	printf("\nMsieve v. %d.%02d\n", MSIEVE_MAJOR_VERSION, 
++					MSIEVE_MINOR_VERSION);
+ 
+ 	printf("\nusage: %s [options] [one_number]\n", progname);
+ 	printf("\nnumbers starting with '0' are treated as octal,\n"
diff --git a/sci-mathematics/msieve/msieve-1.50-r1.ebuild b/sci-mathematics/msieve/msieve-1.50-r1.ebuild
deleted file mode 100644
index 9e2eb2b634ce..000000000000
--- a/sci-mathematics/msieve/msieve-1.50-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r1.ebuild,v 1.1 2012/11/19 06:19:46 patrick Exp $
-
-EAPI=4
-DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
-HOMEPAGE="http://sourceforge.net/projects/msieve/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
-
-inherit eutils
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="zlib +ecm mpi"
-
-DEPEND="ecm? ( sci-mathematics/gmp-ecm )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if use ecm; then
-		export "ECM=1"
-	fi
-	if use mpi; then
-		export "MPI=1"
-	fi
-	if use zlib; then
-		export "ZLIB=1"
-	fi
-	if use amd64; then
-		emake x86_64 || die "Failed to build"
-	fi
-	if use x86; then
-		emake x86 || die "Failed to build"
-	fi
-}
-
-src_install() {
-	mkdir -p "${D}/usr/include/msieve"
-	mkdir -p "${D}/usr/lib/"
-	mkdir -p "${D}/usr/share/doc/${P}/"
-	cp include/* "${D}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${D}/usr/lib/" || die "Failed to install"
-	dobin msieve || die "Failed to install"
-	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
-}
diff --git a/sci-mathematics/msieve/msieve-1.50-r2.ebuild b/sci-mathematics/msieve/msieve-1.50-r2.ebuild
deleted file mode 100644
index 28431f377ce8..000000000000
--- a/sci-mathematics/msieve/msieve-1.50-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r2.ebuild,v 1.2 2012/11/27 17:42:19 mr_bones_ Exp $
-
-EAPI=4
-DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
-HOMEPAGE="http://sourceforge.net/projects/msieve/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
-
-inherit eutils
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="zlib +ecm mpi"
-
-DEPEND="ecm? ( sci-mathematics/gmp-ecm )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/-march=k8//' Makefile || die
-	sed -i -e 's/CC =/#CC =/' Makefile || die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die
-}
-
-src_compile() {
-	if use ecm; then
-		export "ECM=1"
-	fi
-	if use mpi; then
-		export "MPI=1"
-	fi
-	if use zlib; then
-		export "ZLIB=1"
-	fi
-	if use amd64; then
-		emake x86_64 || die "Failed to build"
-	fi
-	if use x86; then
-		emake x86 || die "Failed to build"
-	fi
-}
-
-src_install() {
-	mkdir -p "${D}/usr/include/msieve"
-	mkdir -p "${D}/usr/lib/"
-	mkdir -p "${D}/usr/share/doc/${P}/"
-	cp include/* "${D}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${D}/usr/lib/" || die "Failed to install"
-	dobin msieve || die "Failed to install"
-	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
-}
diff --git a/sci-mathematics/msieve/msieve-1.50-r3.ebuild b/sci-mathematics/msieve/msieve-1.50-r4.ebuild
index c3ee991718db..d472871ba1fd 100644
--- a/sci-mathematics/msieve/msieve-1.50-r3.ebuild
+++ b/sci-mathematics/msieve/msieve-1.50-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r3.ebuild,v 1.3 2012/11/28 08:15:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r4.ebuild,v 1.1 2012/11/30 08:52:07 patrick Exp $
 
 EAPI=4
 DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
@@ -22,6 +22,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	# TODO: Integrate ggnfs properly
 	epatch "${FILESDIR}/reduce-printf.patch" 	|| die
+	epatch "${FILESDIR}/fix-version.patch"		|| die
+	epatch "${FILESDIR}/fix-version2.patch"		|| die
 	sed -i -e 's/-march=k8//' Makefile 		|| die
 	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
 	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
diff --git a/sci-mathematics/msieve/msieve-1.50.ebuild b/sci-mathematics/msieve/msieve-1.50.ebuild
deleted file mode 100644
index 2053d0ce8fd2..000000000000
--- a/sci-mathematics/msieve/msieve-1.50.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50.ebuild,v 1.3 2012/11/16 04:14:45 patrick Exp $
-
-EAPI=4
-DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
-HOMEPAGE="http://sourceforge.net/projects/msieve/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
-
-inherit eutils
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="zlib +ecm mpi"
-
-DEPEND="ecm? ( sci-mathematics/gmp-ecm )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if use ecm; then
-		export "ECM=1"
-	fi
-	if use mpi; then
-		export "MPI=1"
-	fi
-	if use zlib; then
-		export "ZLIB=1"
-	fi
-	if use amd64; then
-		emake x86_64 || die "Failed to build"
-	fi
-	if use x86; then
-		emake x86 || die "Failed to build"
-	fi
-}
-
-src_install() {
-	mkdir -p "${D}/usr/include/"
-	mkdir -p "${D}/usr/lib/"
-	mkdir -p "${D}/usr/share/doc/${P}/"
-	cp include/* "${D}/usr/include/" || die "Failed to install"
-	cp libmsieve.a "${D}/usr/lib/" || die "Failed to install"
-	dobin msieve || die "Failed to install"
-	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
-}