Remove old version of openvpn.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 8 insertions, 177 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 220ee628559e..a518be2ab552 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.227 2012/05/14 08:23:50 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.228 2012/05/14 08:25:04 djc Exp $
+
+  14 May 2012; Dirkjan Ochtman <djc@gentoo.org> -openvpn-2.2.0-r1.ebuild:
+  Remove old version.
 
   14 May 2012; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
   Update live ebuild to deal with new build system (thanks Alon Bar-Lev, bug
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 0046c1efa66b..b4179e92d71a 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -15,19 +15,16 @@ AUX up.sh 2594 RMD160 17576f73e6de08828aeda2a8776b4a36331fa855 SHA1 4eb4d1e85705
 DIST openvpn-2.1.0_eurephia.patch 2774 RMD160 6d65df5110dff6c9b28262dc40ada15fc30bdf34 SHA1 3b96a0c10f2f1ef586b4f861efb7d048fd51fd44 SHA256 9604f1bcc8d60361795741fc74caa9f0fad3c087e4023ed2d0af0b13c6650896
 DIST openvpn-2.1.1-ipv6-0.4.11.patch.gz 20869 RMD160 791db5911d714eabe437bff2aead3d18894e8b28 SHA1 992a54cc831461d78a9155f2d349a481433e211b SHA256 98dc1de039007109c0b24cccca4b9eb9061c391ee219b0e550d73c868015c45d
 DIST openvpn-2.1.4.tar.gz 863726 RMD160 3d4be2fe625883598370d74e8f7d9274eb40a636 SHA1 07c59c5b89b762761bfe1a6997ec847279f5a2da SHA256 67fe78e5def82d44d2ad4ef6fc6d87901195849d10b6b3cab81fa03257f52af5
-DIST openvpn-2.2.0.tar.gz 898381 RMD160 32aa52c886d98b6b92150dfc64d3a9c07f6e8b30 SHA1 97e3389814a1bcef5a6d22774534a30e41d48bff SHA256 71ebeaaba1641e6d1454ae0f10f986002e5c6afdcd09da659122e3e5c74a2567
 DIST openvpn-2.2.2.tar.gz 911158 RMD160 60990f183bdd46933724b3bf39ba5861ed0258a6 SHA1 992373cdf12e1b50655b13765a6d36a87cfd3ca3 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00
-DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 RMD160 a553399ffe3b6cf0c116b92399df7d801972e3ca SHA1 d7ce041c4e7f0186091e17a2d178bd12e7a4696d SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21
 EBUILD openvpn-2.1.4.ebuild 5731 RMD160 0043436908aa35297420df45c1cdb1060f305663 SHA1 9d2fc4af9349434db07d41cabcb5c776de348ad7 SHA256 d4799b8908f3fb42ae5e1ecf3635e8f81bd2ce5110a109dda63e2b0389a3aa87
-EBUILD openvpn-2.2.0-r1.ebuild 5306 RMD160 0124761ec5e2ddd7a42e7277cbb38dbb142c591d SHA1 f71a68b6e28869f08144b08ec5ed3a8ce5346d50 SHA256 8cf58bb8252cb7fb277fc258ef0050e862456129d951444b5e8ad98b1f9dafad
 EBUILD openvpn-2.2.2.ebuild 4798 RMD160 68af68c3ee13e86b16e0d5665170ded280bb7edb SHA1 6d2783e4e67d6cf2799100d5e9fd17d31859f31f SHA256 aaea5cd8b5e3381a026dd3cc57130c34478f89431d0f64906321629b626dd07a
 EBUILD openvpn-9999.ebuild 4166 RMD160 6aa0d2926b6130fe513c9f4d878fb8142430a809 SHA1 cc8ddecb8c410ba33660d667176942e79d981ba2 SHA256 6544d5ed281320a8853596f09bdd97345e3fa0984e05ef6864e395891d7cdb53
-MISC ChangeLog 33189 RMD160 8b87f2ddfdc9f42e93b19c9c3afd00bc4e9d6a72 SHA1 6dffa174bfad17be46f2facf39dd0b23633ef68c SHA256 20c3c3201db36a4237474e878a58e5fb91a7b0a5dabaf05ccd204188c8c33195
+MISC ChangeLog 33286 RMD160 170f204293b59d792766d429e0433770d0fd2a4a SHA1 e59f45d2af19cee3d9d51215dca31bed1166ae6b SHA256 c183a4639c78b469a4007660a432182b1c1ecd7fe8fd98cb1d755d85c281c184
 MISC metadata.xml 808 RMD160 40e1ada3063edc2ae986c33b1ad78d150bcb4523 SHA1 5a8edc3cf4a935ebc255b71327c4e5cc8362f0ed SHA256 06fb4ae72a9389520966db3f497088b9d23de0ef0b1e74d5c2066980bef221a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+wwR4ACgkQxeMuLWsGW/vktgCfazOhYbT04nA4+YMpeP4y9cxz
-AT4AniZWIpqFtyUkIfLXko+iG+VQarXb
-=bhxT
+iEYEAREKAAYFAk+wwccACgkQxeMuLWsGW/utNQCeKntPU8RiaukMWgNXKlmQQFBy
+YVMAn2Jm9daJWFf4tR9Uk3xW4MWmFw8L
+=tpEY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
deleted file mode 100644
index 438616a81067..000000000000
--- a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,169 +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/openvpn/openvpn-2.2.0-r1.ebuild,v 1.3 2011/07/29 08:45:05 zmedico Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs autotools flag-o-matic
-
-IPV6_VERSION="2.2RC2-ipv6-20110424-2"
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
-		ipv6? (
-			http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz
-		)"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-IUSE="examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 userland_BSD"
-
-DEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
-	use ipv6 && epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch"
-	sed -i \
-		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
-		-e "s/-shared/-shared \${LDFLAGS}/" \
-		plugin/*/Makefile || die "sed failed"
-	if use ipv6; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# basic.h defines a type 'bool' that conflicts with the altivec
-	# keyword bool which has to be fixed upstream, see bugs #293840
-	# and #297854.
-	# For now, filter out -maltivec on ppc and append -mno-altivec, as
-	# -maltivec is enabled implicitly by -mcpu and similar flags.
-	(use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec
-
-	local myconf=""
-
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	else
-		myconf="$(use_enable pkcs11)"
-	fi
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable iproute2) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-
-	if use static ; then
-		sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
-	fi
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in *; do
-			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			emake -C "${i}" CC=$(tc-getCC) || die "make failed"
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh" || die "doexe failed"
-	doexe "${FILESDIR}/down.sh" || die "doexe failed"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn || die "newinitd failed"
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn || die "newconfd failed"
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-	fi
-
-	# Install plugins and easy-rsa
-	doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	if use ipv6 ; then
-		einfo ""
-		einfo "This build contains a community-maintained IPv6 patch."
-		einfo "For more information please visit:"
-		einfo "http://www.greenie.net/ipv6/openvpn.html"
-	fi
-}