Parallel make fails, bug 364923; drop old.

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

4 files changed, 22 insertions, 61 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/Manifest b/net-misc/vtun/Manifest
index 4fbe06bb806e..429cdfdd2ee7 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX vtun-2.6-lzo2.patch 2547 RMD160 be0b6b2e2d1c3a123adf4a4f5f6bdc9926407f18 SHA1 e4b074adc5a26a40abd12521458ced2ef8365023 SHA256 3ed5678005e3b8ed7d9f0174174652b91a43041dbacf86f5cfa7de965d507568
 AUX vtun-2.6-makefile.patch 1919 RMD160 9487239d1ac950173de55f7c3950674d13b7af56 SHA1 03bab4451748b5bf713102c8b25fae9c55e3dea3 SHA256 a26d2dd9e7ecb591a822f01ce2ce2bf7f5e7d9e80b45b05f665e63c12cc17653
@@ -7,20 +7,16 @@ AUX vtun-3.0.2-includes.patch 2020 RMD160 eae6a137693f6376c0d6cb1cfa674a6f26f546
 AUX vtun.rc 772 RMD160 77ceb021d39aed235291f1c48c6a1c66354fdace SHA1 29aa4f4f625165783e5f2f531310fd5998c18a01 SHA256 15d61c1ee544a69ee67fa580b3ef43d446ef6ebc0f1e91654449e61bc53ff43e
 AUX vtund-start.conf 1174 RMD160 e27c66bb660df80d6444fd4f86aea910a30aa281 SHA1 3299eb74d03d73ecd7da7e49fdda8ca73587d51e SHA256 fce23e42500ac4b2135dfd4940388e4d05c117bba12446a7e1702c5a3342ab03
 DIST vtun-2.6.tar.gz 95637 RMD160 9f666189740b78a88f6b0e2807add3267551198b SHA1 ba6474a551856a7bb55b4cc21d858b8275a2e610 SHA256 fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
-DIST vtun-3.0.1.tar.gz 124829 RMD160 49e55a084cea6048f14dbc1137f7dbcf012b6bbb SHA1 b2081ee7238109beef09c1a2aaaf73c331e667e3 SHA256 22507499a8f650ef97157977e62fa632d5b0034070629a2d0fd0512e304eaeeb
 DIST vtun-3.0.2.tar.gz 125777 RMD160 6592251871f7e6b9a7e12b7e07ab0a700d816f57 SHA1 6e2da196c70475e5d3750903b2dad032a7b1e8ac SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6
 EBUILD vtun-2.6-r1.ebuild 1740 RMD160 0551043dec4807d35e776fb219c27a623ac73b38 SHA1 b6c978cd3afcb6581e3efa3cd696d991449a0ec5 SHA256 4a123f9bc4946f1f7e7ff3a1ef2aaf20fd66cfb2003c158af6f813b8434c8ee1
-EBUILD vtun-3.0.1.ebuild 1318 RMD160 f6a279efc4e7f47d6c6d7bd29c9edf50e937a31f SHA1 910df625cdc79a155e72c0551b3d779d50d2f28e SHA256 c23e496e87555362b3410ec4533f913b1684d5a08877b112d8a993377b1a21d2
-EBUILD vtun-3.0.2-r1.ebuild 1373 RMD160 b70bf77728de42c401a5f59beea177f08cd68adf SHA1 166adb50bac265a148463ce9a09219d412c7f004 SHA256 d3b2a9cfc9eb0ca80cfd66754fc143c2071f7ed916fcfec0bd3fbc7f45d561fd
+EBUILD vtun-3.0.2-r1.ebuild 1409 RMD160 8fe70f90bf458a66332a36265cd89811a155a342 SHA1 cc483acd961a481f69de8ec7499b21bae5af066f SHA256 d2cfa675005adb2ae5d7d927be41bf6d13f0a6f60dc260fde66f09204a225f0e
 EBUILD vtun-3.0.2.ebuild 1216 RMD160 4f485fb35b1a3f2757f96b456bc7099e109cebc1 SHA1 0d4b5c6e9ac5bd47179039f25e51cef0304db516 SHA256 25fafb9f4d8327aa470f3a09bc48ae530a9c91ac31266a9468ffe90d5166ece3
-MISC ChangeLog 5420 RMD160 714c18c729a6d3100bcf625deeb01543014af8ff SHA1 cbe47db1c4676f882f67d18c010f291c4661878e SHA256 51aa038c43863d3ab8eb44cbe05467b9ca42c7870ff998aa4ff3e87b9fc444eb
+MISC ChangeLog 5558 RMD160 a16aae1d071d6eba01cfb58e44ac14f7aadef041 SHA1 5a061ffa57a07c17152306e44ff8d99c518fa974 SHA256 98d41a06cc568a33276b53b7199c1cff846bbc22f2c87fa992e3e639c24ea912
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRoACgkQfXuS5UK5QB0PqAQAg9X3O++kgq/7kCCnwInoppp0
-m/OS0VMZp9NpOspNKIagBga+708dGNBtAKwNrkuXrckM77A4Y9lX0zne25idEq7I
-XOC4GjeLPRUW/r4TL3Xwy8aDYigzzloRy1nBL6X+Rop44+pys9Z2qWaPwB3c/A8B
-FlhDMFAZnaeJKsUyi+k=
-=XDrS
+iEYEARECAAYFAk9ScSkACgkQCaWpQKGI+9QK1ACggK6FXymBSkOSzM1bsl9kBero
+jqMAnA/ic9Rx/83QR89BiiiJb8djXHjo
+=bju8
 -----END PGP SIGNATURE-----
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