Version bump (bug #499668).

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 68 insertions, 5 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index 819a893ffa5b..8cbbb08b5a15 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/socat
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.119 2013/06/09 14:45:21 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.120 2014/01/29 10:25:32 jer Exp $
+
+*socat-2.0.0_beta7 (29 Jan 2014)
+*socat-1.7.2.3 (29 Jan 2014)
+
+  29 Jan 2014; Jeroen Roovers <jer@gentoo.org> +socat-1.7.2.3.ebuild,
+  -socat-2.0.0_beta6.ebuild, +socat-2.0.0_beta7.ebuild:
+  Version bump (bug #499668).
 
   09 Jun 2013; Jeroen Roovers <jer@gentoo.org> -socat-1.7.2.1.ebuild:
   Old.
diff --git a/net-misc/socat/socat-1.7.2.3.ebuild b/net-misc/socat/socat-1.7.2.3.ebuild
new file mode 100644
index 000000000000..9bcc233d633a
--- /dev/null
+++ b/net-misc/socat/socat-1.7.2.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 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.3.ebuild,v 1.1 2014/01/29 10:25:32 jer Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools toolchain-funcs
+
+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 ~x86-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.1-long-long.patch #436164
+	sed -i test.sh -e "s|/sbin/ifconfig|$(type -P ifconfig)|g" || die
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_test() {
+	TMPDIR="${T}" emake test
+}
+
+src_install() {
+	default
+
+	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_beta6.ebuild b/net-misc/socat/socat-2.0.0_beta7.ebuild
index 0074d669376c..1ff6642679d2 100644
--- a/net-misc/socat/socat-2.0.0_beta6.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta7.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-misc/socat/socat-2.0.0_beta6.ebuild,v 1.2 2013/05/27 12:07:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-2.0.0_beta7.ebuild,v 1.1 2014/01/29 10:25:32 jer Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ 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"
+KEYWORDS=""
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.7.2.1-long-long.patch #436164
+	sed -i -e "s|/sbin/ifconfig|$(type -P ifconfig)|g" test.sh || die
 	touch doc/${PN}.1 || die
 }