Version bump (bug #415977).

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 78 insertions, 6 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index 407ac3e62898..68baca97e898 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/socat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.94 2012/03/07 04:09:45 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.95 2012/05/14 19:02:53 jer Exp $
+
+*socat-2.0.0_beta5 (14 May 2012)
+*socat-1.7.2.1 (14 May 2012)
+
+  14 May 2012; Jeroen Roovers <jer@gentoo.org> +socat-1.7.2.1.ebuild,
+  -socat-2.0.0_beta4.ebuild, +socat-2.0.0_beta5.ebuild:
+  Version bump (bug #415977).
 
   07 Mar 2012; Jeremy Olexa <darkside@gentoo.org> socat-1.7.2.0.ebuild:
   add ~x64-macos, bug 395011
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 212d3217e295..12842522c2b0 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX socat-1.7.2.0-cross-compile.patch 2321 RMD160 4e900f49c5905b55d6756cfc7faa03dac7164920 SHA1 09204a144b46b8534683d37dc9d831fe21bdc33e SHA256 bd20d76cafd71308e3f89d05fc4292964241c5a53cf0eecc5a4e0cb7414da8c5
 DIST socat-1.7.2.0.tar.bz2 432031 RMD160 d885323b57d08e7a85bc36bda82f3ba303a8ed14 SHA1 7ce5e71c7ac8b101ac15593eda10da3cfa0afbac SHA256 59b3bde927c14fbc3f9e42c782971710da8a89bbf46f7531f09a681754041802
-DIST socat-2.0.0-b4.tar.bz2 459843 RMD160 d9c8cace1ecad8c29a31c71ea205dbb297c8a3ed SHA1 3903e0b1d8bef59e05fbbfa45f25d06a80a49eee SHA256 1272133a0b2aef0045f1b71a2f49194e6fbc37ed5c0d0c683d98b52740dbcd9c
+DIST socat-1.7.2.1.tar.bz2 433321 RMD160 0685d8f370a4130ea2952fb839eab7210e5b144c SHA1 c48cbba5e4d20fcf04b327e40d878b7322be82fd SHA256 faea2ed6c63bb97a59237fd43b7c35ad248317297e8bfeb2e6f2ec1e6bc58277
+DIST socat-2.0.0-b5.tar.bz2 460499 RMD160 3c38f64ad05132c8b981259101c8e80e7afc9ca5 SHA1 2fd4ad2ca43011be315b143884ddc6d8f63b3cab SHA256 e6b90f658f92f3af8066e9e5fbde1fc0169e0b9f151259ff3acafc02bacae5a7
 EBUILD socat-1.7.2.0.ebuild 1261 RMD160 1ec1e955ff003c24d9c86e78b0bf57b097ef5dd5 SHA1 6d5268e958e0237b613cb03eedd46dd108c9f7ef SHA256 686aacc521524cc34dfe4db17df7556bd0b36885291d536476a55a04f775a6fe
-EBUILD socat-2.0.0_beta4.ebuild 1219 RMD160 e2a5ed0c93c11b68acb3226709b88687c68f46c2 SHA1 ad4a24998a8271578fbe89e740fb502bd7715d08 SHA256 19daf6e6a80613c70ce0b1b54fb9912542ae51a6c98baaed2a50057ed8b355b8
-MISC ChangeLog 12332 RMD160 13f2450d9c3060267168a1b6582a6f5263d0a7ee SHA1 2088a85a81b3b9c2fd5a70fc3bdc607a79c74203 SHA256 dc4d14a960224b94be6a6239fe57b3ac0029c2a26bd52a8c496c56c6306637a5
+EBUILD socat-1.7.2.1.ebuild 1273 RMD160 3ef471c7d3fd2557661e24afad50552f72cf6ef7 SHA1 85778c7111c6cba07bf7ddceb4321052c7da3ff5 SHA256 15f378e2db21514f55e0f774c6dbe9153b3dbadefe222fdce93d8459bb2cf4ee
+EBUILD socat-2.0.0_beta5.ebuild 1219 RMD160 757877eb7323ecac17ae5e344f41b3f82445bb89 SHA1 21169d314313bc368788766bd2b8d8663c44dac7 SHA256 f5c57a33f85850f8aea0018c831bc01d37c1f10500bff9203fbb73d4b2b969f0
+MISC ChangeLog 12547 RMD160 115ed99ae66df9b7e0ee8450f595176d270bd4f7 SHA1 5a6cb655eb19b0fa3df69bb9b66311e06e520ec1 SHA256 c074424d2ad7ec21ea94b59010dd21ffb9f46f79aa601a8cdd3e85f712bdc3a4
 MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk+xVuIACgkQVWmRsqeSphPoSgCcDmgUY1UOul9gqWkXGGfvM9WG
+jusAniRAxzTxAwD4NhDHuLN+eSSV6LYj
+=Abdi
+-----END PGP SIGNATURE-----
diff --git a/net-misc/socat/socat-1.7.2.1.ebuild b/net-misc/socat/socat-1.7.2.1.ebuild
new file mode 100644
index 000000000000..44a1dc00851a
--- /dev/null
+++ b/net-misc/socat/socat-1.7.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.1.ebuild,v 1.1 2012/05/14 19:02:53 jer Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.2.0-cross-compile.patch
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -Wno-error*
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_test() {
+	TMPDIR="${T}" emake test
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	dodoc BUGREPORTS CHANGES DEVELOPMENT \
+		FAQ FILES PORTING README SECURITY VERSION
+	docinto examples
+	dodoc EXAMPLES *.sh
+	dohtml doc/*.html doc/*.css
+}
diff --git a/net-misc/socat/socat-2.0.0_beta4.ebuild b/net-misc/socat/socat-2.0.0_beta5.ebuild
index 05769fa1ebc1..4f99bdfd0469 100644
--- a/net-misc/socat/socat-2.0.0_beta4.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta5.ebuild
@@ -1,6 +1,6 @@
-# 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/socat/socat-2.0.0_beta4.ebuild,v 1.1 2010/08/02 02:37:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-2.0.0_beta5.ebuild,v 1.1 2012/05/14 19:02:53 jer Exp $
 
 EAPI="2"