Set RDEPEND (not DEPEND) blocker. Clean up patches.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 45 insertions, 48 deletions

diff --git a/net-analyzer/netcat6/ChangeLog b/net-analyzer/netcat6/ChangeLog
index ed8adee9fd7a..bdca2cad22f4 100644
--- a/net-analyzer/netcat6/ChangeLog
+++ b/net-analyzer/netcat6/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/netcat6
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.33 2013/12/04 03:21:59 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.34 2014/07/14 21:39:15 jer Exp $
+
+  14 Jul 2014; Jeroen Roovers <jer@gentoo.org> netcat6-1.0-r2.ebuild,
+  files/netcat6-1.0-automake-1.14.patch, files/netcat6-1.0-unix-sockets.patch:
+  Set RDEPEND (not DEPEND) blocker. Clean up patches.
 
   04 Dec 2013; Tim Harder <radhermit@gentoo.org> netcat6-1.0-r2.ebuild,
   +files/netcat6-1.0-automake-1.14.patch:
diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest
index c1cc2f522304..b20d50fdf916 100644
--- a/net-analyzer/netcat6/Manifest
+++ b/net-analyzer/netcat6/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX netcat6-1.0-automake-1.14.patch 440 SHA256 fbd13e59cf593e6b7f38397534375170955c06e40c45d1d4a1a7867703048bd7 SHA512 08964fad2304f9b5f4f00f58937d3c8e7c5486d9d221cbbadbd84dc97ef5832076f27a1e15a5801901855b3719a09f92f397a089a2bade99603414844a2c6e84 WHIRLPOOL 1a207e9a97dc548824d6403b2ac3509139acb6b23eaaa2f5b0633564b4e4977bae801f6d69e7dbf9242a3dc3ff0e72591e5bdd54b4ee7860fdabdd8ae7091ffb
-AUX netcat6-1.0-unix-sockets.patch 8798 SHA256 c82d3ae349d7cf142a839066fef2fc1f98903260cec6e30d08aca375487a5c7b SHA512 baa26599f55c36bccb6e26d9b79ac6516e862df6209939547adc32303b2833ec87d9ca08d1be8e08fae033062b4b5bba8c723eac4e2fc6734f1882be92914fae WHIRLPOOL f02d12ba65a2b2077285519327cdd192d2964ad614ff994f65af696c90296819f52755d758f9b3b0c8954376fe9f8dcb387ee9378cfe6a83f9b6a668a22ae616
+AUX netcat6-1.0-automake-1.14.patch 428 SHA256 3f7c2718aa59adc2ddcd607a0ed8f1313de873e66d340018adb4cd088c4d6255 SHA512 91aa92162b379632318e429853382c0e73d8c37ac73fce91975dcc7340705435e5832c4fa7a185a1ad3f4c7b492a256fe08e8233da4bce963969325983f1e473 WHIRLPOOL 23e9805308bcb7e031bb3468dbff3ad3bcf5d98c024430b09324b38b85a2ab84ba4d36b8e500d0cb20545f759559db22a2debfc621a527ecd303f30de66ecd59
+AUX netcat6-1.0-unix-sockets.patch 8161 SHA256 2e10bc2891a35e8bb6a70b23620c6a26a16b9531bc565b2b3131b2a3a8b03e3b SHA512 7597a515ef5779f49f7c9657bdfe76f0d0840adfb7fb39f9be0620faf9426556b555540f4d82a63df220207bf12684d1e198013b2b530df35eabe3c3e574b24f WHIRLPOOL d7acebd722adf9aa62181a0572fd508ba76ec89bbb4dcefe6a48e78c8b697bdd063451c1c0af7393c6091cbeb802623668e96584cb9f100bca3a4af14a928e50
 DIST nc6-1.0.tar.bz2 264257 SHA256 eb35e7a05a60bf94496075a3a246d7bf63fcdba2ca7ceb6844852a1ff6478206 SHA512 199f3bd18bb452544da8ca1b0f5347f79662bea81e9af335a41ed62c12d5d8cb41d99442ca54f301538d27aec4ada5f59db87461e5b0f20333ba1b52859bd35a WHIRLPOOL e3ad61617daa705efc4a459c96a6e020eb30d6e38be367c5014fa2b8706de53502348ce6995e7804c60e6c4b8cfefc21a50a00987cdb33b9ae2d336d294bbf80
