Version bump. Make 24.14-r1 fail if the kernel doesn't support 32-bit ELF binaries.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc9 x86_64

6 files changed, 146 insertions, 8 deletions

diff --git a/sci-mathematics/gimps/ChangeLog b/sci-mathematics/gimps/ChangeLog
index 3d860ff106a3..36ffe3e42254 100644
--- a/sci-mathematics/gimps/ChangeLog
+++ b/sci-mathematics/gimps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/gimps
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.21 2008/01/21 16:44:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.22 2008/07/16 20:23:59 spock Exp $
+
+*gimps-25.6 (16 Jul 2008)
+
+  16 Jul 2008; Michał Januszewski <spock@gentoo.org>
+  +files/gimps-25.6-conf.d, +files/gimps-25.6-init.d, gimps-24.14-r1.ebuild,
+  +gimps-25.6.ebuild:
+  Version bump. Make 24.14-r1 fail if the kernel doesn't support 32-bit ELF
+  binaries (bug #225107).
 
   21 Jan 2008; Michał Januszewski <spock@gentoo.org>
   files/gimps-24.14-init.d, gimps-24.14-r1.ebuild:
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index dff819167184..d1d44cd42f7a 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gimps-24.14-conf.d 306 RMD160 e34a2d5bf61717f3860482a52c282fe82a862364 SHA1 501d5cccdbd17751352eda8128670256d99bdf95 SHA256 8873897ffacf50ab50d3a1538c910b84664f9b8bb076d3312be49c269fa475d5
 AUX gimps-24.14-init.d 644 RMD160 f92618ea5cb33e1afe713ce611b9a61c7b8ed4bd SHA1 30a467d5a423928066914eca267b9724ab5248f3 SHA256 135c10d8e0729f4d2cdca7d078dc858db5fe63a2f162136c5d014ce0cab229a4
+AUX gimps-25.6-conf.d 254 RMD160 8edaeed44dafadfd40a10458216d1d5ca85338be SHA1 4378d7de419ca8c3f07ad73111ce9e1147f0b90f SHA256 1eae64e8172c1be714f856bb71df00d35a2f42568b37adfd59fd799e09ad3b3e
+AUX gimps-25.6-init.d 631 RMD160 4938a0a51fc94a7c63de37d8fc292d5782262ea9 SHA1 9abdb3b74e5413101b3a2171bb895662cd9b98e3 SHA256 d11ca7b10c60ce33eff672711a7655eb780ece3fad89e733a7ddc8b33d807960
 AUX gimps-conf.d 276 RMD160 90e297b5a1982c8211934293c78ed41701e60529 SHA1 4040e1d5c01679c9879cb57c3dc135f1d4b66d21 SHA256 ddfbcf3ee002ae7901e346bc89ce2806f19469de439011ed6f0f64ea5100779e
 AUX gimps-init.d 535 RMD160 93b53d68e82e422e21bafbe811d822297bc5db20 SHA1 6bf1b3ad07dc80d28e20e7a72a8a62411475eee0 SHA256 91dc429b761b6d03212bf9dec8a64a127d796b96823f372a65a39bbd57cf7fe0
+DIST mprime256-linux64.tar.gz 679015 RMD160 b9de74c6b16451553135f68c11307941a8059923 SHA1 7d513c1078fd977c1340c48e30aef8a63a611982 SHA256 581df1f476c81abe2254cf2e1077ac145096f2c27e7260ab5f472e39e6e619f0
+DIST mprime256.tar.gz 731193 RMD160 736ec3c4d37f2ae9aacbfd5ece064147853d6d7d SHA1 c1b23ad004fcfdf0383d7b45a1bed9c08e396f85 SHA256 be3ecfe64e43ef157ed6bcb6c7f96f5a7c62011deb4e8c68531d701ab5650fbe
 DIST sprime2414.tar.gz 885581 RMD160 a04daa85096da35f825c6c907fed1d6457fae911 SHA1 7a345f58073c8dd4ade4b2b09bb607e384d58409 SHA256 e3c7e677884b8a83f45f639270f0062e8935bb65992640035ded2d319c1c4972
-EBUILD gimps-24.14-r1.ebuild 1545 RMD160 a9a6ae32d36bfdf213bb82a75359c25dcecbca63 SHA1 0e594eb92c55a1c04e92be3b96561b2d5424832b SHA256 81fa3e1ea4851d685c571d407c605b79f46ee6a532bb63e5952a77866e282ab3
+EBUILD gimps-24.14-r1.ebuild 1896 RMD160 84baf64df44f119837ff6cf836ea669611089511 SHA1 7a4effae0c814c43c4db2e7fdc9ae5317290ff6d SHA256 1b3f03aecbe7d1d54a39eacc4814313228143582c788069c842902b7c27fe9fb
 EBUILD gimps-24.14.ebuild 1528 RMD160 aa038b7fb893ed125098cd2c8d130697250cdd4f SHA1 6648169fde60c5c06ca68284f854dec30e2d77d0 SHA256 b74a3c5943605091a9b82ea7c299ee6a3b7f92695d1ef390641460d8d0ecffc2
-MISC ChangeLog 4048 RMD160 869ec7ae5266e2636ef790af4132d9330512cc6d SHA1 bd970ddbfd2735f6693a319c30d0e00290caab41 SHA256 0fe6b4ac272ea85b6cd17d1a66508cf284b91cc2bb2943c615d8ac852741b8f4
+EBUILD gimps-25.6.ebuild 1763 RMD160 0c541722d22c5339ee86f77ea3736da219424547 SHA1 ea6fa3eddef026759108b6953acd721ef950ad88 SHA256 fbfc8c77983755a5cf61bb4200b91c8c4c6e9440c47cc3f77c7e937b5db84f07
+MISC ChangeLog 4331 RMD160 478adfd1e477352624b299a61471d56708e80fc2 SHA1 a37dce42652ff72495ce62e4ba499ac00bbaf21a SHA256 7462b9d9176709bdb9356970e3574e7fded5ab32b965342f7e6bc2196c9f7cfa
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh+WLwACgkQchej4aZK9/fCpQCeMp76cqLIkeC6psk+VOfuavdM
+oP0An2uWBVZFjXzsqfkSgCK+zg5HNv1j
+=u6g2
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gimps/files/gimps-25.6-conf.d b/sci-mathematics/gimps/files/gimps-25.6-conf.d
new file mode 100644
index 000000000000..4b98e1dbc28b
--- /dev/null
+++ b/sci-mathematics/gimps/files/gimps-25.6-conf.d
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/gimps
+
+USER="nobody"
+GROUP="nobody"
+
+# set up any options you want for GIMPS
+# for more info, `mprime -h`
+# GIMPS_OPTIONS=""
+
+# this is the directory where GIMPS run-time
+# data files will be stored
+GIMPS_DIR=/var/lib/gimps
diff --git a/sci-mathematics/gimps/files/gimps-25.6-init.d b/sci-mathematics/gimps/files/gimps-25.6-init.d
new file mode 100755
index 000000000000..af1a05af8684
--- /dev/null
+++ b/sci-mathematics/gimps/files/gimps-25.6-init.d
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e "${GIMPS_DIR}" ]; then
+		einfo "Creating ${GIMPS_DIR}"
+		/bin/mkdir "${GIMPS_DIR}"
+	fi
+
+	/bin/chown -R ${USER}:${GROUP} ${GIMPS_DIR}
+}
+
+start() {
+	checkconfig
+	ebegin "Starting GIMPS"
+	start-stop-daemon --quiet --start -b --exec /opt/gimps/mprime \
+			--chdir ${GIMPS_DIR} --chuid ${USER}:${GROUP} \
+			-- -w${GIMPS_DIR} ${GIMPS_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping GIMPS"
+	start-stop-daemon --quiet --stop --exec /opt/gimps/mprime
+	eend $?
+}
diff --git a/sci-mathematics/gimps/gimps-24.14-r1.ebuild b/sci-mathematics/gimps/gimps-24.14-r1.ebuild
index 01ab5d721013..051a396c2bf0 100644
--- a/sci-mathematics/gimps/gimps-24.14-r1.ebuild
+++ b/sci-mathematics/gimps/gimps-24.14-r1.ebuild
@@ -1,6 +1,8 @@
 # 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.6 2008/01/21 16:44:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-24.14-r1.ebuild,v 1.7 2008/07/16 20:23:59 spock Exp $
+
+inherit linux-info
 
 IUSE=""
 DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
@@ -18,7 +20,19 @@ KEYWORDS="-* amd64 x86"
 S="${WORKDIR}"
 I="/opt/gimps"
 
-src_install () {
+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"
@@ -31,7 +45,7 @@ src_install () {
 	newconfd "${FILESDIR}/gimps-24.14-conf.d" gimps
 }
 
-pkg_postinst () {
+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"
@@ -39,12 +53,12 @@ pkg_postinst () {
 	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, eg.:"
+	einfo "files are to be stored, e.g.:"
 	einfo "   ${I}/mprime -w/var/lib/gimps"
 	echo
 }
 
-pkg_postrm () {
+pkg_postrm() {
 	echo
 	einfo "GIMPS data files were not removed."
 	einfo "Remove them manually from /var/lib/gimps/"
diff --git a/sci-mathematics/gimps/gimps-25.6.ebuild b/sci-mathematics/gimps/gimps-25.6.ebuild
new file mode 100644
index 000000000000..7015dad3528c
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-25.6.ebuild
@@ -0,0 +1,58 @@
+# 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-25.6.ebuild,v 1.1 2008/07/16 20:23:59 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"
+
+# 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=""
+RDEPEND="net-misc/curl
+	sys-libs/com_err
+	dev-libs/openssl
+	virtual/krb5"
+
+S="${WORKDIR}"
+I="/opt/gimps"
+
+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-25.6-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 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
+}