stable on x86

5 files changed, 12 insertions, 80 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 811812941b7b..46f3ead310de 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.29 2004/12/08 17:15:45 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.30 2004/12/18 19:06:30 mrness Exp $
+
+  18 Dec 2004; Alin Nastac <mrness@gentoo.org> wvstreams-4.0-r1.ebuild,
+  -wvstreams-4.0.ebuild:
+  Stable on x86.
 
 *wvstreams-4.0-r1 (08 Dec 2004)
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 525332ca2a66..02351f71ba82 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,14 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 376e22bdc309c1f7bbc0c10ce5e83d1b ChangeLog 4653
+MD5 8906358158c3c44d8ba78c7624a393de ChangeLog 4768
 MD5 84906df12ff06c74e269a55f292f09ac wvstreams-3.70-r2.ebuild 869
 MD5 d991640e2ff373e482b3c3478282fef1 wvstreams-3.74.ebuild 1392
 MD5 76eee65ed9ee7babf51f46e167d82bc1 wvstreams-3.75.ebuild 1736
 MD5 4ac90373143f90a1bddea60711f40568 wvstreams-3.75-r1.ebuild 1808
-MD5 32456871fa203363eaa06cf51c12ada1 wvstreams-4.0.ebuild 1654
 MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
-MD5 8f849e28195d787356978ee7de4161ff wvstreams-4.0-r1.ebuild 1874
+MD5 8faccdcb826718ded058cfad8e014cce wvstreams-4.0-r1.ebuild 1873
 MD5 dab468062cf36e0e81e72fb2a59299e0 files/3.70-gcc3.patch 3171
 MD5 5d649f23e7b31fb9224bace4c35bcf3e files/3.70-openssl.patch 470
 MD5 f2058097f693e07dadf248b1a3319db3 files/digest-wvstreams-3.70-r2 66
@@ -22,14 +21,13 @@ MD5 e4f46fcdd724dc1c316aefe9e0228dac files/wvstreams-3.75-gcc34.patch 3573
 MD5 c48022170e1e20f8222af4b4711373eb files/wvstreams-3.75-makefile.patch 363
 MD5 7a2a3fb9116991ebccad327a9ad0fd87 files/wvstreams-3.75-tcl_8_4.patch 945
 MD5 9f5fc56a6f1636fa2b6673a16888c0ea files/digest-wvstreams-3.75-r1 68
-MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0 66
 MD5 4c60e22939d4518a795262edf85e5bf3 files/wvcrash-uclibc-gentoo.patch 384
 MD5 f606f86f5ef7d07937128fc8dc043c83 files/wvstreams-4.0-tcl_8_4.patch 822
 MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBt0QMjtv59x0+BrURArc6AKD8jBU7ViCsPbXNAqvdBJO6iJ84TQCgoP+d
-IeuzqfMmcKFqWYFl9rWtZ/I=
-=Ej5d
+iD8DBQFBxH/Fjtv59x0+BrURAoQnAKC3kXaH6dxBDUJbu7kZjs4D0+DFcgCgrL9C
+NuXZeLHAoTQ2M18vPPjsVOw=
+=7U67
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0 b/net-libs/wvstreams/files/digest-wvstreams-4.0
deleted file mode 100644
index 933c88500731..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2b282248b53653d7531cc4b3e33c77b wvstreams-4.0.tar.gz 3004311
diff --git a/net-libs/wvstreams/wvstreams-4.0-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0-r1.ebuild
index 7b11d6d7fa7c..5b6d9b598c8a 100644
--- a/net-libs/wvstreams/wvstreams-4.0-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0-r1.ebuild,v 1.2 2004/12/08 18:12:18 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0-r1.ebuild,v 1.3 2004/12/18 19:06:30 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~hppa ~ppc"
+KEYWORDS="x86 ~sparc ~alpha ~amd64 ~hppa ~ppc"
 IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk"
 
 RDEPEND="virtual/libc
diff --git a/net-libs/wvstreams/wvstreams-4.0.ebuild b/net-libs/wvstreams/wvstreams-4.0.ebuild
deleted file mode 100644
index e1a5ee5a62e5..000000000000
--- a/net-libs/wvstreams/wvstreams-4.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.ebuild,v 1.5 2004/11/30 06:27:28 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
-SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~hppa ~ppc"
-IUSE="gtk qt oggvorbis speex fam gdbm pam fftw tcltk"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2.2.0 )
-	qt? ( >=x11-libs/qt-3.0.5 )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
-	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
-	fam? ( virtual/fam )
-	>=sys-libs/db-3
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	pam? ( >=sys-libs/pam-0.75 )
-	>=sys-libs/zlib-1.1.4
-	dev-libs/openssl
-	fftw? ( dev-libs/fftw )
-	tcltk? ( dev-lang/tcl
-		dev-lang/swig )"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	tcltk? ( >=dev-lang/tcl-8.4*
-		>=sys-devel/autoconf-2.59 )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	if useq tcltk
-	then
-		epatch ${FILESDIR}/${P}-tcl_8_4.patch
-		env WANT_AUTOCONF=2.59 autoconf || die
-	fi
-}
-
-src_compile() {
-	econf `use_with gtk` \
-		`use_with qt` \
-		`use_with oggvorbis ogg` \
-		`use_with oggvorbis vorbis` \
-		`use_with fam` \
-		`use_with gdbm` \
-		`use_with pam` \
-		`use_with qt` \
-		`use_with speex` \
-		`use_with fftw` \
-		`use_with tcltk tcl` \
-		--enable-verbose \
-		--with-bdb \
-		--with-openssl \
-		--with-zlib \
-		|| die
-	make CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}