new init script and substantial ebuild changes, #24496

9 files changed, 85 insertions, 55 deletions

diff --git a/net-p2p/gift/ChangeLog b/net-p2p/gift/ChangeLog
index 08e2e47316b8..0d412553d20f 100644
--- a/net-p2p/gift/ChangeLog
+++ b/net-p2p/gift/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/gift
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/ChangeLog,v 1.43 2004/06/25 00:31:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/ChangeLog,v 1.44 2004/06/26 17:53:01 squinky86 Exp $
+
+*gift-0.11.6-r1 (26 Jun 2004)
+
+  26 Jun 2004; Jon Hood <squinky86@gentoo.org> +files/gift.confd,
+  +files/gift.initd, -gift-0.11.4.ebuild, -gift-0.11.5.ebuild,
+  +gift-0.11.6-r1.ebuild:
+  Adding init script with substantial changes to ebuild. Thanks to floam
+  <floam@ascorbic.com> in #24496 for the initial scripts.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gift-0.11.4.ebuild,
   gift-0.11.5.ebuild, gift-0.11.6.ebuild:
diff --git a/net-p2p/gift/Manifest b/net-p2p/gift/Manifest
index 40e8b2a7c260..f3a2dacd60d2 100644
--- a/net-p2p/gift/Manifest
+++ b/net-p2p/gift/Manifest
@@ -1,4 +1,5 @@
 MD5 3408d5257ab210c257a3176267b33453 gift-0.11.6.ebuild 1339
+MD5 8267ef688610c346191b9ece8ce3fee0 gift-0.11.6-r1.ebuild 1847
 MD5 70895d1afddb1f31897a78ec3b2420cb gift-0.11.5.ebuild 1340
 MD5 ad9d1cf04a28fb1b74d2ee83dca0adc0 ChangeLog 1840
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
@@ -6,3 +7,6 @@ MD5 bc16de45ab06540b088de8ddd8a07e36 gift-0.11.4.ebuild 1341
 MD5 c9316e8bf5f03cc8504bbcd2ddc1cddb files/digest-gift-0.11.4 64
 MD5 7e403ad63fc68ca374e607c47b7a9898 files/digest-gift-0.11.5 64
 MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6 64
+MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6-r1 64
+MD5 b59d68c6f59cc317de3021bb5c86936d files/gift.confd 637
+MD5 b504c631245bb27d8dd3af4299db0a0d files/gift.initd 1024
diff --git a/net-p2p/gift/files/digest-gift-0.11.4 b/net-p2p/gift/files/digest-gift-0.11.4
deleted file mode 100644
index 3e15d7e2877d..000000000000
--- a/net-p2p/gift/files/digest-gift-0.11.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 decc82159c6723be999b1306a808077f gift-0.11.4.tar.bz2 368969
diff --git a/net-p2p/gift/files/digest-gift-0.11.5 b/net-p2p/gift/files/digest-gift-0.11.5
deleted file mode 100644
index 8a384247f3c8..000000000000
--- a/net-p2p/gift/files/digest-gift-0.11.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f492b6e3607aed801b77657f3808f5c1 gift-0.11.5.tar.bz2 528989
diff --git a/net-p2p/gift/files/digest-gift-0.11.6-r1 b/net-p2p/gift/files/digest-gift-0.11.6-r1
new file mode 100644
index 000000000000..db27a871cf77
--- /dev/null
+++ b/net-p2p/gift/files/digest-gift-0.11.6-r1
@@ -0,0 +1 @@
+MD5 614c7dc355c65522424b649684fde8be gift-0.11.6.tar.bz2 533799
diff --git a/net-p2p/gift/files/gift.confd b/net-p2p/gift/files/gift.confd
new file mode 100644
index 000000000000..2a56de713b9c
--- /dev/null
+++ b/net-p2p/gift/files/gift.confd
@@ -0,0 +1,19 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/files/gift.confd,v 1.1 2004/06/26 17:53:01 squinky86 Exp $
+
+# /etc/conf.d/gift
+# Config file for gift control script
+
+# Change the following vars only if you know
+# what you're doing, there's no checking for
+# invalid data yet!
+
+# owner of giFTd process (don't change, must be existing)
+USER="p2p"
+
+# logfile (/dev/null for nowhere)
+LOG="/var/log/giftd.log"
+
+# nice level, 0<x<19, more nice -> less cpuspeed consumed
+NICE="19"
diff --git a/net-p2p/gift/files/gift.initd b/net-p2p/gift/files/gift.initd
new file mode 100644
index 000000000000..1b4b4ec6d2ad
--- /dev/null
+++ b/net-p2p/gift/files/gift.initd
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/files/gift.initd,v 1.1 2004/06/26 17:53:01 squinky86 Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting giFTd"
+	start-stop-daemon --quiet --start -c ${USER} --make-pidfile \
+		--pidfile /var/run/giftd.pid --exec /usr/bin/giftd -- \
+		--local-dir=/usr/share/giFT &>${LOG} &
+	renice ${NICE} -u ${USER} >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping giFTd - please wait"
+	start-stop-daemon --stop --quiet --pidfile /var/run/giftd.pid
+	eend $?
+}
+
+restart() {
+	svc_stop
+	sleep 10
+	svc_start
+}
diff --git a/net-p2p/gift/gift-0.11.5.ebuild b/net-p2p/gift/gift-0.11.5.ebuild
deleted file mode 100644
index 6bfaae1dd80c..000000000000
--- a/net-p2p/gift/gift-0.11.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.5.ebuild,v 1.6 2004/06/25 00:31:29 agriffis Exp $
-
-IUSE=""
-
-IUSE=""
-
-DESCRIPTION="A OpenFT, Gnutella and FastTrack p2p network client"
-HOMEPAGE="http://gift.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~alpha ~amd64"
-
-RDEPEND=">=sys-libs/zlib-1.1.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-apps/sed-4"
-
-src_install() {
-	einstall \
-		giftconfdir=${D}/etc/giFT \
-		plugindir=${D}/usr/lib/giFT \
-		giftdatadir=${D}/usr/share/giFT \
-		giftperldir=${D}/usr/bin \
-		libgiftincdir=${D}/usr/include/libgift || die "Install failed"
-}
-
-pkg_postinst() {
-	einfo "First, you need to run gift-setup with your normal"
-	einfo "user account to create the giFT configuration files."
-	echo
-	einfo "This package no longer contains any protocol plugins,"
-	einfo "please try gift-fasttrack, gift-openft, gift-gnutella"
-	einfo "for protocol support."
-	echo
-	einfo "If you encounter issues with this package, please contact"
-	einfo "us via bugs.gentoo.org rather than attempting to contact"
-	einfo "the upstream developers, as they are hesitant to provide"
-	einfo "appropriate and polite support"
-}
diff --git a/net-p2p/gift/gift-0.11.4.ebuild b/net-p2p/gift/gift-0.11.6-r1.ebuild
index 7c2a33be34b4..847b851d4522 100644
--- a/net-p2p/gift/gift-0.11.4.ebuild
+++ b/net-p2p/gift/gift-0.11.6-r1.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.4.ebuild,v 1.10 2004/06/25 00:31:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.6-r1.ebuild,v 1.1 2004/06/26 17:53:01 squinky86 Exp $
 
