Parallel make fails, bug 364923; drop old.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 15 insertions, 50 deletions

diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index 2c76fc35cf54..262e0b86d5a8 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vtun
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.41 2010/09/18 03:12:18 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.42 2012/03/03 19:29:39 pacho Exp $
+
+  03 Mar 2012; Pacho Ramos <pacho@gentoo.org> -vtun-3.0.1.ebuild,
+  vtun-3.0.2-r1.ebuild:
+  Parallel make fails, bug 364923; drop old.
 
 *vtun-3.0.2-r1 (18 Sep 2010)
 
diff --git a/net-misc/vtun/vtun-3.0.1.ebuild b/net-misc/vtun/vtun-3.0.1.ebuild
deleted file mode 100644
index 24f73a9cbc1b..000000000000
--- a/net-misc/vtun/vtun-3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.1.ebuild,v 1.4 2007/07/12 02:52:15 mr_bones_ Exp $
-
-DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="lzo socks5 ssl zlib"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
-	lzo? ( >=dev-libs/lzo-2 )
-	zlib? ( sys-libs/zlib )
-	socks5? ( net-proxy/dante )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-src_compile() {
-	econf $(use_enable ssl) \
-		$(use_enable zlib) \
-		$(use_enable lzo) \
-		$(use_enable socks5 socks) \
-		--enable-shaper
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
-	newinitd "${FILESDIR}"/vtun.rc vtun
-	insinto etc
-	doins "${FILESDIR}"/vtund-start.conf
-}
-
-pkg_postinst() {
-	elog "You will need the Universal TUN/TAP driver compiled into"
-	elog "your kernel or as a module to use the associated tunnel"
-	elog "modes in vtun."
-	elog
-	elog "Also note that vtun-3 is not compatible with vtun-2."
-}
diff --git a/net-misc/vtun/vtun-3.0.2-r1.ebuild b/net-misc/vtun/vtun-3.0.2-r1.ebuild
index 09f810b53bd1..b9c059f87724 100644
--- a/net-misc/vtun/vtun-3.0.2-r1.ebuild
+++ b/net-misc/vtun/vtun-3.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r1.ebuild,v 1.1 2010/09/18 03:12:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r1.ebuild,v 1.2 2012/03/03 19:29:39 pacho Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils
 
@@ -38,8 +38,13 @@ src_configure() {
 		--enable-shaper
 }
 
+src_compile() {
+	# Parallel make fails, bug 364923
+	emake -j1
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install
 	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
 	newinitd "${FILESDIR}"/vtun.rc vtun
 	insinto etc