Version bump, removed old.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

6 files changed, 70 insertions, 93 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index 8017fcdcccb8..f42e22dda309 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/socat
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.37 2008/06/17 06:36:29 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.38 2008/11/16 17:04:19 pva Exp $
+
+*socat-2.0.0_beta2 (16 Nov 2008)
+*socat-1.7.0.0 (16 Nov 2008)
+
+  16 Nov 2008; Peter Volkov <pva@gentoo.org> -socat-1.4.0.3.ebuild,
+  -socat-1.4.2.0.ebuild, -socat-1.4.2.0-r1.ebuild, +socat-1.7.0.0.ebuild,
+  +socat-2.0.0_beta2.ebuild:
+  Version bump, removed old.
 
   16 Jun 2008; Stephanie Lockwood-Childs <wormo@gentoo.org>
   socat-1.6.0.1.ebuild:
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 6d4e68364dda..826a28369b14 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,14 +1,13 @@
 AUX socat-1.6.0.0-noptytest.patch 3103 RMD160 2dce43dcb4c886350a086ba55ed6c64e6ad5cead SHA1 17c02371e6d469f7af1809aec4b3efb51ea89504 SHA256 a84e22ec4f08917ed278a569319d2b2c45b642e8336baa74c0053922f3ec65c2
-DIST socat-1.4.0.3.tar.bz2 255824 RMD160 58f2c740c436c49156810a88d51d3c8e8fbf93b3 SHA1 9798a284fcdc314ad3293bbe358ea7e60fbb9ca7 SHA256 ac93fd482c561864bbe57facb8f88015bae6b71b37d03a0cd8a5616486442b12
-DIST socat-1.4.2.0.tar.bz2 266022 RMD160 08d5f57affadbdbbe823fb0430a209f03f40ace9 SHA1 a726993fa3ecf65b72d008dc926b47168f7ff0c0 SHA256 deace56a2ffff60ee61df7c205c02c0da95f6756be2fa5cdcb731df912839ed9
 DIST socat-1.6.0.0.tar.bz2 343285 RMD160 cf92590f2799cc876ddbc7c28e152f5d1feb2bb0 SHA1 fc35e11e4daf6862daaca498ee117d89f18aaf33 SHA256 157090b94ab616eac5598bc246c7a3f8c5867ecbdf31c7c2c1c364c7bf8a01c8
 DIST socat-1.6.0.1.tar.bz2 375527 RMD160 f2769a1f60c1dcc5a6d66570dc7afc5d5e1c7659 SHA1 9bb850817d41b7628fc0a79c113581c413166530 SHA256 0d1ba82db0f735bf5006844b197ec5c980965980adceb6d1ef722f9b819b87b2
+DIST socat-1.7.0.0.tar.bz2 418842 RMD160 7792dea2a9fe65537de62553d8e7f8690447008f SHA1 6bb42bcb9a1d373ca254717e63ef901442e2ab5d SHA256 827c8ccd508ad12c999208d42867ec8334e39a425d3984eda78a34449d414f25
 DIST socat-2.0.0-b1.tar.bz2 325120 RMD160 0d8da4cb2fc0e6d041ff114beb24e2d63251748c SHA1 1c4490bb8e69c43591bea09b157c109b092f711a SHA256 d311e2d9295236778302095e19aaf6fb2538753e28cd313208944521b82b6d79
-EBUILD socat-1.4.0.3.ebuild 1021 RMD160 ba66ce48dda68a743dde04dc81e2eae88c79ded2 SHA1 496098c96047ef19aacccb9aa296fb9a755ee0ff SHA256 93734a8f802945bcb8cbe2d81dcc5eadd9767244cce18dd5c2e1c169c4c9cd89
-EBUILD socat-1.4.2.0-r1.ebuild 1094 RMD160 d04366abd4af5755edb51edefd27b85434f051f8 SHA1 c91a528a43a2b028e449eaedbd8ca693fa154fd4 SHA256 4917a0e165f62a41d350861542f8b50ae0d62c1d7a3b125db781ab1c8f8ac4e6
-EBUILD socat-1.4.2.0.ebuild 1024 RMD160 5f18c6a078360badfbddc761d6eab35992d1a301 SHA1 1cf0726e42904def93d68c28bafeb62a9a89d4b6 SHA256 70265ccbff3a2fec949a040fde5d6a68c5bffe76331e36b929990275855ac10a
+DIST socat-2.0.0-b2.tar.bz2 442439 RMD160 6ba708faa1c634836dd128a700f7ab8f263eb1a1 SHA1 449e5f07db60df71110041750e3cfea96333dba1 SHA256 50b3cf53d639996e939a4741f8ad25f7f6ed1ad05d612f079a4c1fb725971089
 EBUILD socat-1.6.0.0.ebuild 1257 RMD160 6a68176735d00c2aea4659b7a5d12631568910ca SHA1 4042ae66251a44597925a9cf5b3699529cb2fbcf SHA256 158cb119aa483787f8dd3708a2f6a8e9d0c5e3187ce32af929a8ab1beed867d1
 EBUILD socat-1.6.0.1.ebuild 1142 RMD160 c496ef5c3926b08ea1b93587bfd77f63f5aa79a9 SHA1 1bc7a796a70bed036acc2df5378303b279ec791d SHA256 4195ed63b8581ce13284047ba7b479e8f836f0794b668f21f3f1359feb91a935
