6 files changed, 5 insertions, 185 deletions
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index f35c20ea5128..1c290a40209e 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.33 2012/03/26 12:40:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.34 2012/03/26 23:25:12 blueness Exp $
+
+  26 Mar 2012; Anthony G. Basile <blueness@gentoo.org> -tinc-1.0.13.ebuild,
+  -tinc-1.0.16.ebuild, -files/tincd, -files/tincd.conf, -files/tincd.lo:
+  Remove older unstable versions
 
   26 Mar 2012; Anthony G. Basile <blueness@gentoo.org> tinc-1.0.18.ebuild,
   files/fix-ac-arg-enable.patch:
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
deleted file mode 100644
index 8ae381bb3e22..000000000000
--- a/net-misc/tinc/files/tincd
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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.6 2011/12/04 10:30:33 swegener Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	use logger dns
-	need net
-}
-
-checkconfig() {
-	if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks 
-	then
-		eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting tinc VPN networks"
-	eend 0
-	awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
-	do
-		if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ] 
-		then
-			eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
-		else
-			ebegin "Starting tinc network $TINCNET"
-			/usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
-			eend $?
-		fi
-	done
-}
-
-stop() {
-	ebegin "Stopping tinc VPN networks"
-	eend 0
-	awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
-	do
-		if [ -f /var/run/tinc."$TINCNET".pid ]
-		then
-			ebegin "Stopping tinc network $TINCNET"
-			/usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
-			eend $?
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading configuration for tinc VPN networks"
-	eend 0
-	awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
-	do
-		if [ -f /var/run/tinc."$TINCNET".pid ]
-		then
-			ebegin "Reloading tinc network $TINCNET"
-			/usr/sbin/tincd --kill HUP  --pidfile=/var/run/tinc."$TINCNET".pid
-			eend $?
-		fi
-	done
-}
diff --git a/net-misc/tinc/files/tincd.conf b/net-misc/tinc/files/tincd.conf
deleted file mode 100644
index c19b8365b6d3..000000000000
--- a/net-misc/tinc/files/tincd.conf
+++ /dev/null
@@ -1 +0,0 @@
-#rc_need="net.net"
diff --git a/net-misc/tinc/files/tincd.lo b/net-misc/tinc/files/tincd.lo
deleted file mode 100644
index 5ec82aa605bf..000000000000
--- a/net-misc/tinc/files/tincd.lo
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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.2 2011/12/04 10:30:32 swegener Exp $
-
-extra_started_commands="reload"
-
-depend()
-{
-	use logger dns
-	need net
-}
-
-start()
-{
-	TINCNET=${RC_SVCNAME#*.}
-	if [ -f /etc/tinc/"$TINCNET"/tinc.conf ] ; then
-		ebegin "Starting tinc network $TINCNET"
-		/usr/sbin/tincd --debug=1 --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
-		eend $?
-	else
-		eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
-	fi
-}
-
-stop()
-{
-	TINCNET=${RC_SVCNAME#*.}
-	if [ -f /var/run/tinc."$TINCNET".pid ] ; then
-		ebegin "Stopping tinc network $TINCNET"
-		/usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
-		eend $?
-	else
-		eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
-	fi
-}
-
-reload()
-{
-	TINCNET=${RC_SVCNAME#*.}
-	if [ -f /var/run/tinc."$TINCNET".pid ] ; then
-		ebegin "Reloading configuration for tinc network $TINCNET"
-		/usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
-		eend $?
-	fi
-}
diff --git a/net-misc/tinc/tinc-1.0.13.ebuild b/net-misc/tinc/tinc-1.0.13.ebuild
deleted file mode 100644
index 40895b5cfd32..000000000000
--- a/net-misc/tinc/tinc-1.0.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.13.ebuild,v 1.2 2010/09/17 09:48:50 robbat2 Exp $
-
-EAPI=2
-
-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 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +zlib"
-
-DEPEND=">=dev-libs/openssl-0.9.7c
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( >=sys-libs/zlib-1.1.4-r2 )"
-
-src_configure() {
-	econf  --enable-jumbograms $(use_enable lzo) $(use_enable zlib)  || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doinitd "${FILESDIR}"/tincd{,.lo}
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-}
-
-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.16.ebuild b/net-misc/tinc/tinc-1.0.16.ebuild
deleted file mode 100644
index 8009fd0da3c6..000000000000
--- a/net-misc/tinc/tinc-1.0.16.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16.ebuild,v 1.2 2011/09/26 03:23:06 blueness Exp $
-
-EAPI=4
-
-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 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +zlib"
-
-DEPEND=">=dev-libs/openssl-0.9.7c
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( >=sys-libs/zlib-1.1.4-r2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf  --enable-jumbograms $(use_enable lzo) $(use_enable zlib)  || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doinitd "${FILESDIR}"/tincd{,.lo}
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-}
-
-pkg_postinst() {
-	elog "This package requires the tun/tap kernel device."
-	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}