-IUSE=""
-
-IUSE=""
+inherit eutils
 
-DESCRIPTION="A OpenFT, Gnutella and FastTrack p2p network client"
+DESCRIPTION="A OpenFT, Gnutella and FastTrack p2p network daemon"
 HOMEPAGE="http://gift.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 RESTRICT="nomirror"
+IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~alpha ~amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
 
 RDEPEND=">=sys-libs/zlib-1.1.4"
 
@@ -21,6 +20,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-apps/sed-4"
 
+GIFTUSER="p2p"
+
 src_install() {
 	einstall \
 		giftconfdir=${D}/etc/giFT \
@@ -28,12 +29,27 @@ src_install() {
 		giftdatadir=${D}/usr/share/giFT \
 		giftperldir=${D}/usr/bin \
 		libgiftincdir=${D}/usr/include/libgift || die "Install failed"
+
+	# init scripts for users who want a central server
+	insinto /etc/conf.d; newins ${FILESDIR}/gift.confd gift
+	exeinto /etc/init.d; newexe ${FILESDIR}/gift.initd gift
+
+	# add user
+	enewuser ${GIFTUSER} -1 /bin/bash /home/p2p users
+
+	touch ${D}/usr/share/giFT/giftd.log
+	chown ${GIFTUSER}:root ${D}/usr/share/giFT/giftd.log
 }
 
 pkg_postinst() {
 	einfo "First, you need to run gift-setup with your normal"
 	einfo "user account to create the giFT configuration files."
 	echo
+	einfo "Also, if you will be using the giFT init script, you"
+	einfo "will need to create /usr/share/giFT/giftd.conf"
+	einfo "This method is only recommended for users with a"
+	einfo "central giFT server."
+	echo
 	einfo "This package no longer contains any protocol plugins,"
 	einfo "please try gift-fasttrack, gift-openft, gift-gnutella"
 	einfo "for protocol support."
@@ -41,5 +57,5 @@ pkg_postinst() {
 	einfo "If you encounter issues with this package, please contact"
 	einfo "us via bugs.gentoo.org rather than attempting to contact"
 	einfo "the upstream developers, as they are hesitant to provide"
-	einfo "appropriate and polite support"
+	einfo "appropriate and polite support."
 }