-EBUILD netcat6-1.0-r2.ebuild 1242 SHA256 058cc70eee6d841a32cee8974626986f2b8086d974544cc9c059859e3b7573bf SHA512 368f78953888da1c247185202dfde86ef6e1e0ec9ee5a06d54dd5f22b64775758db3797cf7076fee7f2671be76553ae8a3c999dce2712a509d6cf7e6424faf18 WHIRLPOOL 6d75d7a860f5e982778d9dc59b308bd5f87472db1b1992a101282af99942b94818fb346424d9df566cce132787ffa5f706dd6347cc7980869be5a41f772c2723
-MISC ChangeLog 4122 SHA256 7b257836a87998ddde2a9b62a11f80c3af1543b08dc5bd7b56e157597af1fb02 SHA512 76db3d3211336d45764f929b8e3b1df23d9f80de50e9e9a500b139415beef7e8786ae762bfac4f5f2e3f024b564d7fe6cd49f8692137efe198e8bba5cdebed69 WHIRLPOOL 8e0b2f84a5764fae6ce6340d9e27c8738c0b775a2b4c65ff4f3b96de3875f0496b932e2fa50b7ec12d3acd326a0028f5d072ab20c87c81f0b354ee9c19efed89
+EBUILD netcat6-1.0-r2.ebuild 1235 SHA256 3e201197b8e65039030e9011f5f50da7c46efe8949dce2704acc8386b1259bac SHA512 583dcc5910c705556bb88dc44e7b54b9027e257b958c463d3e81bac62b5fd06db4f8c22c5c308533588bbef572054c5aeb146f5eb313c2d8cb1301170ca564d6 WHIRLPOOL b429bfc7a7507ba84300424761ca358ea4c3082d4811530251212450f91d91c8b3db8959fea44e724f5e75c1b273a0f907ceaf769cb59889e8fb8da63d8cd632
+MISC ChangeLog 4320 SHA256 5aa38f15b44d7df3f400a682f443a19c98ec7fb38724f695b4ed1e10b1f15f65 SHA512 29497fc5f7b85c283850cbc22fec95516ae92b2a03b9f0ec71aed590f54658490399971c79c57b2b8fd072e00fa1e4056d8eecbc8eebb4cb1e4f5540445b721f WHIRLPOOL af0074c896579f8215cc6a19c0bf22de550a65eda5b633d9f706fe7fc3f3095271dc3cc9c26b45cd120a812555efa802c51c558df086811fca2d597abbded982
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJSnp/aAAoJEEqz6FtPBkyjaHwIALmt3CCR2qIZS+QhOEgGQMzI
-tevnPh0pMIGGanMp7659AUsiMAiYslgk1PGCs2azSqfIcRhkPWu8RXKtBrRzoeDi
-yP3XogS+ig4Kml+XghIKaY9xrUSa5KvTjzv4stqKGINep1RbYOBiBcP42g4uda8J
-cI0iOppUwoJxLqGbnEjBREC3BTdkLbm3m3jl+1MhMKKsJFrin4L80j42iROPyl29
-tvbUtGqAkapTFW4ws+GZtDVd/6fEpVx6b9hu8FIInRKu5V0+J19s2ZlqWGom8GJF
-lJ4au2uuOh1fFT6QHUreC8P+0SFgpudLXkJBfZv7mtk9jt3wWysdSPsp++t0Q0Y=
-=aUn3
+iEYEAREIAAYFAlPETgQACgkQVWmRsqeSphPsGACffzS21UvP0Tcnt5+yN09T+sEl
+Y9wAnjNAgMkaJdxXroRoZ2cIRWW1qkjm
+=rwhh
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch b/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
index 2e7dcb6b0849..f7c128590be8 100644
--- a/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
+++ b/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
@@ -1,5 +1,5 @@
---- nc6-1.0/configure.ac
-+++ nc6-1.0/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -2,9 +2,9 @@
  AC_INIT(nc6, 1.0, [ds6-devel@deepspace6.net])
  AC_CONFIG_AUX_DIR(config)
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
index d5cb90bd1ec9..8eae2c6e0af8 100644
--- a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
+++ b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
@@ -1,6 +1,5 @@
-=== modified file 'docs/nc6.1.in'
---- docs/nc6.1.in	2008-10-25 14:16:55 +0000
-+++ docs/nc6.1.in	2008-10-25 14:17:11 +0000
+--- a/docs/nc6.1.in
++++ b/docs/nc6.1.in
 @@ -160,6 +160,10 @@
  With this option set, netcat6 will use UDP as the transport protocol (TCP is
  the default).
@@ -13,9 +12,8 @@
  Enable verbose mode.  This gives some basic information about what netcat6
  is doing.  Use it twice for extra verbosity.
 
-=== modified file 'src/Makefile.am'
---- src/Makefile.am	2008-10-25 14:16:55 +0000
-+++ src/Makefile.am	2008-10-25 14:17:09 +0000
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -6,6 +6,7 @@
    network.h \
    afindep.h \
