Don't use deprecated options of start-stop-daemon (Bug 393353). Thanks Paolo

Pedroni.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

5 files changed, 113 insertions, 10 deletions

diff --git a/sci-mathematics/gimps/ChangeLog b/sci-mathematics/gimps/ChangeLog
index 3daaff84a723..b78964564a93 100644
--- a/sci-mathematics/gimps/ChangeLog
+++ b/sci-mathematics/gimps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/gimps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.44 2011/07/15 20:09:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.45 2011/12/06 16:42:52 tomka Exp $
+
+*gimps-26.6-r1 (06 Dec 2011)
+
+  06 Dec 2011; Thomas Kahle <tomka@gentoo.org> gimps-26.6.ebuild,
+  +gimps-26.6-r1.ebuild, +files/gimps-26.6-r1-init.d:
+  Don't use deprecated options of start-stop-daemon (Bug 393353). Thanks
+  Paolo Pedroni.
 
   15 Jul 2011; Markus Meier <maekke@gentoo.org> gimps-26.6.ebuild:
   x86 stable, bug #372669
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 6252b8c5d868..3ee17b198b83 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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-25.7-init.d 819 RMD160 7cf90ee18e862e7a72379f3faf620da93c2a74ba SHA1 3d4fe6bd101fb699dd64227007364fc0b5eeb3a5 SHA256 9d9cc8c08027e65166bf2779decd3cf3ca4fbf9c4cd69337437f92ea21885271
+AUX gimps-26.6-r1-init.d 818 RMD160 b2e35c91b6cdd0adb65dd6a72297ca6f13c58043 SHA1 9fcf16e208e5dfcd5dbab1dbebbe15284b39eee4 SHA256 1ae2fcce5337a95a05753c293ab08bad0eca6719fbabee7617a504c2dfe18d53
 DIST mprime2511-linux64.tar.gz 1138322 RMD160 b91cf0cdef42c50682bb87b596beb7e98c7ce06c SHA1 e7f73e9a3b853250e2edc275b964b781d8b0f47d SHA256 3f46c2b0ad6c818d66da2cb8616a081798cfd427999e472aa9568db4e7ac9a22
 DIST mprime2511.tar.gz 917849 RMD160 edb9c28e281915012d4ba799e42ea9f97213069a SHA1 934900ab6eda1264c32696a9379f1c7bc9fc0cfb SHA256 af37e0a5fe0e76718d4d5ff513a4c90c4dcedc2feee08471f5836216871e114b
 DIST mprime265-linux64.tar.gz 3855104 RMD160 3c1095de69594f64af013f49cfa27eb31a6a173f SHA1 5fa1721c9d5c0c8cf63572a06b1ae6c1204e7ca0 SHA256 6428a9b999447598164f841f328a653baddec8c8c4a590cebf28db7fa804ae4f
@@ -16,13 +17,14 @@ DIST sprime2414.tar.gz 885581 RMD160 a04daa85096da35f825c6c907fed1d6457fae911 SH
 EBUILD gimps-24.14-r1.ebuild 1899 RMD160 212d998030003c5de9b5563621a769a0e8702917 SHA1 ee3d7f8ef314e4eee84bad2f1fe1714b117f70f7 SHA256 4e7afb53275f5ccdd506255f03805210c6cd50a2a784756a70bbe642a83842b7
 EBUILD gimps-25.11.ebuild 1946 RMD160 34a86441749b2b2a1a126e44cc32291dedfdfe77 SHA1 cee2990df1d39ac9d883bff641bf4fcaf404cf89 SHA256 dfb29ede82a0cdb101757496bbba9529dd50c21bc0a1a43370eb62feb3f2e8cc
 EBUILD gimps-26.5.ebuild 1968 RMD160 9c5067180495f6f53ce2dce65dbe8b47e4d88c81 SHA1 4cc98eeab00dc9f8a09deee5034a5f9ff77f2613 SHA256 58acf86b59127f1ad222ada0a90631ffccaf14272fa9fc6cf7f24ef05cf1cac3
