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

(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc9 x86_64)

5 files changed, 129 insertions, 6 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/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
+}