Fix init script, #133240.

(Portage version: 2.1_rc1)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 134 deletions

diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index cdf8026fac0a..df0887d51f8a 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -6,10 +6,10 @@ AUX gnunet-0.7.0d-nulludp.patch 1786 RMD160 b8c401f50cda123ad84253deb1faccbc4174
 MD5 43a498d19d58d3154e9c5661cf4a5770 files/gnunet-0.7.0d-nulludp.patch 1786
 RMD160 b8c401f50cda123ad84253deb1faccbc4174577d files/gnunet-0.7.0d-nulludp.patch 1786
 SHA256 fb30fdb2b7340448dc159dadb10f1db96742c46cdc7c00269499a54fe874baa1 files/gnunet-0.7.0d-nulludp.patch 1786
-AUX gnunet-2 794 RMD160 9b7a433a378ff48b6c1b34a8509bd7f2d788ae54 SHA1 9aede3efd80702fd33cc1b9ba2fb849426dfd0d5 SHA256 87107a50755a4f61f31311ee51359814632d8f8e87483aac482f56b5ccad594c size 794
-MD5 6ac0938893978d5f2bc22bf808bc0fe3 files/gnunet-2 794
-RMD160 9b7a433a378ff48b6c1b34a8509bd7f2d788ae54 files/gnunet-2 794
-SHA256 87107a50755a4f61f31311ee51359814632d8f8e87483aac482f56b5ccad594c files/gnunet-2 794
+AUX gnunet-2 795 RMD160 0f2e48d25bb67b7a96606706c7943ff8c8b8be63 SHA1 c7255274dd86be0485703951bfc0a03990949190 SHA256 8bd55e5724024dc994775204bb838d5c42476118d6a8d22cff71605f1a4ee42c size 795
+MD5 6b621fbe5837e2d6fb1f9d79769ea0f4 files/gnunet-2 795
+RMD160 0f2e48d25bb67b7a96606706c7943ff8c8b8be63 files/gnunet-2 795
+SHA256 8bd55e5724024dc994775204bb838d5c42476118d6a8d22cff71605f1a4ee42c files/gnunet-2 795
 AUX gnunet-download-manager.scm 13338 RMD160 a8eaa266c3cbc012fcce4a011ad410b7f0630482 SHA1 2132de94ddeb3dbdb0f6f0935cc5aa591b1f5ca9 SHA256 a49047daf991597c869e43d300808990e3edfdf4f814a3e18b08d763fa84d7aa size 13338
 MD5 7e0bb86547b0ad5e7744374d32c124f8 files/gnunet-download-manager.scm 13338
 RMD160 a8eaa266c3cbc012fcce4a011ad410b7f0630482 files/gnunet-download-manager.scm 13338
@@ -24,14 +24,14 @@ EBUILD gnunet-0.6.2b.ebuild 1611 RMD160 7bb9e1aeb0604b9be28ab109d08960e268da94da
 MD5 3d78de0ed5d6b9f64a9f638fe2b94e66 gnunet-0.6.2b.ebuild 1611
 RMD160 7bb9e1aeb0604b9be28ab109d08960e268da94da gnunet-0.6.2b.ebuild 1611
 SHA256 0015404fd6bafbf66c3be8f4f7e73967ed168e822d7cb3a561ef11340e339b9d gnunet-0.6.2b.ebuild 1611
-EBUILD gnunet-0.7.0d.ebuild 3061 RMD160 6dcb283dc1279583ff892d6fe061cd4a13506aa7 SHA1 6b12eaebe1181c1e4cbfd494c37efa5c21f8723c SHA256 ecbdbfe6555e57afd7543116c5f4cfad0a0c47db52e67fe379ac00ef41667c42 size 3061
-MD5 611342df46ecbf80b268385b700f2c90 gnunet-0.7.0d.ebuild 3061
-RMD160 6dcb283dc1279583ff892d6fe061cd4a13506aa7 gnunet-0.7.0d.ebuild 3061
-SHA256 ecbdbfe6555e57afd7543116c5f4cfad0a0c47db52e67fe379ac00ef41667c42 gnunet-0.7.0d.ebuild 3061
-MISC ChangeLog 7288 RMD160 9c54be09358d16ff08d4150cd116e39377169432 SHA1 fe7d26edb04040be6a4acd9c3eb2fa7348da6ae1 SHA256 59618254e1db8df16d6f165f11afe86d0439629631f7fe3beb7e359201194003 size 7288
-MD5 d1df9ab296f00aea522832d02ddc1f38 ChangeLog 7288
-RMD160 9c54be09358d16ff08d4150cd116e39377169432 ChangeLog 7288
-SHA256 59618254e1db8df16d6f165f11afe86d0439629631f7fe3beb7e359201194003 ChangeLog 7288
+EBUILD gnunet-0.7.0d-r1.ebuild 3146 RMD160 6559afb33ce0b02e108082cd9e0e3ef86ffd6e80 SHA1 d65059cc6b6245ab06f296817210e5ba51f8be23 SHA256 c613c97c3cd264d307fee7b8accaf3f5eb34c02bfc50b9f20babb8692eaff696 size 3146
+MD5 f4777a554375305a2765eacae81fb71d gnunet-0.7.0d-r1.ebuild 3146
+RMD160 6559afb33ce0b02e108082cd9e0e3ef86ffd6e80 gnunet-0.7.0d-r1.ebuild 3146
+SHA256 c613c97c3cd264d307fee7b8accaf3f5eb34c02bfc50b9f20babb8692eaff696 gnunet-0.7.0d-r1.ebuild 3146
+MISC ChangeLog 7464 RMD160 59f188497724e7a41db3d5493b1423f50b516be0 SHA1 9bf4c36c3aff3d7609aeb5fbb396d8fd09552467 SHA256 1c35af53b5fd4931fa4cce6dd2890a306c204ccf831f139ab7a9003ec47d306e size 7464
+MD5 6d97c610b4f5377a78cdaf060900f31b ChangeLog 7464
+RMD160 59f188497724e7a41db3d5493b1423f50b516be0 ChangeLog 7464
+SHA256 1c35af53b5fd4931fa4cce6dd2890a306c204ccf831f139ab7a9003ec47d306e ChangeLog 7464
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f size 160
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
@@ -39,6 +39,6 @@ SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata
 MD5 6ce9d92e8ab6a73cef4c8e29cce36c8c files/digest-gnunet-0.6.2b 244
 RMD160 bd97f84d83a7197cb229de8f774612691cd9136a files/digest-gnunet-0.6.2b 244
 SHA256 092786c4af78a5cd861245cbc788da345ddfae1568c32591307f4a510013b744 files/digest-gnunet-0.6.2b 244
