version bump; this version no longer supports gtk, fam, oggvorbis, speex and fftw

(Portage version: 2.0.51.22-r3)

7 files changed, 138 insertions, 0 deletions

diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.1 b/net-libs/wvstreams/files/digest-wvstreams-4.2.1
new file mode 100644
index 000000000000..18183f172212
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.2.1
@@ -0,0 +1 @@
+MD5 e65127cdbbb8a9216a400e2cbceba4be wvstreams-4.2.1.tar.gz 9516958
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-MOC-fix.patch
new file mode 100644
index 000000000000..cafa309d9cf3
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.1-MOC-fix.patch
@@ -0,0 +1,12 @@
+diff -Nru wvstreams-4.2.1.orig/wvrules.mk wvstreams-4.2.1/wvrules.mk
+--- wvstreams-4.2.1.orig/wvrules.mk	2005-11-17 22:45:09.000000000 +0200
++++ wvstreams-4.2.1/wvrules.mk	2005-12-24 10:31:41.346777500 +0200
+@@ -296,7 +296,7 @@
+ %.E: %.cc;	$(call wvcxx,$@,$<,$*,,-E)
+ %.E: %.cpp;	$(call wvcxx,$@,$<,$*,,-E)
+ 
+-%.moc: %.h;	moc -o $@ $<
++%.moc: %.h;	$(MOC) -o $@ $<
+ 
+ %: %.o;		$(call wvlink,$@,$^) 
+ %.t: %.t.o;	$(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST))
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-external-xplc.patch
new file mode 100644
index 000000000000..adfeba630c17
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.1-external-xplc.patch
@@ -0,0 +1,36 @@
+diff -Nru wvstreams-4.2.1.orig/configure.ac wvstreams-4.2.1/configure.ac
+--- wvstreams-4.2.1.orig/configure.ac	2005-12-24 16:25:39.000000000 +0200
++++ wvstreams-4.2.1/configure.ac	2005-12-24 16:35:40.746173500 +0200
+@@ -539,7 +539,6 @@
+ 
+ # xplc
+ if test "$with_xplc" != "no"; then
+-    if test "$with_xplc" = ""; then
+ 	if pkg-config --modversion xplc-${xplc_version}; then
+             WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`])
+ 	    WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`])
+@@ -551,15 +550,6 @@
+ 	else
+ 	    with_xplc='no'
+ 	fi
+-    else
+-        WV_APPEND(CPPFLAGS, [-I$with_xplc/include])
+-	WV_APPEND(LDFLAGS, [-L$with_xplc])
+-	AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
+-	LIBS_save="$LIBS"
+-	AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
+-	LIBS="$LIBS_save"
+-	xplc_pc="xplc-${xplc_version}"
+-    fi
+     # What if we can't find it?
+     if test "$with_xplc" = "no" && test -d xplc; then
+         WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include])
+@@ -567,7 +557,7 @@
+         AC_CONFIG_SUBDIRS(xplc)
+         build_xplc=yes
+         with_xplc='$(WVSTREAMS)/xplc'
+-	xplc_pc='wvxplc'
++        xplc_pc='wvxplc'
+     fi
+ fi
+ 
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch
new file mode 100644
index 000000000000..673343d99710
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch
@@ -0,0 +1,12 @@
+diff -Nru wvstreams-4.2.1.orig/include/wvhttppool.h wvstreams-4.2.1/include/wvhttppool.h
+--- wvstreams-4.2.1.orig/include/wvhttppool.h	2005-11-17 22:45:04.000000000 +0200
++++ wvstreams-4.2.1/include/wvhttppool.h	2005-12-24 09:52:24.069752500 +0200
+@@ -57,7 +57,7 @@
+     WvString linkname;
+     WvUrl url;
+ 
+-    WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url)
++    WvUrlLink(WvStringParm _linkname, WvStringParm _url)
+ 	: linkname(_linkname), url(_url)
+     {}
+ };
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-linux-serial.patch
new file mode 100644
index 000000000000..025f3635d5c7
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.1-linux-serial.patch
@@ -0,0 +1,42 @@
+diff -Nru wvstreams-4.2.1.orig/streams/wvmodem.cc wvstreams-4.2.1/streams/wvmodem.cc
+--- wvstreams-4.2.1.orig/streams/wvmodem.cc	2005-11-17 22:45:09.000000000 +0200
++++ wvstreams-4.2.1/streams/wvmodem.cc	2005-12-24 10:00:36.990262500 +0200
+@@ -192,22 +192,22 @@
+     drain();
+     
+ #if HAVE_LINUX_SERIAL_H
+-    struct serial_struct old_sinfo, sinfo;
+-    sinfo.reserved_char[0] = 0;
+-    if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
+-	log("Cannot get information for serial port.");
+-    else
+-    {
+-	sinfo = old_sinfo;
+-	// Why there are two closing wait timeouts, is beyond me
+-	// but there are... apparently the second one is deprecated
+-	// but why take a chance...
+-	sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
+-	sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
+-
+-	if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
+-	    log("Cannot set information for serial port.");
+-    }
++ 	if (getuid() == 0)
++ 	{
++     	struct serial_struct sinfo;
++     	if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
++     	{
++     		// Why there are two closing wait timeouts, is beyond me
++     		// but there are... apparently the second one is deprecated
++     		// but why take a chance...
++     		sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
++     		sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
++ 
++     		//Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...) 
++			//see http://bugs.gentoo.org/show_bug.cgi?id=85754
++			ioctl(getrfd(), TIOCSSERIAL, &sinfo); 
++ 		}
++ 	}
+ #endif
+ 
+     // set up the terminal characteristics.
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-tcl_8_4.patch
new file mode 100644
index 000000000000..a9d952ee1883
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.1-tcl_8_4.patch
@@ -0,0 +1,24 @@
+diff -Nru wvstreams-4.2.1.orig/configure.ac wvstreams-4.2.1/configure.ac
+--- wvstreams-4.2.1.orig/configure.ac	2005-11-18 21:02:30.000000000 +0200
++++ wvstreams-4.2.1/configure.ac	2005-12-24 10:21:53.526041000 +0200
+@@ -480,9 +480,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 -Nru wvstreams-4.2.1.orig/vars.mk wvstreams-4.2.1/vars.mk
+--- wvstreams-4.2.1.orig/vars.mk	2005-11-17 22:45:09.000000000 +0200
++++ wvstreams-4.2.1/vars.mk	2005-12-24 10:21:53.526041000 +0200
+@@ -234,3 +234,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
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-wireless-user.patch
new file mode 100644
index 000000000000..2ec585e7eb8b
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.1-wireless-user.patch
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.2.1.orig/linuxstreams/wvinterface.cc wvstreams-4.2.1/linuxstreams/wvinterface.cc
+--- wvstreams-4.2.1.orig/linuxstreams/wvinterface.cc	2005-11-17 22:45:05.000000000 +0200
++++ wvstreams-4.2.1/linuxstreams/wvinterface.cc	2005-12-24 10:14:34.966632750 +0200
+@@ -21,6 +21,7 @@
+ #include <errno.h>
+ #include <linux/sockios.h>
+ 
++#include <linux/compiler.h>
+ #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
+ #include <linux/wireless.h>
+