Rev bumps as per bug #109331.

(Portage version: 2.0.51.22-r3)

6 files changed, 111 insertions, 14 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index 66d810f3dfe4..3cd3301ca4d0 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/socat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.19 2005/09/25 10:32:24 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.20 2005/10/17 05:58:55 soulse Exp $
+
+*socat-1.4.3.0-r1 (17 Oct 2005)
+*socat-1.4.2.0-r1 (17 Oct 2005)
+
+  17 Oct 2005; <soulse@gentoo.org> +socat-1.4.2.0-r1.ebuild,
+  +socat-1.4.3.0-r1.ebuild:
+  Rev bumps as per bug #109331 thanks to James Rowe <jnrow@ukfsn.org>, new
+  tcp-wrappers depend added as an option.
 
 *socat-1.4.3.0 (25 Sep 2005)
 
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index a5506ff43e81..cf02c7cfa6f0 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d1b1aa21356b5706a6519b35f6cbba3c ChangeLog 2639
-MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 dadb08b3ec55ab84c53735ef8a5b5535 socat-1.4.3.0.ebuild 1264
+MD5 b7a36b9183dd5186902775a2d4bc2cb0 socat-1.4.2.0-r1.ebuild 1096
+MD5 a72dccc57130c017f8c248668c32e868 socat-1.4.3.0-r1.ebuild 1331
 MD5 f3009c0be501848ecefacf09a76b117b socat-1.4.0.3.ebuild 1021
 MD5 7496b06950337734d9a6c273d9ee67b4 socat-1.4.2.0.ebuild 1024
-MD5 dadb08b3ec55ab84c53735ef8a5b5535 socat-1.4.3.0.ebuild 1264
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
 MD5 c69f1c15c04237f76ac1c77d96a70dc0 files/digest-socat-1.4.3.0 66
-MD5 80bc464d7deaff0335540eb32a60c827 files/socat-1.4.3.0-tmp-tail.patch 986
 MD5 6d502092a174c12aa520b1ab3ac8798f files/socat-1.4.3.0-noptytest.patch 2906
+MD5 80bc464d7deaff0335540eb32a60c827 files/socat-1.4.3.0-tmp-tail.patch 986
+MD5 c69f1c15c04237f76ac1c77d96a70dc0 files/digest-socat-1.4.3.0-r1 66
 MD5 3e1450e1811fbf675f8069ed1bbe2a18 files/digest-socat-1.4.0.3 66
 MD5 7e75e101e793cb7f39eddab4eeb0d286 files/digest-socat-1.4.2.0 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDNnzPmdTrptrqvGERAmBAAJ9jbMJfd6w+xYSbbWhhLH3b7E3+QQCdHVBR
-48bqyC/NWlqAu87UoLgK2JQ=
-=50LA
------END PGP SIGNATURE-----
+MD5 7e75e101e793cb7f39eddab4eeb0d286 files/digest-socat-1.4.2.0-r1 66
diff --git a/net-misc/socat/files/digest-socat-1.4.2.0-r1 b/net-misc/socat/files/digest-socat-1.4.2.0-r1
new file mode 100644
index 000000000000..d7b091201c11
--- /dev/null
+++ b/net-misc/socat/files/digest-socat-1.4.2.0-r1
@@ -0,0 +1 @@
+MD5 2ad4aab8eff97ad16e0d2d1be6d3f05b socat-1.4.2.0.tar.bz2 266022
diff --git a/net-misc/socat/files/digest-socat-1.4.3.0-r1 b/net-misc/socat/files/digest-socat-1.4.3.0-r1
new file mode 100644
index 000000000000..5c9a18f142de
--- /dev/null
+++ b/net-misc/socat/files/digest-socat-1.4.3.0-r1
@@ -0,0 +1 @@
+MD5 ce574e75c2fda4456e8efd4efb86ec5e socat-1.4.3.0.tar.bz2 272236
diff --git a/net-misc/socat/socat-1.4.2.0-r1.ebuild b/net-misc/socat/socat-1.4.2.0-r1.ebuild
new file mode 100644
index 000000000000..ccd05951cc00
--- /dev/null
+++ b/net-misc/socat/socat-1.4.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.2.0-r1.ebuild,v 1.1 2005/10/17 05:58:55 soulse Exp $
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
+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)
+	virtual/libc"
+
+S=${WORKDIR}/socat-${PV:0:3}
+
+src_compile() {
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap) \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	make install DESTDIR="${D}" || die
+
+	dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \
+		FAQ FILES PORTING README SECURITY VERSION xio.help
+	docinto examples
+	dodoc *.sh
+	dohtml socat.html
+}
diff --git a/net-misc/socat/socat-1.4.3.0-r1.ebuild b/net-misc/socat/socat-1.4.3.0-r1.ebuild
new file mode 100644
index 000000000000..2563c392cf4e
--- /dev/null
+++ b/net-misc/socat/socat-1.4.3.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.3.0-r1.ebuild,v 1.1 2005/10/17 05:58:55 soulse Exp $
+
+inherit eutils
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+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)
+	virtual/libc"
+
+S=${WORKDIR}/socat-${PV:0:3}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-tmp-tail.patch
+	cp ${S}/test.sh ${S}/test.sh.original
+	epatch ${FILESDIR}/${P}-noptytest.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap) \
+		|| die "econf failed"
+	emake || die
+}
+
+src_test() {
+	TMP=${T} make test || die 'self test failed'
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	make install DESTDIR="${D}" || die
+
+	dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \
+		FAQ FILES PORTING README SECURITY VERSION xio.help
+	docinto examples
+	dodoc *.sh
+	dohtml socat.html
+}