Ebuild Maintenance and x86 stable per bug 412179. Bump to 27.4 (Bug 412205), remove old.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

6 files changed, 40 insertions, 204 deletions

diff --git a/sci-mathematics/gimps/ChangeLog b/sci-mathematics/gimps/ChangeLog
index c13158514216..6d5d64c43c9c 100644
--- a/sci-mathematics/gimps/ChangeLog
+++ b/sci-mathematics/gimps/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/gimps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.47 2012/04/16 12:42:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.48 2012/04/16 20:43:47 tomka Exp $
+
+*gimps-27.4 (16 Apr 2012)
+
+  16 Apr 2012; Thomas Kahle <tomka@gentoo.org> -gimps-24.14-r1.ebuild,
+  -gimps-25.11.ebuild, -gimps-26.5.ebuild, -gimps-26.6.ebuild,
+  gimps-26.6-r1.ebuild, +gimps-27.4.ebuild:
+  Ebuild Maintenance and x86 stable per bug 412179. Bump to 27.4 (Bug
+
+  412205), remove old.
 
   16 Apr 2012; Agostino Sarubbo <ago@gentoo.org> gimps-26.6-r1.ebuild:
   Stable for amd64, wrt bug #412179
diff --git a/sci-mathematics/gimps/gimps-24.14-r1.ebuild b/sci-mathematics/gimps/gimps-24.14-r1.ebuild
deleted file mode 100644
index c2aedf4fd364..000000000000
--- a/sci-mathematics/gimps/gimps-24.14-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-24.14-r1.ebuild,v 1.8 2008/07/16 23:13:13 mr_bones_ Exp $
-
-inherit linux-info
-
-IUSE=""
-DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
-HOMEPAGE="http://mersenne.org/"
-SRC_URI="ftp://mersenne.org/gimps/sprime${PV/./}.tar.gz"
-
-# We have to use the statically linked version since the dynamically
-# linked one requires gcc >= 3.4.4 (stdlibc++.so.6 dependency).
-
-DEPEND=">=sys-libs/glibc-2.1"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="-* amd64 x86"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if use amd64 && ! linux_chkconfig_present COMPAT_BINFMT_ELF ; then
-		ewarn "This ebuild installs a statically linked 32-bit ELF binary."
-		ewarn "You need to enable CONFIG_COMPAT_BINFMT_ELF in your kernel"
-		ewarn "in order for it to be usable."
-		die "missing CONFIG_COMPAT_BINFMT_ELF"
-	fi
-}
-
-src_install() {
-	dodir ${I} /var/lib/gimps
-	cp mprime "${D}/${I}"
-	chmod a-w "${D}/${I}/mprime"
-	chown root:0 "${D}/${I}"
-	chown root:0 "${D}/${I}/mprime"
-
-	dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
-
-	newinitd "${FILESDIR}/gimps-24.14-init.d" gimps
-	newconfd "${FILESDIR}/gimps-24.14-conf.d" gimps
-}
-
-pkg_postinst() {
-	echo
-	einfo "You can use \`/etc/init.d/gimps start\` to start a GIMPS client in the"
-	einfo "background at boot. Have a look at /etc/conf.d/gimps and check some"
-	einfo "configuration options."
-	einfo
-	einfo "If you don't want to use the init script to start gimps, remember to"
-	einfo "pass it an additional command line parameter specifying where the data"
-	einfo "files are to be stored, e.g.:"
-	einfo "   ${I}/mprime -w/var/lib/gimps"
-	echo
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/gimps/gimps-25.11.ebuild b/sci-mathematics/gimps/gimps-25.11.ebuild
deleted file mode 100644
index ba7f29afb1fd..000000000000
--- a/sci-mathematics/gimps/gimps-25.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-25.11.ebuild,v 1.4 2010/06/20 10:01:11 fauli Exp $
-
-IUSE=""
-DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
-HOMEPAGE="http://mersenne.org/"
-SRC_URI="amd64? ( ftp://mersenne.org/gimps/mprime${PV/./}-linux64.tar.gz )
-	x86? ( ftp://mersenne.org/gimps/mprime${PV/./}.tar.gz )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="-* amd64 x86"
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-DEPEND="x86? ( dev-util/bsdiff )"
-RDEPEND="net-misc/curl"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_EXECSTACK="opt/gimps/mprime"
-
-src_install() {
-	dodir ${I} /var/lib/gimps
-	cp mprime "${D}/${I}"
-	chmod 0555 "${D}/${I}/mprime"
-	chown root:0 "${D}/${I}"
-	chown root:0 "${D}/${I}/mprime"
-
-	dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
-
-	newinitd "${FILESDIR}/gimps-25.7-init.d" gimps
-	newconfd "${FILESDIR}/gimps-25.6-conf.d" gimps
-}
-
-pkg_postinst() {
-	echo
-	einfo "You can use \`/etc/init.d/gimps start\` to start a GIMPS client in the"
-	einfo "background at boot. Have a look at /etc/conf.d/gimps and check some"
-	einfo "configuration options."
-	einfo
-	einfo "If you are a new user, you will need to configure GIMPS before"
-	einfo "starting the initscript.  To do so, run:"
-	einfo "   ${I}/mprime -w/var/lib/gimps"
-	einfo "followed by:"
-	einfo "   chown nobody:nobody /var/lib/gimps/*"
-	einfo
-	einfo "If you have an existing GIMPS account, follow the instructions at:"
-	einfo "   http://mersenne.org/freesoft/#upgradeusers"
-	einfo "and do not blindy restart gimps."
-	echo
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/gimps/gimps-26.5.ebuild b/sci-mathematics/gimps/gimps-26.5.ebuild
deleted file mode 100644
index 63167e0c03d4..000000000000
--- a/sci-mathematics/gimps/gimps-26.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-26.5.ebuild,v 1.1 2011/03/16 23:11:28 spock Exp $
-
-IUSE=""
-DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
-HOMEPAGE="http://mersenne.org/"
-SRC_URI="amd64? ( ftp://mersenne.org/gimps/mprime${PV/./}-linux64.tar.gz )
-	x86? ( ftp://mersenne.org/gimps/mprime${PV/./}.tar.gz )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="binchecks"
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-DEPEND="x86? ( dev-util/bsdiff )"
-RDEPEND="net-misc/curl"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_EXECSTACK="opt/gimps/mprime"
-
-src_install() {
-	dodir ${I} /var/lib/gimps
-	cp mprime "${D}/${I}"
-	chmod 0555 "${D}/${I}/mprime"
-	chown root:0 "${D}/${I}"
-	chown root:0 "${D}/${I}/mprime"
-
-	dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
-
-	newinitd "${FILESDIR}/gimps-25.7-init.d" gimps
-	newconfd "${FILESDIR}/gimps-25.6-conf.d" gimps
-}
-
-pkg_postinst() {
-	echo
-	einfo "You can use \`/etc/init.d/gimps start\` to start a GIMPS client in the"
-	einfo "background at boot. Have a look at /etc/conf.d/gimps and check some"
-	einfo "configuration options."
-	einfo
-	einfo "If you are a new user, you will need to configure GIMPS before"
-	einfo "starting the initscript.  To do so, run:"
-	einfo "   ${I}/mprime -w/var/lib/gimps"
-	einfo "followed by:"
-	einfo "   chown nobody:nobody /var/lib/gimps/*"
-	einfo
-	einfo "If you have an existing GIMPS account, follow the instructions at:"
-	einfo "   http://mersenne.org/freesoft/#upgradeusers"
-	einfo "and do not blindy restart gimps."
-	echo
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/gimps/gimps-26.6-r1.ebuild b/sci-mathematics/gimps/gimps-26.6-r1.ebuild
index e631228c954d..9a0ef4548c58 100644
--- a/sci-mathematics/gimps/gimps-26.6-r1.ebuild
+++ b/sci-mathematics/gimps/gimps-26.6-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-26.6-r1.ebuild,v 1.2 2012/04/16 12:42:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-26.6-r1.ebuild,v 1.3 2012/04/16 20:43:47 tomka Exp $
+
+EAPI=4
 
 IUSE=""
 DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
@@ -10,7 +12,7 @@ SRC_URI="amd64? ( ftp://mersenne.org/gimps/mprime${PV/./}-linux64.tar.gz )
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="binchecks"
 
 # Since there are no statically linked binaries for this version of mprime,
@@ -26,9 +28,9 @@ QA_EXECSTACK="opt/gimps/mprime"
 src_install() {
 	dodir ${I} /var/lib/gimps
 	cp mprime "${D}/${I}"
-	chmod a-w "${D}/${I}/mprime"
-	chown root:0 "${D}/${I}"
-	chown root:0 "${D}/${I}/mprime"
+	fperms a-w "${I}/mprime"
+	fowners root:0 "${I}"
+	fowners root:0 "${I}/mprime"
 
 	dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
 
diff --git a/sci-mathematics/gimps/gimps-26.6.ebuild b/sci-mathematics/gimps/gimps-27.4.ebuild
index e099f7cf8261..56c5ee3778d2 100644
--- a/sci-mathematics/gimps/gimps-26.6.ebuild
+++ b/sci-mathematics/gimps/gimps-27.4.ebuild
@@ -1,6 +1,8 @@
-# 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/gimps/gimps-26.6.ebuild,v 1.6 2011/12/06 16:47:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-27.4.ebuild,v 1.1 2012/04/16 20:43:47 tomka Exp $
+
+EAPI=4
 
 IUSE=""
 DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
@@ -10,7 +12,7 @@ SRC_URI="amd64? ( ftp://mersenne.org/gimps/mprime${PV/./}-linux64.tar.gz )
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="binchecks"
 
 # Since there are no statically linked binaries for this version of mprime,
@@ -26,14 +28,14 @@ QA_EXECSTACK="opt/gimps/mprime"
 src_install() {
 	dodir ${I} /var/lib/gimps
 	cp mprime "${D}/${I}"
-	chmod a-w "${D}/${I}/mprime"
-	chown root:0 "${D}/${I}"
-	chown root:0 "${D}/${I}/mprime"
+	fperms a-w "${I}/mprime"
+	fowners root:0 "${I}"
+	fowners root:0 "${I}/mprime"
 
 	dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
 
-	newinitd "${FILESDIR}/gimps-25.7-init.d" gimps
-	newconfd "${FILESDIR}/gimps-25.6-conf.d" gimps
+	newinitd "${FILESDIR}/${PN}-26.6-r1-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
 }
 
 pkg_postinst() {
@@ -46,6 +48,19 @@ pkg_postinst() {
 	einfo "pass it an additional command line parameter specifying where the data"
 	einfo "files are to be stored, e.g.:"
 	einfo "   ${I}/mprime -w/var/lib/gimps"
+	einfo
+	einfo "GIMPS version 27.4 has issues with correct detection of physical and"
+	einfo "logical CPUs on hyperthreaded Intel CPUs. If you determine that"
+	einfo "GIMPS is not using the right CPUs on your PC use the"
+	einfo "AffinityScramble2 option in your local.txt file (instructions in"
+	einfo "/usr/share/doc/gimps-27.4/undoc.txt.bz2)."
+	einfo "In a 4 core, 8 threads Core i7 \"AffinityScramble2=04152637\" works"
+	einfo "best."
+	einfo
+	einfo "GIMPS version 27.4 is a beta version and it only offers improvements"
+	einfo "for Intel CPUs with AVX instructions (Sandy Bridge and later). It"
+	einfo "does _not_ work (at all) on AMD Bulldozer CPUs."
+	einfo
 	echo
 }