version bump and uclibc patch from bug #70974

8 files changed, 199 insertions, 11 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index b31647ec64e9..e4851fb501a5 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,15 @@
 # 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.23 2004/11/02 09:07:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.24 2004/11/16 13:07:26 dragonheart Exp $
+
+*wvstreams-3.75-r1 (16 Nov 2004)
+*wvstreams-4.0 (16 Nov 2004)
+
+  16 Nov 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/wvcrash-uclibc-gentoo.patch, +files/wvstreams-4.0-tcl_8_4.patch,
+  +wvstreams-3.75-r1.ebuild, +wvstreams-4.0.ebuild:
+  version bump and uclibc patch from bug #70974. Thanks to Yuri Vasilevski
+  <yvasilev@duke.math.cinvestav.mx> for the patch
 
   02 Nov 2004; Daniel Black <dragonheart@gentoo.org> wvstreams-3.75.ebuild:
   Dependancy change of speex to speex? (media-libs/speex
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 298f3e57f0ea..e6e6de18be06 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,10 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 15dbfb8249d439c9560fa0d2f42d6d4c ChangeLog 3603
 MD5 84906df12ff06c74e269a55f292f09ac wvstreams-3.70-r2.ebuild 869
 MD5 d991640e2ff373e482b3c3478282fef1 wvstreams-3.74.ebuild 1392
 MD5 76eee65ed9ee7babf51f46e167d82bc1 wvstreams-3.75.ebuild 1736
+MD5 0ea79ac6936936c578e178c6b175151e wvstreams-4.0.ebuild 1611
+MD5 8bde748729524d43889d0e78be169b72 wvstreams-3.75-r1.ebuild 1760
 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
@@ -17,10 +16,7 @@ MD5 e088c237ee63897e074e0f92e66fc250 files/wvstreams-3.75-fPIC.patch 1522
 MD5 c48022170e1e20f8222af4b4711373eb files/wvstreams-3.75-makefile.patch 363
 MD5 7a2a3fb9116991ebccad327a9ad0fd87 files/wvstreams-3.75-tcl_8_4.patch 945
 MD5 e4f46fcdd724dc1c316aefe9e0228dac files/wvstreams-3.75-gcc34.patch 3573
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBh05RmdTrptrqvGERAtBaAJ9r62VIp4G4oGwNk9PbmiMdT6xkNgCeMoZg
-r4jLRpmFHii7mIVGBq26zPE=
-=RjxV
------END PGP SIGNATURE-----
+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 9f5fc56a6f1636fa2b6673a16888c0ea files/digest-wvstreams-3.75-r1 68
diff --git a/net-libs/wvstreams/files/digest-wvstreams-3.75-r1 b/net-libs/wvstreams/files/digest-wvstreams-3.75-r1
new file mode 100644
index 000000000000..d368057d0506
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-3.75-r1
@@ -0,0 +1 @@
+MD5 8682997d2494c7defbe9b211067635b2 wvstreams-3.75.0.tar.gz 526295
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0 b/net-libs/wvstreams/files/digest-wvstreams-4.0
new file mode 100644
index 000000000000..933c88500731
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.0
@@ -0,0 +1 @@
+MD5 f2b282248b53653d7531cc4b3e33c77b wvstreams-4.0.tar.gz 3004311
diff --git a/net-libs/wvstreams/files/wvcrash-uclibc-gentoo.patch b/net-libs/wvstreams/files/wvcrash-uclibc-gentoo.patch
new file mode 100644
index 000000000000..c111a03d00c5
--- /dev/null
+++ b/net-libs/wvstreams/files/wvcrash-uclibc-gentoo.patch
@@ -0,0 +1,13 @@
+--- utils/wvcrash.cc.orig	2004-11-12 10:32:07 -0600
++++ utils/wvcrash.cc	2004-11-12 10:34:34 -0600
+@@ -10,8 +10,8 @@
+ #include <fcntl.h>
+ #include <string.h>
+ 
+-// FIXME: this file mostly only works in Linux
+-#ifdef __linux
++// FIXME: this file mostly only works in Linux and without uclibc
++#if defined(__linux) && !defined(__UCLIBC__)
+ 
+ # include <execinfo.h>
+ #include <unistd.h>
diff --git a/net-libs/wvstreams/files/wvstreams-4.0-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.0-tcl_8_4.patch
new file mode 100644
index 000000000000..45999744abea
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0-tcl_8_4.patch
@@ -0,0 +1,22 @@
+--- vars.mk.orig	2004-10-14 01:09:50.000000000 +0930
++++ vars.mk	2004-11-16 22:11:28.073880504 +0930
+@@ -250,3 +250,5 @@
+ 
+ libwvgtk.a libwvgtk.so: $(call objects,gtk)
+ libwvgtk.so: -lgtk -lgdk libwvstreams.so libwvutils.so
++
++libuniconf_tcl.so: bindings/uniconf_tcl.o -ltcl8.4 -luniconf
+--- configure.ac.orig	2004-10-14 01:09:50.000000000 +0930
++++ configure.ac	2004-11-16 22:13:36.588343336 +0930
+@@ -269,9 +269,9 @@
+ # tcl
+ if test "$with_tcl" != "no"; then
+     CPPFLAGS_save="$CPPFLAGS"
+-    WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)
++    WV_APPEND(CPPFLAGS, -I/usr/include)
+     AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])
+-    AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no])
++    AC_CHECK_LIB(tcl8.4, TclInterpInit,, [with_tcl=no])
+     if test "$with_tcl" != "no"; then
+         CPPFLAGS="$CPPFLAGS_save"
+     fi
diff --git a/net-libs/wvstreams/wvstreams-3.75-r1.ebuild b/net-libs/wvstreams/wvstreams-3.75-r1.ebuild
new file mode 100644
index 000000000000..13d446ef107a
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-3.75-r1.ebuild
@@ -0,0 +1,78 @@
+# 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-3.75-r1.ebuild,v 1.1 2004/11/16 13:07:26 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
+SRC_URI="http://people.nit.ca/~jim/${P}.0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc -alpha ~amd64 -hppa ~ppc"
+IUSE="gtk qt oggvorbis speex fam gdbm pam fftw tcltk uclibc"
+
+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? ( >=app-admin/fam-2.7.0 )
+	>=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
+	tcltk? ( >=dev-lang/tcl-8.4*
+		>=sys-devel/autoconf-2.59 )"
+
+S=${WORKDIR}/${P}.0
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+
+	#gcc-3.4 fix
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	use uclibc && epatch ${FILESDIR}/wvcrash-uclibc-gentoo.patch
+
+	if useq tcltk;
+	then
+		epatch ${FILESDIR}/${P}-tcl_8_4.patch
+		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 || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}
diff --git a/net-libs/wvstreams/wvstreams-4.0.ebuild b/net-libs/wvstreams/wvstreams-4.0.ebuild
new file mode 100644
index 000000000000..2f2a1be4df74
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.0.ebuild
@@ -0,0 +1,68 @@
+# 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.1 2004/11/16 13:07:26 dragonheart 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? ( >=app-admin/fam-2.7.0 )
+	>=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
+	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 || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}