fix bugs #79897 and #79913

(Portage version: 2.0.51-r15)

6 files changed, 325 insertions, 15 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 1b136c2a1196..67904f899479 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,14 @@
 # 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.39 2005/02/14 17:51:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.40 2005/02/17 19:59:44 mrness Exp $
+
+*wvstreams-4.0.1-r1 (17 Feb 2005)
+
+  17 Feb 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-linux-serial.patch, +wvstreams-4.0.1-r1.ebuild,
+  wvstreams-4.0.1.ebuild:
+  Add patch derived from debian patch (wwwstreams_4.0.1-1.3) that fixes bugs
+  #79897 and #79913.
 
   14 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> wvstreams-4.0.1.ebuild:
   Stable on sparc wrt #76455
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index a6e1ba684e29..e7a71c350020 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ee1eddb5f37db70d25c4f46cbcbfc97b wvstreams-4.0.1-r1.ebuild 1977
+MD5 88beb02e20267e4fc08543358e899909 wvstreams-4.0-r1.ebuild 1872
 MD5 afece6e4b419bc3cc53f67596c73f7da ChangeLog 6101
-MD5 40fcfb488d0563fd02dcefb1e0a8d4a2 wvstreams-4.0.1.ebuild 1872
+MD5 9601d4186658405cd2f90140082e2f52 wvstreams-4.0.1.ebuild 1901
 MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
-MD5 88beb02e20267e4fc08543358e899909 wvstreams-4.0-r1.ebuild 1872
+MD5 8bf34c693506e1b79f39c74a6f820fe7 files/wvstreams-4.0.1-linux-serial.patch 7588
+MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r1 68
 MD5 f606f86f5ef7d07937128fc8dc043c83 files/wvstreams-4.0-tcl_8_4.patch 822
 MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66
 MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1 68
 MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCEOUoKRy60XGEcJIRAu8yAJ9CxiwTFyL8+12sQK23emIJxeNxJwCgkWLS
