Version bump (bug #330785).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 62 insertions, 5 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index 9955e6496190..9473d73ac442 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/socat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.78 2010/05/21 15:34:49 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.79 2010/08/02 02:37:43 jer Exp $
+
+*socat-2.0.0_beta4 (02 Aug 2010)
+*socat-1.7.1.3 (02 Aug 2010)
+
+  02 Aug 2010; Jeroen Roovers <jer@gentoo.org> +socat-1.7.1.3.ebuild,
+  -socat-2.0.0_beta3.ebuild, +socat-2.0.0_beta4.ebuild:
+  Version bump (bug #330785).
 
   21 May 2010; Peter Volkov <pva@gentoo.org> socat-1.7.1.2.ebuild:
   amd64 stable, bug 312455
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 3cd6de3fdaca..8da0b5d41832 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,6 +1,8 @@
 DIST socat-1.7.1.2.tar.bz2 425139 RMD160 5e28f495b06be516a376c9b8feea4b42d18d5043 SHA1 50e7d3d22c7a363dd7bd354190cef019e9a35ea8 SHA256 f7395b154914bdaa49805603aac2a90fb3d60255f95691d7779ab4680615e167
-DIST socat-2.0.0-b3.tar.bz2 457509 RMD160 9a9f30b426aa557b14e4cf81a03fa22a5d9cd83b SHA1 af4f6764825f276299844e357c6ae29efacfcafc SHA256 5d575cf84067907e44cda6a47dfccc610d3f546b5d00ae5b56ec379450459b5c
+DIST socat-1.7.1.3.tar.bz2 426350 RMD160 091a2fe0206c9f24e6427e7476e78ac53307ffeb SHA1 60ecce880ac424e03b37ae297242b303a2afce39 SHA256 2a14f42e2166e1a9d5413cc7f743f2f3b16e58427c848cd711688568219b7c42
+DIST socat-2.0.0-b4.tar.bz2 459843 RMD160 d9c8cace1ecad8c29a31c71ea205dbb297c8a3ed SHA1 3903e0b1d8bef59e05fbbfa45f25d06a80a49eee SHA256 1272133a0b2aef0045f1b71a2f49194e6fbc37ed5c0d0c683d98b52740dbcd9c
 EBUILD socat-1.7.1.2.ebuild 1212 RMD160 0a8aebe48e6db35300ea5d7b9bd7d8c9b54ac7b5 SHA1 213918898e1d2303b02423b914a37ff69d94c083 SHA256 6a709e9361cf168262aa1f9518d5894928a28fe3922d222dafbe2bd4f8c5c5b8
-EBUILD socat-2.0.0_beta3.ebuild 1223 RMD160 b935fb1987cdba016b64c091393d8ca1f2a82468 SHA1 25f526df895728ac599708812f9884a46193a630 SHA256 4e6c82edb3253dcfdd0752b97d565e1387d02940dd178fdd5516198ac6f946b9
-MISC ChangeLog 10258 RMD160 6951fe0c3a43f1885d141a13c3185fc89d498cd5 SHA1 a45964abeb92ac5fa5d3cc72c29a623610509a4d SHA256 170121336f5dd0075abf6f4bc491989823eca585a698e80950176e9a899fe1f9
+EBUILD socat-1.7.1.3.ebuild 1220 RMD160 b05485f0bf5946f044b5de78b5a6bf3dfd6116e5 SHA1 e026a28ed28a26cca0348361eca3a11ee9de110b SHA256 bdc24db8b598debd411ae15bf9ab6cccafb385181be983d591fe1e29700289aa
+EBUILD socat-2.0.0_beta4.ebuild 1219 RMD160 e2a5ed0c93c11b68acb3226709b88687c68f46c2 SHA1 ad4a24998a8271578fbe89e740fb502bd7715d08 SHA256 19daf6e6a80613c70ce0b1b54fb9912542ae51a6c98baaed2a50057ed8b355b8
+MISC ChangeLog 10478 RMD160 922ece7e4ece4b5da434b2b6ea7b0a0c0b7b7380 SHA1 ea4a4926f035924ce149951303673d36c4e9497a SHA256 0f4aa64c6f6a4e22128c0199515bfcc876ccece5c30848cf0e8a500f744b7e4d
 MISC metadata.xml 224 RMD160 b56e021883688e595b915158a146fb864ef06901 SHA1 68bcf1730fb34e19e6834e2d5390dbd55e4a35de SHA256 214e401ffbfe4cfffdcd14ceda3a264a79df771601a668da0e59c51cb91740dc
diff --git a/net-misc/socat/socat-1.7.1.3.ebuild b/net-misc/socat/socat-1.7.1.3.ebuild
new file mode 100644
index 000000000000..8948e9ce80ac
--- /dev/null
+++ b/net-misc/socat/socat-1.7.1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.1.3.ebuild,v 1.1 2010/08/02 02:37:43 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+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"
+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_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 || die 'self test failed'
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	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_beta3.ebuild b/net-misc/socat/socat-2.0.0_beta4.ebuild
index b04b056eb4c0..05769fa1ebc1 100644
--- a/net-misc/socat/socat-2.0.0_beta3.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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_beta3.ebuild,v 1.5 2010/04/24 19:09:14 grobian Exp $
+# $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 $
 
 EAPI="2"