EAPI=4, reworked init-scripts.

(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)

4 files changed, 90 insertions, 17 deletions

diff --git a/net-misc/termpkg/ChangeLog b/net-misc/termpkg/ChangeLog
index 47372b5297ce..dc795ce01c0a 100644
--- a/net-misc/termpkg/ChangeLog
+++ b/net-misc/termpkg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/termpkg
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/termpkg/ChangeLog,v 1.3 2010/09/05 11:10:36 sbriesen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/termpkg/ChangeLog,v 1.4 2012/07/17 19:50:15 sbriesen Exp $
+
+*termpkg-3.3.9.1-r1 (17 Jul 2012)
+
+  17 Jul 2012; Stefan Briesenick <sbriesen@gentoo.org>
+  +termpkg-3.3.9.1-r1.ebuild, files/termnetd.initd, files/ttyd.initd:
+  EAPI=4, reworked init-scripts.
 
   05 Sep 2010; Stefan Briesenick <sbriesen@gentoo.org>
   termpkg-3.3.9.1.ebuild:
diff --git a/net-misc/termpkg/files/termnetd.initd b/net-misc/termpkg/files/termnetd.initd
index 73d095c8717b..db8621496cfe 100644
--- a/net-misc/termpkg/files/termnetd.initd
+++ b/net-misc/termpkg/files/termnetd.initd
@@ -1,13 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/termpkg/files/termnetd.initd,v 1.1 2008/09/23 19:34:00 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/termpkg/files/termnetd.initd,v 1.2 2012/07/17 19:50:15 sbriesen Exp $
 
 description="Terminal Server daemon (${RC_SVCNAME#*.})"
-description_reload="Reread configuration file and make the appropriate changes"
-extra_started_commands="reload"
 command="/usr/sbin/termnetd"
-name="termnetd"
+name="${RC_SVCNAME}"
+
+extra_started_commands="reload"
+description_reload="Reread configuration file and make the appropriate changes"
+start_stop_daemon_args="--quiet --exec ${command} --name ${name}"
 
 depend() {
 	use logger
@@ -33,18 +35,18 @@ config_check() {
 start() {
 	config_check || return ${?}
 	ebegin "Starting ${description}"
-	start-stop-daemon --start --quiet --exec "${command}" -- ${command_args}
+	start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args}
 	eend ${?}
 }
 
 stop() {
 	ebegin "Stopping ${description}"
-	start-stop-daemon --stop --quiet --oknodo --exec "${command}" --name "${name}"
+	start-stop-daemon --stop ${start_stop_daemon_args}
 	eend ${?}
 }
 
 reload() {
 	ebegin "Reloading ${description}"
-	start-stop-daemon --stop --signal HUP --oknodo --exec "${command}" --name "${name}"
+	start-stop-daemon --signal HUP ${start_stop_daemon_args}
 	eend ${?}
 }
diff --git a/net-misc/termpkg/files/ttyd.initd b/net-misc/termpkg/files/ttyd.initd
index 3302ea37bc9b..7149a34b4460 100644
--- a/net-misc/termpkg/files/ttyd.initd
+++ b/net-misc/termpkg/files/ttyd.initd
@@ -1,10 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/termpkg/files/ttyd.initd,v 1.1 2008/09/23 19:34:00 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/termpkg/files/ttyd.initd,v 1.2 2012/07/17 19:50:15 sbriesen Exp $
 
 description="Remote Modem Utility (${RC_SVCNAME#*.})"
 command="/usr/sbin/ttyd"
+name="${RC_SVCNAME}"
+
+start_stop_daemon_args="--quiet --exec ${command} --name ${name}"
 
 depend() {
 	use logger
@@ -74,7 +77,7 @@ start() {
 	config_check || return ${?}
 	device_check || return ${?}
 	ebegin "Starting ${description}"
-	start-stop-daemon --start --quiet --exec "${command}" -- ${command_args}
+	start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args}
 	if eend ${?}; then
 		setup_perms
 		setup_links
@@ -84,11 +87,8 @@ start() {
 
 stop() {
 	config_check || return ${?}
-	# we can't use start-stop-daemon, because we don't have a pidfile
-	# *and* multiple processes can run at the same time. So we use
-	# pkill to identify *our* process via commandline args.
 	ebegin "Stopping ${description}"
-	/usr/bin/pkill -f "^${command} -d ${DEV_PTY} "
+	start-stop-daemon --stop ${start_stop_daemon_args}
 	eend ${?}
 	unset_links
 	unset_perms
diff --git a/net-misc/termpkg/termpkg-3.3.9.1-r1.ebuild b/net-misc/termpkg/termpkg-3.3.9.1-r1.ebuild
new file mode 100644
index 000000000000..f6ff7f6492ff
--- /dev/null
+++ b/net-misc/termpkg/termpkg-3.3.9.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/termpkg/termpkg-3.3.9.1-r1.ebuild,v 1.1 2012/07/17 19:50:15 sbriesen Exp $
+
+EAPI=4
+
+inherit base versionator
+
+MY_PV=$(get_version_component_range 1-2)
+MY_PF=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Termpkg, the Poor Man's Terminal Server"
+HOMEPAGE="http://www.linuxlots.com/~termpkg/"
+SRC_URI="mirror://debian/pool/main/t/termpkg/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/t/termpkg/${PN}_${MY_PF}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+uucp"
+
+DEPEND="sys-devel/flex"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=(
+	"README"
+	"CHANGES"
+	"termpkg.lsm"
+)
+
+PATCHES=(
+	# debian patches
+	"${WORKDIR}/${PN}_${MY_PF}.diff"
+
+	# gentoo patches
+	"${FILESDIR}/${P}-gcc43.diff"
+
+	# iaxmodem patches
+	"${FILESDIR}/${PN}-${MY_PV}-ttydforfax.diff"
+)
+
+src_configure() {
+	./configure LINUX $(use uucp && echo UUCP_LOCKING)
+}
+
+src_compile() {
+	emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	local X
+	base_src_install_docs
+	dobin linux/bin/termnet
+	dosbin linux/bin/{termnetd,ttyd}
+	newdoc debian/changelog ChangeLog.debian
+	doman doc/*.1
+	insinto /etc
+	newins debian/termnetd.conf termnetd.conf.dist
+	for X in termnetd ttyd; do
+		newinitd "${FILESDIR}/${X}.initd" "${X}"
+		newconfd "${FILESDIR}/${X}.confd" "${X}"
+	done
+}