+EBUILD socat-1.7.0.0.ebuild 1078 RMD160 a01f9938024dca940e099ab6a7c34f41154eec24 SHA1 3a0dd084128a3ea066fd668400491dc3660db740 SHA256 bdfe9c57305de09fdcb84ce5856756fb5a885c7e464c0470bc05a6e3a3252f0a
 EBUILD socat-2.0.0_beta1.ebuild 1165 RMD160 4ad1f29049f8249547d16ad3b93d7eba7d5f944f SHA1 1ffa864e9047c296fa72bc3f60c1c67c31bab493 SHA256 7a5dff1af59c5680434c197a94d3e47fc12c464a277057fc919c3c27441ad84d
-MISC ChangeLog 5015 RMD160 4a063b23bda2357aaf148733d2a75e05773f29d4 SHA1 d9997a14a08fbc521a252ba273c5e2a6408afc3d SHA256 f4b72cb430dbbae5f8c0ca1c649b24425662415283b8b379acd2d1a9fed74aed
+EBUILD socat-2.0.0_beta2.ebuild 1137 RMD160 3786b171704b37b79dd2b165c5989e7a6a828fe5 SHA1 bb84a445ff546e13ab45a38e198c29885117394b SHA256 546d92f5cee6d2ffc42c35a4e120a57ba94b2dd4a3f71ea3a37f6ae3a5462f6d
+MISC ChangeLog 5277 RMD160 3475937d02077d4ec9773f7c1cb453449cf0066d SHA1 6ce0d2aff14c9a6bc39a65bc2ca7e1cf021ca30f SHA256 cd939807f57ef790d6cf6d367bee06fe734d39335c5600a885af6f69c644d236
 MISC metadata.xml 224 RMD160 b56e021883688e595b915158a146fb864ef06901 SHA1 68bcf1730fb34e19e6834e2d5390dbd55e4a35de SHA256 214e401ffbfe4cfffdcd14ceda3a264a79df771601a668da0e59c51cb91740dc
diff --git a/net-misc/socat/socat-1.4.0.3.ebuild b/net-misc/socat/socat-1.4.0.3.ebuild
deleted file mode 100644
index c92c9000d7bc..000000000000
--- a/net-misc/socat/socat-1.4.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.0.3.ebuild,v 1.2 2005/03/21 23:10:19 chriswhite 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 mips ppc sparc x86"
-IUSE="ssl readline ipv6"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	virtual/libc"
-
-S=${WORKDIR}/socat-${PV:0:3}
-
-src_compile() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		|| 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.2.0.ebuild b/net-misc/socat/socat-1.4.2.0.ebuild
deleted file mode 100644
index 93f9105e150d..000000000000
--- a/net-misc/socat/socat-1.4.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.ebuild,v 1.4 2005/08/13 23:28:37 hansmi 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"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	virtual/libc"
-
-S=${WORKDIR}/socat-${PV:0:3}
-
-src_compile() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		|| 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.2.0-r1.ebuild b/net-misc/socat/socat-1.7.0.0.ebuild
index fa025760f1ce..e10c43a6b0e3 100644
--- a/net-misc/socat/socat-1.4.2.0-r1.ebuild
+++ b/net-misc/socat/socat-1.7.0.0.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.8 2006/02/07 20:52:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.0.0.ebuild,v 1.1 2008/11/16 17:04:19 pva 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"
+SRC_URI="http://www.dest-unreach.org/socat/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
@@ -16,24 +18,24 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
 	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"
+		$(use_enable tcpd libwrap)
 	emake || die
 }
 
+src_test() {
+	TMPDIR="${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
+		FAQ FILES PORTING README SECURITY VERSION
 	docinto examples
 	dodoc *.sh
 	dohtml socat.html
diff --git a/net-misc/socat/socat-2.0.0_beta2.ebuild b/net-misc/socat/socat-2.0.0_beta2.ebuild
new file mode 100644
index 000000000000..0b4868b5cece
--- /dev/null
+++ b/net-misc/socat/socat-2.0.0_beta2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 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_beta2.ebuild,v 1.1 2008/11/16 17:04:19 pva Exp $
+
+inherit eutils
+
+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 ~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"
+
+src_compile() {
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+	emake || die
+}
+
+src_test() {
+	TMPDIR="${T}" make test || die 'self test failed'
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \
+		FAQ FILES PORTING README SECURITY VERSION
+	docinto examples
+	dodoc *.sh
+	dohtml doc/*.html doc/*.css
+}