Remove older exploitables and name cleanup, bug #466904

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

7 files changed, 15 insertions, 99 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 34278ea39081..f5aad9618ed9 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.40 2013/04/23 02:40:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.41 2013/04/24 11:19:53 blueness Exp $
+
+  24 Apr 2013; Anthony G. Basile <blueness@gentoo.org> +files/tincd,
+  +files/tincd.conf, +files/tincd.lo, -files/tincd.1, -files/tincd.conf.1,
+  -files/tincd.lo.1, -tinc-1.0.19.ebuild, -tinc-1.0.20.ebuild,
+  tinc-1.0.21.ebuild:
+  Remove older exploitables and name cleanup, bug #466904
 
 *tinc-1.0.21 (23 Apr 2013)
 
diff --git a/net-misc/tinc/files/tincd.1 b/net-misc/tinc/files/tincd
index 0e2db59737ef..208f4526de88 100644
--- a/net-misc/tinc/files/tincd.1
+++ b/net-misc/tinc/files/tincd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1,v 1.4 2012/02/02 20:29:33 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.8 2013/04/24 11:19:53 blueness Exp $
 
 extra_started_commands="reload"
 
diff --git a/net-misc/tinc/files/tincd.conf.1 b/net-misc/tinc/files/tincd.conf
index 0394702a2af5..0394702a2af5 100644
--- a/net-misc/tinc/files/tincd.conf.1
+++ b/net-misc/tinc/files/tincd.conf
diff --git a/net-misc/tinc/files/tincd.lo.1 b/net-misc/tinc/files/tincd.lo
index dda464fc6808..8f41d98887a7 100644
--- a/net-misc/tinc/files/tincd.lo.1
+++ b/net-misc/tinc/files/tincd.lo
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1,v 1.5 2012/03/11 14:08:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo,v 1.4 2013/04/24 11:19:53 blueness Exp $
 
 extra_started_commands="reload"
 
diff --git a/net-misc/tinc/tinc-1.0.19.ebuild b/net-misc/tinc/tinc-1.0.19.ebuild
deleted file mode 100644
index f1b3507d530b..000000000000
--- a/net-misc/tinc/tinc-1.0.19.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.19.ebuild,v 1.1 2012/06/26 13:52:39 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 ~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
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 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.20.ebuild b/net-misc/tinc/tinc-1.0.20.ebuild
deleted file mode 100644
index 786bac18876b..000000000000
--- a/net-misc/tinc/tinc-1.0.20.ebuild
+++ /dev/null
@@ -1,45 +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.20.ebuild,v 1.1 2013/03/05 02:34:20 blueness Exp $
-
-EAPI="5"
-
-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
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 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.21.ebuild b/net-misc/tinc/tinc-1.0.21.ebuild
index 058f79923353..3bfd0e8328a2 100644
--- a/net-misc/tinc/tinc-1.0.21.ebuild
+++ b/net-misc/tinc/tinc-1.0.21.ebuild
@@ -1,6 +1,6 @@
 # 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.21.ebuild,v 1.1 2013/04/23 02:40:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.21.ebuild,v 1.2 2013/04/24 11:19:53 blueness Exp $
 
 EAPI="5"
 
@@ -33,10 +33,10 @@ src_install() {
 	emake DESTDIR="${D}" install
 	dodir /etc/tinc
 	dodoc AUTHORS NEWS README THANKS
-	newinitd "${FILESDIR}"/tincd.1 tincd
-	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
+	doinitd "${FILESDIR}"/tincd
+	doinitd "${FILESDIR}"/tincd.lo
 	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf.1 tincd
+	newconfd "${FILESDIR}"/tincd.conf tincd
 }
 
 pkg_postinst() {