-XgdbmoAcEqTJS2CNHcuHVY0=
-=e8JN
------END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r1
new file mode 100644
index 000000000000..967ae2bc824d
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r1
@@ -0,0 +1 @@
+MD5 89cdc4f979d1f6d745e173bc7485f325 wvstreams-4.0.1.tar.gz 1058667
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.1-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.0.1-linux-serial.patch
new file mode 100644
index 000000000000..fd4c87c09677
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.1-linux-serial.patch
@@ -0,0 +1,231 @@
+diff -Nru wvstreams-4.0.1.orig/config.guess wvstreams-4.0.1/config.guess
+--- wvstreams-4.0.1.orig/config.guess	2004-11-18 16:15:05.000000000 +0200
++++ wvstreams-4.0.1/config.guess	2005-02-17 21:47:14.995711640 +0200
+@@ -3,7 +3,7 @@
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ 
+-timestamp='2004-08-13'
++timestamp='2004-11-12'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -319,6 +319,9 @@
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit 0 ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit 0 ;;
+     *:OS400:*:*)
+         echo powerpc-ibm-os400
+ 	exit 0 ;;
+@@ -342,7 +345,7 @@
+     DRS?6000:unix:4.0:6*)
+ 	echo sparc-icl-nx6
+ 	exit 0 ;;
+-    DRS?6000:UNIX_SV:4.2*:7*)
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+ 	esac ;;
+@@ -824,6 +827,12 @@
+     cris:Linux:*:*)
+ 	echo cris-axis-linux-gnu
+ 	exit 0 ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit 0 ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit 0 ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+@@ -1241,7 +1250,10 @@
+ 	    A*) echo alpha-dec-vms && exit 0 ;;
+ 	    I*) echo ia64-dec-vms && exit 0 ;;
+ 	    V*) echo vax-dec-vms && exit 0 ;;
+-	esac
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+diff -Nru wvstreams-4.0.1.orig/config.sub wvstreams-4.0.1/config.sub
+--- wvstreams-4.0.1.orig/config.sub	2004-11-18 16:15:05.000000000 +0200
++++ wvstreams-4.0.1/config.sub	2005-02-17 21:47:14.996711488 +0200
+@@ -3,7 +3,7 @@
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ 
+-timestamp='2004-06-24'
++timestamp='2004-11-30'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -267,7 +267,7 @@
+ 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+-	| x86 | xscale | xstormy16 | xtensa \
++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ 	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+@@ -343,8 +343,8 @@
+ 	| tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+-	| xtensa-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+@@ -457,6 +457,9 @@
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	crisv32 | crisv32-* | etraxfs*)
++		basic_machine=crisv32-axis
++		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
+@@ -486,6 +489,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
+ 	dpx20 | dpx20-*)
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+@@ -1026,6 +1033,10 @@
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
++		;;
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
+@@ -1294,6 +1305,9 @@
+ 	-kaos*)
+ 		os=-kaos
+ 		;;
++	-zvmoe)
++		os=-zvmoe
++		;;
+ 	-none)
+ 		;;
+ 	*)
+diff -Nru wvstreams-4.0.1.orig/debian/changelog wvstreams-4.0.1/debian/changelog
+--- wvstreams-4.0.1.orig/debian/changelog	2004-11-18 16:15:05.000000000 +0200
++++ wvstreams-4.0.1/debian/changelog	2005-02-17 21:47:14.997711336 +0200
+@@ -1,3 +1,29 @@
++wvstreams (4.0.1-1.3) unstable; urgency=high
++
++  * Non-maintainer upload.
++  * High-urgency upload for sarge-targetted RC bugfix
++  * Fix WvModem::setup_modem to not expect TIOCSSERIAL to work if we're not
++    root.  (Closes: #292618)
++
++ -- Steve Langasek <vorlon@debian.org>  Sat,  5 Feb 2005 02:45:25 -0800
++
++wvstreams (4.0.1-1.2) unstable; urgency=high
++
++  * NMU with maintainer's permission
++  * Use high urgency as the version in testing has unfixed
++    RC bugs (#281772)
++  * libwvstreams.dev has to depend on libxplc0.3.10-dev
++    (Closes: #289237)
++
++ -- Frank Lichtenheld <djpig@debian.org>  Sun,  9 Jan 2005 14:40:02 +0100
++
++wvstreams (4.0.1-1.1) unstable; urgency=low
++
++  * NMU at request of maintainer
++  * add doxygen to build-depends (Cloeses: #286593)
++
++ -- Blars Blarson <blarson@blars.org>  Mon, 27 Dec 2004 18:51:32 -0800
++
+ wvstreams (4.0.1-1) unstable; urgency=low
+ 
+   * New upstream version.  (Closes: Bug#276571)
+diff -Nru wvstreams-4.0.1.orig/debian/control wvstreams-4.0.1/debian/control
+--- wvstreams-4.0.1.orig/debian/control	2004-11-18 16:15:05.000000000 +0200
++++ wvstreams-4.0.1/debian/control	2005-02-17 21:47:14.997711336 +0200
+@@ -3,7 +3,7 @@
+ Priority: optional
+ Maintainer: Simon Law <sfllaw@debian.org>
+ Uploaders: James Morrison <phython@debian.org>, Patrick Patterson <ppatters@debian.org>
+-Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev
++Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev, doxygen
+ Build-Depends-Indep: doxygen
+ Standards-Version: 3.6.1
+ 
+@@ -99,7 +99,7 @@
+ Package: libwvstreams-dev
+ Architecture: any
+ Section: libdevel
+-Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, ${misc:Depends}
++Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, libxplc0.3.10-dev, ${misc:Depends}
+ Provides: libwvstreams4.0-dev
+ Description: Development libraries and header files for libwvstreams4.0
+  Contains the header files and static libraries for use in rapid 
+diff -Nru wvstreams-4.0.1.orig/streams/wvmodem.cc wvstreams-4.0.1/streams/wvmodem.cc
+--- wvstreams-4.0.1.orig/streams/wvmodem.cc	2004-11-18 16:15:05.000000000 +0200
++++ wvstreams-4.0.1/streams/wvmodem.cc	2005-02-17 21:47:34.112805400 +0200
+@@ -190,25 +190,24 @@
+     drain();
+     
+ #if HAVE_LINUX_SERIAL_H
+-    struct serial_struct old_sinfo, sinfo;
+-    sinfo.reserved_char[0] = 0;
+-    if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0) 
+-    {
+-	seterr("Cannot get information for serial port.");
+-	return;
+-    }
+-    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) 
+-    {
+-	seterr("Cannot set information for serial port.");
+-	return;
+-    }
++	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;
++
++    		if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0) 
++    		{
++				seterr("Cannot set information for serial port.");
++				return;
++    		}
++		}
++	}
+ #endif
+ 
+     // set up the terminal characteristics.
diff --git a/net-libs/wvstreams/wvstreams-4.0.1-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..d9583d9793be
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.0.1-r1.ebuild
@@ -0,0 +1,76 @@
+# 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.0.1-r1.ebuild,v 1.1 2005/02/17 19:59:44 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="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk debug"
+
+RDEPEND="virtual/libc
+	dev-libs/xplc
+	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
+	qdbm? ( dev-db/qdbm )
+	pam? ( >=sys-libs/pam-0.75 )
+	slp? ( >=net-libs/openslp-1.0.9a )
+	>=sys-libs/zlib-1.1.4
+	dev-libs/openssl
+	doc? ( app-doc/doxygen )
+	fftw? ( sci-libs/fftw )
+	tcltk? ( >=dev-lang/tcl-8.4* dev-lang/swig )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.59"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-linux-serial.patch || die "failed to patch"
+
+	if useq tcltk; then
+		epatch ${FILESDIR}/${P}-tcl_8_4.patch
+		env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
+	fi
+}
+
+src_compile() {
+	econf `use_with gtk` \
+		`use_with qt` \
+		`use_with oggvorbis ogg` \
+		`use_with oggvorbis vorbis` \
+		`use_with speex` \
+		`use_with fam` \
+		`use_with qdbm` \
+		`use_with pam` \
+		`use_with fftw` \
+		`use_with slp openslp` \
+		`use_with tcltk tcl` \
+		`use_enable debug` \
+		--enable-verbose \
+		--with-bdb \
+		--with-openssl \
+		--with-zlib \
+		--with-xplc \
+		|| 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"
+	dodoc README COPYING.LIB
+	use doc && dohtml -r Docs/doxy-html/*
+}
diff --git a/net-libs/wvstreams/wvstreams-4.0.1.ebuild b/net-libs/wvstreams/wvstreams-4.0.1.ebuild
index d1c82aa8a0ae..c57417680c9f 100644
--- a/net-libs/wvstreams/wvstreams-4.0.1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.1.ebuild,v 1.4 2005/02/14 17:51:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1.ebuild,v 1.5 2005/02/17 19:59:44 mrness Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 hppa ~ppc sparc x86"
-IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk"
+IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
 	dev-libs/xplc
@@ -56,6 +56,7 @@ src_compile() {
 		`use_with fftw` \
 		`use_with slp openslp` \
 		`use_with tcltk tcl` \
+		`use_enable debug` \
 		--enable-verbose \
 		--with-bdb \
 		--with-openssl \