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

Package-Manager: portage-2.0.51.22-r3

10 files changed, 269 insertions, 9 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index bb2557a5898b..3f0e38e4fa47 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.74 2005/12/24 15:34:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.75 2005/12/24 19:14:22 mrness Exp $
+
+*wvstreams-4.2.1 (24 Dec 2005)
+
+  24 Dec 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.2.1-MOC-fix.patch,
+  +files/wvstreams-4.2.1-external-xplc.patch,
+  +files/wvstreams-4.2.1-gcc41.patch,
+  +files/wvstreams-4.2.1-linux-serial.patch,
+  +files/wvstreams-4.2.1-tcl_8_4.patch,
+  +files/wvstreams-4.2.1-wireless-user.patch, +wvstreams-4.2.1.ebuild:
+  Version bump. This version has quite a few useflags removed: gtk, fam,
+  oggvorbis, speex and fftw.
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
   wvstreams-4.0.2-r2.ebuild:
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index e4a3a8928705..af9a5a55dd56 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,13 +1,31 @@
-MD5 4197147e0570a826cbb6cd30aea958ec ChangeLog 11098
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e6ad89da209df1e31e319fb9133a5d5c wvstreams-4.0.2-r2.ebuild 2598
+MD5 0e03241b00bb6182f776bc336d1e4755 wvstreams-4.2.1.ebuild 2433
+MD5 e594922148c5a6f7087f083cf392e55c wvstreams-4.0.2-r1.ebuild 2558
+MD5 7ad8d90f51029182dfd4708c548a8870 ChangeLog 11560
+MD5 227de7f678ad662524292836709de75f metadata.xml 313
+MD5 ea4c5b90b703bcd05c3629093614f433 files/wvstreams-4.2.1-gcc41.patch 482
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
+MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r1 68
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r2 68
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
-MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659
-MD5 6448ad9ded98b10b600e0b3386d2c4bf files/wvstreams-4.0.2-gcc41.patch 698
 MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412
+MD5 dcb8a3f592baa616e6123867b2fdced8 files/wvstreams-4.2.1-tcl_8_4.patch 1022
+MD5 637930659665610f5bfe52f077fe5112 files/wvstreams-4.2.1-MOC-fix.patch 496
+MD5 5e3ce238e271e55db146969b050836da files/digest-wvstreams-4.2.1 68
+MD5 7325e9c7f69a6d03560dc3b2c5700f7e files/wvstreams-4.2.1-external-xplc.patch 1213
 MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
+MD5 62675720135a871a7332b3a924a6c0f9 files/wvstreams-4.2.1-wireless-user.patch 466
+MD5 fe54c7dbb4770aad4ef9a5dcb44106ec files/wvstreams-4.2.1-linux-serial.patch 1649
 MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
-MD5 227de7f678ad662524292836709de75f metadata.xml 313
-MD5 e594922148c5a6f7087f083cf392e55c wvstreams-4.0.2-r1.ebuild 2558
-MD5 e6ad89da209df1e31e319fb9133a5d5c wvstreams-4.0.2-r2.ebuild 2598
+MD5 6448ad9ded98b10b600e0b3386d2c4bf files/wvstreams-4.0.2-gcc41.patch 698
+MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDrZ4tNSP4Vda7IdsRAvgZAJ4uC1OsDjEAe00NNaiEel+CwOEZjwCghrhq
+pTOMD+Et4qe28DuoWYUyeP4=
+=Tdov
+-----END PGP SIGNATURE-----
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>
+ 
diff --git a/net-libs/wvstreams/wvstreams-4.2.1.ebuild b/net-libs/wvstreams/wvstreams-4.2.1.ebuild
new file mode 100644
index 000000000000..5659f6359493
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.2.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.1.ebuild,v 1.1 2005/12/24 19:14:22 mrness Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
+SRC_URI="http://open.nit.ca/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="gtk qt qdbm pam slp doc tcltk debug"
+
+RDEPEND="virtual/libc
+	>=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
+	>=dev-libs/xplc-0.3.12
+	qt? ( =x11-libs/qt-3* )
+	qdbm? ( dev-db/qdbm )
+	pam? ( >=sys-libs/pam-0.75 )
+	slp? ( >=net-libs/openslp-1.0.9a )
+	doc? ( app-doc/doxygen )
+	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.59"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-gcc41.patch
+	epatch ${FILESDIR}/${P}-linux-serial.patch
+	epatch ${FILESDIR}/${P}-wireless-user.patch
+
+	if useq tcltk; then
+		epatch ${FILESDIR}/${P}-tcl_8_4.patch
+	fi
+
+	epatch ${FILESDIR}/${P}-external-xplc.patch
+	local XPLC_VER=`best_version dev-libs/xplc`
+	XPLC_VER=${XPLC_VER#*/*-} #reduce it to ${PV}-${PR}
+	XPLC_VER=${XPLC_VER%%[_-]*} # main version without beta/pre/patch/revision
+	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
+		|| die "failed to set current xplc version"
+	rm -r "${S}/xplc"
+
+	useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
+}
+
+src_compile() {
+	local AT_GNUCONF_UPDATE=yes
+	eautoreconf || die "eautoreconf failed"
+	#without following, the makefile would remove some files and request 
+	#you to run ./configure again
+	touch include/wvautoconf.h.in configure
+
+	local myconf
+	if useq qt; then
+		myconf="--with-qt=/usr/qt/3/"
+		export MOC="/usr/qt/3/bin/moc"
+	else
+		myconf="--without-qt"
+	fi
+	econf ${myconf} \
+		`use_with qdbm` \
+		`use_with pam` \
+		`use_with slp openslp` \
+		`use_with tcltk tcl` \
+		`use_enable debug` \
+		--with-xplc \
+		--enable-verbose \
+		--with-bdb \
+		--with-zlib \
+		--with-openssl \
+		|| die "configure failed"
+	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
+	use doc && doxygen
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	if use doc ; then
+		#the list of files is too big for dohtml -r Docs/doxy-html/*
+		cd Docs/doxy-html &&
+			dohtml -r *
+	fi
+}