Remove older versions with tincd/tincd.lo split openrc scripts

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

5 files changed, 5 insertions, 219 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 48edfa7d7d5d..55958b57be9a 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.49 2014/09/27 15:02:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.50 2014/09/27 15:13:12 blueness Exp $
+
+  27 Sep 2014; Anthony G. Basile <blueness@gentoo.org> -files/tincd,
+  -files/tincd.lo, -tinc-1.0.23.ebuild, -tinc-1.0.24.ebuild:
+  Remove older versions with tincd/tincd.lo split openrc scripts
 
 *tinc-1.1_pre10-r1 (27 Sep 2014)
 *tinc-1.0.24-r2 (27 Sep 2014)
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
deleted file mode 100644
index b26185eae4e3..000000000000
--- a/net-misc/tinc/files/tincd
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.9 2013/09/01 12:22:46 blueness Exp $
-
-extra_started_commands="reload"
-
-NETS="/etc/conf.d/tinc.networks"
-DAEMON="/usr/sbin/tincd"
-
-depend() {
-	use logger dns
-	need net
-}
-
-checkconfig() {
-	if ! grep -q '^ *NETWORK:' "${NETS}" ; then
-		eerror "No VPN networks configured in ${NETS}"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting tinc VPN networks"
-	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
-	do
-		CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-		PIDFILE="/var/run/tinc.${NETNAME}.pid"
-		if [ ! -f "${CONFIG}" ]; then
-			eerror "Cannot start network ${NETNAME}."
-			eerror "Please set up ${CONFIG} !"
-		else
-			ebegin "Starting tinc network ${NETNAME}"
-			if [ "${SYSLOG}" == "yes" ]; then
-				LOG=""
-			else
-				LOG="--logfile=/var/log/tinc.${NETNAME}.log"
-			fi
-			start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" ${LOG} --pidfile "${PIDFILE}"
-			eend $?
-		fi
-	done
-}
-
-stop() {
-	ebegin "Stopping tinc VPN networks"
-	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
-	do
-		PIDFILE="/var/run/tinc.${NETNAME}.pid"
-		if [ -f "${PIDFILE}" ]; then
-			ebegin "Stopping tinc network ${NETNAME}"
-			start-stop-daemon --stop --pidfile "${PIDFILE}"
-			eend $?
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading configuration for tinc VPN networks"
-	awk '/^ *NETWORK:/ { print $2 }' "${NETS}" | while read NETNAME
-	do
-		PIDFILE="/var/run/tinc.${NETNAME}.pid"
-		if [ -f "${PIDFILE}" ]; then
-			ebegin "Reloading tinc network ${NETNAME}"
-			start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-			eend $?
-		fi
-	done
-}
diff --git a/net-misc/tinc/files/tincd.lo b/net-misc/tinc/files/tincd.lo
deleted file mode 100644
index a7bc443498a0..000000000000
--- a/net-misc/tinc/files/tincd.lo
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo,v 1.5 2013/09/01 12:22:46 blueness Exp $
-
-extra_started_commands="reload"
-
-DAEMON="/usr/sbin/tincd"
-
-depend() {
-	use logger dns
-	need net
-}
-
-start() {
-	NETNAME="${RC_SVCNAME#*.}"
-	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-	PIDFILE="/var/run/tinc.${NETNAME}.pid"
-	if [ ! -f "${CONFIG}" ]; then
-		eerror "Cannot start network ${NETNAME}."
-		eerror "Please set up ${CONFIG} !"
-	else
-		ebegin "Starting tinc network $NETNAME"
-		if [ "${SYSLOG}" == "yes" ]; then
-			LOG=""
-		else
-			LOG="--logfile=/var/log/tinc.${NETNAME}.log"
-		fi
-		start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" ${LOG} --pidfile "${PIDFILE}"
-		eend $?
-	fi
-}
-
-stop() {
-	NETNAME="${RC_SVCNAME#*.}"
-	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-	PIDFILE="/var/run/tinc.${NETNAME}.pid"
-	if [ -f "${PIDFILE}" ] ; then
-		ebegin "Stopping tinc network ${NETNAME}"
-		start-stop-daemon --stop --pidfile "${PIDFILE}"
-		eend $?
-	fi
-}
-
-reload() {
-	NETNAME=${RC_SVCNAME#*.}
-	CONFIG="/etc/tinc/${NETNAME}/tinc.conf"
-	PIDFILE="/var/run/tinc.${NETNAME}.pid"
-	if [ -f "${PIDFILE}" ] ; then
-			ebegin "Reloading tinc network ${NETNAME}"
-			start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-			eend $?
-	fi
-}
diff --git a/net-misc/tinc/tinc-1.0.23.ebuild b/net-misc/tinc/tinc-1.0.23.ebuild
deleted file mode 100644
index 95a573aa21c0..000000000000
--- a/net-misc/tinc/tinc-1.0.23.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.23.ebuild,v 1.1 2013/10/19 15:58:57 blueness Exp $
-
-EAPI="5"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo uml vde +zlib"
-
-DEPEND=">=dev-libs/openssl-0.9.7
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-tunemu  \
-		$(use_enable lzo) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doinitd "${FILESDIR}"/tincd
-	doinitd "${FILESDIR}"/tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-	systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
-
-pkg_postinst() {
-	elog "This package requires the tun/tap kernel device."
-	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}
diff --git a/net-misc/tinc/tinc-1.0.24.ebuild b/net-misc/tinc/tinc-1.0.24.ebuild
deleted file mode 100644
index d52d6b8af4d4..000000000000
--- a/net-misc/tinc/tinc-1.0.24.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.24.ebuild,v 1.1 2014/05/11 16:49:31 blueness Exp $
-
-EAPI="5"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo uml vde +zlib"
-
-DEPEND="dev-libs/openssl
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-tunemu  \
-		$(use_enable lzo) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doinitd "${FILESDIR}"/tincd
-	doinitd "${FILESDIR}"/tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-	systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
-
-pkg_postinst() {
-	elog "This package requires the tun/tap kernel device."
-	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}