-EBUILD gimps-26.6.ebuild 1765 RMD160 a74c65490bd354aa84460eecd33a606afd801e78 SHA1 3f2748b939299da22d8ffa1a3ec79c2538be54ae SHA256 08774334fa8f2fcbdbc79ee0321e4431cb6a76e3c8ef36b198a28d8cb24f968a
-MISC ChangeLog 7318 RMD160 c6980af8a7d4c098bf3ce8ae30a1cb85b23012ea SHA1 2968c00ca4b9bbdd3e2ee959552ff8ccf4fa6129 SHA256 894821e1c3a984bcb3af16db6d21313ab14bd0e67447c33dbf2bfb9d0300b355
+EBUILD gimps-26.6-r1.ebuild 1764 RMD160 e15f59bf209ee0dc48dc357b88c0cc38068c081e SHA1 5199c0413adce26d0147f97b4b6343f0697eedb0 SHA256 cf55b4859a1e38e68cc6f2fe10a829942ba72e6fe38fa608ee8fe5ea10746e86
+EBUILD gimps-26.6.ebuild 1770 RMD160 f80523b284168a27c4517f5c05a3b02976e713c6 SHA1 4c73a385a3ed3520baf4a7259f98815e04244048 SHA256 e6f234f17f696603b84f52b6612a6a0e8cb9a23d3a2cf882f84f01e595da8eef
+MISC ChangeLog 7558 RMD160 92653dc9e63be4dcec4d76f1257db3c5f0e2f7cf SHA1 3b28687d9e0ad2bc752db24f1d4293e4b35ba9c2 SHA256 8d783540c8a535fada444ba1ec7ef7b494c9fb2fc4987e39d107155e4089d79d
 MISC metadata.xml 257 RMD160 32645c8f63459e371df2d5a6af79383408d786d3 SHA1 86e1a85a45fc60e72a8b0442cd771f20635ed61a SHA256 17f3131c4d3347dda4ef4e6b0f21d7394e189e1e82a26e8aa60379bf495fa21d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4gnrMACgkQkKaRLQcq0GJbCwCfUT+ikOhptZkVihd7Nu97f2f+
-P2kAniga2MgqRnobZm56117aJjE5e3pQ
-=gxxH
+iF4EAREIAAYFAk7eRhEACgkQodBTJSDyo65cDAD/ar2YncFbnuhRsLmtOuVL4Acu
+yhJnXk3jzhyt1f2NjwwA/3A0tX0YZUMerU8oVO/SFJ6sKMbaidOCEhOaBIVP4oVA
+=qBbr
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gimps/files/gimps-26.6-r1-init.d b/sci-mathematics/gimps/files/gimps-26.6-r1-init.d
new file mode 100644
index 000000000000..dfee0e8c0c3e
--- /dev/null
+++ b/sci-mathematics/gimps/files/gimps-26.6-r1-init.d
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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}
+
+	if [ ! -e "${GIMPS_DIR}/local.txt" ]; then
+		eerror "GIMPS has not been configured.  Please configure it manually before"
+		eerror "starting this initscript."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting GIMPS"
+	start-stop-daemon --quiet --start -b --exec /opt/gimps/mprime \
+			--chdir ${GIMPS_DIR} --user ${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-26.6-r1.ebuild b/sci-mathematics/gimps/gimps-26.6-r1.ebuild
new file mode 100644
index 000000000000..4e90933a694e
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-26.6-r1.ebuild
@@ -0,0 +1,57 @@
+# 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.6-r1.ebuild,v 1.1 2011/12/06 16:42:52 tomka 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=""
+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 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}/${PF}-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-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
+}
diff --git a/sci-mathematics/gimps/gimps-26.6.ebuild b/sci-mathematics/gimps/gimps-26.6.ebuild
index 2fea8b9d0ea8..42423ed4213c 100644
--- a/sci-mathematics/gimps/gimps-26.6.ebuild
+++ b/sci-mathematics/gimps/gimps-26.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.4 2011/07/15 20:09:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-26.6.ebuild,v 1.5 2011/12/06 16:42:52 tomka Exp $
 
 IUSE=""
 DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
@@ -32,8 +32,8 @@ src_install() {
 
 	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
+	newinitd "${FILESDIR}/gimps-26.6-r1-init.d" gimps
+	newconfd "${FILESDIR}/gimps-26.6-r1-conf.d" gimps
 }
 
 pkg_postinst() {