Remove older unstable version

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

3 files changed, 5 insertions, 130 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index c73828ec2222..87f243c3dbfc 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.38 2013/03/05 02:34:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.39 2013/03/05 02:41:34 blueness Exp $
+
+  05 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  -files/fix-ac-arg-enable.patch, -tinc-1.0.18.ebuild:
+  Remove older unstable version
 
 *tinc-1.0.20 (05 Mar 2013)
 
diff --git a/net-misc/tinc/files/fix-ac-arg-enable.patch b/net-misc/tinc/files/fix-ac-arg-enable.patch
deleted file mode 100644
index ce693a2bb06c..000000000000
--- a/net-misc/tinc/files/fix-ac-arg-enable.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 2ea69f6..7eaeca6 100644
---- a/configure.in
-+++ b/configure.in
-@@ -73,30 +73,44 @@ case $host_os in
- esac
- 
- AC_ARG_ENABLE(uml,
--  AS_HELP_STRING([--enable-uml], [enable support for User Mode Linux]),
--  [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
--    uml=true
--  ]
-+  AS_HELP_STRING([--disable-uml], [enable support for User Mode Linux]),
-+  [ AS_IF([test "x$enable_uml" = "xyes"],
-+      [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
-+        uml=true
-+      ],
-+      [uml=false])
-+  ],
-+  [uml=false]
- )
- 
- AC_ARG_ENABLE(vde,
--  AS_HELP_STRING([--enable-vde], [enable support for Virtual Distributed Ethernet]),
--  [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
--    AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
--    vde=true
--  ]
-+  AS_HELP_STRING([--disable-vde], [enable support for Virtual Distributed Ethernet]),
-+  [ AS_IF([test "x$enable_vde" = "xyes"],
-+      [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
-+        AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
-+        vde=true
-+      ],
-+      [vde=false])
-+  ],
-+  [vde=false]
- )
- 
- AC_ARG_ENABLE(tunemu,
--  AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
--  [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
--    tunemu=true
--  ]
-+  AS_HELP_STRING([--disable-tunemu], [enable support for the tunemu driver]),
-+  [ AS_IF([test "x$enable_tunemu" = "xyes"],
-+      [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
-+        tunemu=true
-+      ],
-+      [tunemu=false])
-+  ],
-+  [tunemu=false]
- )
- 
- AC_ARG_WITH(windows2000,
--  AS_HELP_STRING([--with-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
--  [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])]
-+  AS_HELP_STRING([--without-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
-+  [ AS_IF([test "x$with_windows2000" = "xyes"],
-+      [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])])
-+  ]
- )
- 
- AM_CONDITIONAL(UML, test "$uml" = true)
-@@ -176,8 +190,10 @@ tinc_OPENSSL
- 
- dnl Check if support for jumbograms is requested 
- AC_ARG_ENABLE(jumbograms,
--  AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
--  [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ]
-+  AS_HELP_STRING([--disable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
-+  [ AS_IF([test "x$enable_jumbograms" = "xyes"],
-+      [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ])
-+  ]
- )
- 
- AC_SUBST(INCLUDES)
diff --git a/net-misc/tinc/tinc-1.0.18.ebuild b/net-misc/tinc/tinc-1.0.18.ebuild
deleted file mode 100644
index 6c48d4a5cba5..000000000000
--- a/net-misc/tinc/tinc-1.0.18.ebuild
+++ /dev/null
@@ -1,52 +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.18.ebuild,v 1.3 2012/05/12 05:28:45 heroxbd Exp $
-
-EAPI="4"
-
-inherit eutils autotools
-
-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_prepare() {
-	epatch "${FILESDIR}"/fix-ac-arg-enable.patch
-	eautoreconf
-}
-
-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"
-}