-MD5 537107f4b66dea38ea029113603e8de7 files/digest-gnunet-0.7.0d 247
-RMD160 45d0ebeb08c6fa5584b247089f1d2dc6cac8737d files/digest-gnunet-0.7.0d 247
-SHA256 5a0df1570db2a84cf81a2232e7445616f6c132f41e6eb0c16849592f4c3c903e files/digest-gnunet-0.7.0d 247
+MD5 537107f4b66dea38ea029113603e8de7 files/digest-gnunet-0.7.0d-r1 247
+RMD160 45d0ebeb08c6fa5584b247089f1d2dc6cac8737d files/digest-gnunet-0.7.0d-r1 247
+SHA256 5a0df1570db2a84cf81a2232e7445616f6c132f41e6eb0c16849592f4c3c903e files/digest-gnunet-0.7.0d-r1 247
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0d b/net-p2p/gnunet/files/digest-gnunet-0.7.0d
deleted file mode 100644
index 8d4042c25a97..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.7.0d
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c910ceb8acf02e8ef100951bf72ec71a GNUnet-0.7.0d.tar.bz2 1371958
-RMD160 b00d19a326ca0ae92641b89d3039f02782b286d6 GNUnet-0.7.0d.tar.bz2 1371958
-SHA256 990c00d41cb31b52ca30e54ad833327e73f22eca602fdb374bbf1e3eebe0ee33 GNUnet-0.7.0d.tar.bz2 1371958
diff --git a/net-p2p/gnunet/gnunet-0.7.0d.ebuild b/net-p2p/gnunet/gnunet-0.7.0d.ebuild
deleted file mode 100644
index d37fec8cba2d..000000000000
--- a/net-p2p/gnunet/gnunet-0.7.0d.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0d.ebuild,v 1.1 2006/05/14 04:52:06 squinky86 Exp $
-
-inherit eutils libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.gnu.org/software/GNUnet/"
-SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
-#tests don't work
-RESTRICT="test"
-
-IUSE="ipv6 mysql sqlite guile nls gtk"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/libgcrypt-1.2.0
-	>=media-libs/libextractor-0.5.13
-	>=dev-libs/gmp-4.0.0
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.6.10 )
-	sys-apps/sed
-	ncurses? ( sys-libs/ncurses )
-	mysql? ( >=dev-db/mysql-4.0.24 )
-	sqlite? ( >=dev-db/sqlite-3.0.8 )
-	guile? ( >=dev-util/guile-1.6.0 )
-	nls? ( sys-devel/gettext )"
-
-
-pkg_setup() {
-	if ! use mysql && ! use sqlite; then
-		einfo
-		einfo "You need to specify at least one of 'mysql' or 'sqlite'"
-		einfo "USE flag in order to have properly installed gnunet"
-		einfo
-		die "Invalid USE flag set"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup gnunet || die "Problem adding gnunet group"
-	enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-nulludp.patch
-
-	# make mysql default sqstore if we do not compile sql support 
-	# (bug #107330)
-	! use sqlite && \
-		sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \
-		contrib/config-daemon.in
-
-	# we do not want to built gtk support with USE=-gtk	
-	if ! use gtk ; then
-		sed -i "s:AC_DEFINE_UNQUOTED..HAVE_GTK.*:true:" configure.ac
-		autoconf || die "autoconf failed"
-		libtoolize --copy --force
-	fi
-}
-
-src_compile() {
-
-	local myconf
-
-	if use ipv6; then
-		if use amd64; then
-			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
-		else
-			myconf="${myconf} --enable-ipv6"
-		fi
-	fi
-
-	use mysql || myconf="${myconf} --without-mysql"
-
-	econf \
-		$(use_with sqlite) \
-		$(use_enable nls) \
-		$(use_enable ncurses) \
-		$(use_enable guile) \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
-	insinto /etc
-	newins contrib/gnunet.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PN}-2 gnunet
-	dodir /var/lib/GNUnet
-	chown gnunet:gnunet ${D}/var/lib/GNUnet
-}
-
-pkg_postinst() {
-	# make sure permissions are ok
-	chown -R gnunet:gnunet /var/lib/GNUnet
-
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
-	einfo
-	einfo "To configure"
-	einfo "  1) Add user(s) to the gnunet group"
-	einfo "  2) Run 'gnunet-setup' to generate your client config file"
-	einfo "  3) Run gnunet-setup -d to generate a server config file"
-	einfo "  4) Optionally copy the .gnunet/gnunetd.conf into /etc and use as a global server config file"
-	einfo
-}
-