@@ -33,9 +31,8 @@
    io_stream.c \
    connection.c
 
-=== modified file 'src/connection.c'
---- src/connection.c	2008-10-25 14:16:55 +0000
-+++ src/connection.c	2008-10-25 14:17:09 +0000
+--- a/src/connection.c
++++ b/src/connection.c
 @@ -109,6 +109,9 @@
  		fatal_internal("unavailable bluez support required");
  #endif
@@ -58,9 +55,8 @@
  		fatal_internal("unknown socket type");
  	}
 
-=== modified file 'src/connection.h'
---- src/connection.h	2008-10-25 14:16:55 +0000
-+++ src/connection.h	2008-10-25 14:17:09 +0000
+--- a/src/connection.h
++++ b/src/connection.h	2008-10-25 14:17:09 +0000
 @@ -31,12 +31,14 @@
  	PROTO_UNSPECIFIED,
  	PROTO_IPv6,
@@ -77,9 +73,8 @@
  	L2CAP_PROTOCOL
  } sock_protocol_t;
 
-=== modified file 'src/network.c'
---- src/network.c	2008-10-25 14:16:55 +0000
-+++ src/network.c	2008-10-25 14:17:09 +0000
+--- a/src/network.c
++++ b/src/network.c
 @@ -23,6 +23,7 @@
  #include "network.h"
  #include "connection.h"
@@ -101,9 +96,8 @@
  	case PROTO_BLUEZ:
  		fd = bluez_connect(&hints,
 
-=== modified file 'src/parser.c'
---- src/parser.c	2008-10-25 14:16:55 +0000
-+++ src/parser.c	2008-10-25 14:17:09 +0000
+--- a/src/parser.c
++++ b/src/parser.c
 @@ -109,7 +109,9 @@
  	{"bluetooth",           no_argument,        NULL, 'b'},
  #define OPT_SCO			24
@@ -209,9 +203,8 @@
  	fprintf(fp, " --continuous           %s\n",
  	              _("Continuously accept connections\n"
 
-=== added file 'src/unixsocket.c'
---- src/unixsocket.c	1970-01-01 00:00:00 +0000
-+++ src/unixsocket.c	2008-10-25 14:17:09 +0000
+--- a/src/unixsocket.c
++++ b/src/unixsocket.c
 @@ -0,0 +1,78 @@
 +/*
 + *  unixsocket.c - address family independant networking functions
@@ -232,7 +225,7 @@
 +#include <unistd.h>
 +#include <limits.h>
 +
-+RCSID("@(#) $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch,v 1.1 2008/10/25 15:33:22 pva Exp $");
++RCSID("@(#) $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch,v 1.2 2014/07/14 21:39:15 jer Exp $");
 +
 +
 +int unixsocket_connect(const struct addrinfo *hints,
@@ -292,9 +285,8 @@
 +}
 +
 
-=== added file 'src/unixsocket.h'
---- src/unixsocket.h	1970-01-01 00:00:00 +0000
-+++ src/unixsocket.h	2008-10-25 14:17:09 +0000
+--- a/src/unixsocket.h
++++ b/src/unixsocket.h
 @@ -0,0 +1,12 @@
 +#ifndef UNIXSOCKET_H
 +#define UNIXSOCKET_H
diff --git a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
index 99725a2ba968..99956a5fc1f6 100644
--- a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
+++ b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r2.ebuild,v 1.13 2013/12/04 03:21:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r2.ebuild,v 1.14 2014/07/14 21:39:15 jer Exp $
 
 EAPI=5
 inherit eutils autotools toolchain-funcs
@@ -15,17 +15,22 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd
 IUSE="ipv6 nls bluetooth"
 
 # need to block netcat as we provide the "nc" file now too
-DEPEND="bluetooth? ( net-wireless/bluez )
-	!net-analyzer/netcat"
-RDEPEND="${DEPEND}"
+DEPEND="
+	bluetooth? ( net-wireless/bluez )
+"
+RDEPEND="
+	${DEPEND}
+	!net-analyzer/netcat
+"
 
 S=${WORKDIR}/nc6-${PV}
 
 DOCS=( AUTHORS BUGS README NEWS TODO CREDITS ChangeLog )
 
 src_prepare() {
-	epatch "${FILESDIR}"/netcat6-1.0-unix-sockets.patch
-	epatch "${FILESDIR}"/${P}-automake-1.14.patch
+	epatch \
+		"${FILESDIR}"/${P}-unix-sockets.patch \
+		"${FILESDIR}"/${P}-automake-1.14.patch
 	AM_OPTS="--force-missing" eautoreconf
 }