Version bump.

Package-Manager: portage-2.1.2.11

14 files changed, 427 insertions, 9 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 6e8c6af205f3..c72239c92ad1 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.110 2007/06/29 06:06:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.111 2007/08/18 05:55:48 mrness Exp $
+
+*wvstreams-4.4 (18 Aug 2007)
+
+  18 Aug 2007; Alin Năstac <mrness@gentoo.org>
+  +files/wvstreams-4.4-MOC-fix.patch, +files/wvstreams-4.4-as-needed.patch,
+  +files/wvstreams-4.4-external-xplc.patch,
+  +files/wvstreams-4.4-linux-serial.patch,
+  +files/wvstreams-4.4-sane-cflags.patch,
+  +files/wvstreams-4.4-sigaction.patch,
+  +files/wvstreams-4.4-type-punned.patch,
+  +files/wvstreams-4.4-uniconfd-ini.patch,
+  +files/wvstreams-4.4-wireless-user.patch,
+  +files/wvstreams-4.4-wvconfemu.patch, +wvstreams-4.4.ebuild:
+  Version bump.
 
   29 Jun 2007; Alin Năstac <mrness@gentoo.org>
   -files/wvstreams-4.2.2-MOC-fix.patch,
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index e49189536ea3..9051506f98e7 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -41,15 +41,60 @@ AUX wvstreams-4.3-wireless-user.patch 489 RMD160 cc3bc883c746b509a99cce7559b11f0
 MD5 06e4e9e86fafa01bae1b3fcd517c7cde files/wvstreams-4.3-wireless-user.patch 489
 RMD160 cc3bc883c746b509a99cce7559b11f0c40d4dae6 files/wvstreams-4.3-wireless-user.patch 489
 SHA256 10caaf927e595b46d7d0ca32cc989f68b8e6abf928160a04cfab2d055d7ca168 files/wvstreams-4.3-wireless-user.patch 489
+AUX wvstreams-4.4-MOC-fix.patch 488 RMD160 aae0965e0b0dd7767c1183daf3005074089791be SHA1 2a9ea9c18329f6494c981cbc176e09a6e7b1b3ec SHA256 38127fc658a2b8342f1241fe3a8c775bb7a5e866a8b00bb89ad96778d6c187d0
+MD5 8a86739c068807329dcb3007c1ab9be6 files/wvstreams-4.4-MOC-fix.patch 488
+RMD160 aae0965e0b0dd7767c1183daf3005074089791be files/wvstreams-4.4-MOC-fix.patch 488
+SHA256 38127fc658a2b8342f1241fe3a8c775bb7a5e866a8b00bb89ad96778d6c187d0 files/wvstreams-4.4-MOC-fix.patch 488
+AUX wvstreams-4.4-as-needed.patch 2127 RMD160 2e577dbdc8019858392e5f671cf5adbbba4114e1 SHA1 7c93cbb9462175d44257e6152baf0c83cca2dc2f SHA256 05484ded8bf9f46cc1a5217a41f3b99de549375f83003da67036b1014512f441
+MD5 3a60d37257cb354bb9a9d22c502ebe12 files/wvstreams-4.4-as-needed.patch 2127
+RMD160 2e577dbdc8019858392e5f671cf5adbbba4114e1 files/wvstreams-4.4-as-needed.patch 2127
+SHA256 05484ded8bf9f46cc1a5217a41f3b99de549375f83003da67036b1014512f441 files/wvstreams-4.4-as-needed.patch 2127
+AUX wvstreams-4.4-external-xplc.patch 1205 RMD160 0b55a10c19647ae5d792283ea9b1f1b123498e3e SHA1 2e6d36d4249679e2ffa25f6bee9f191338e8a9ca SHA256 99521d3b5649cec99b4d6251bd7b7f59273b0a495dd51e4b36b77eb343ba700b
+MD5 1d9953797a20fcdcf2c0c37f9168e73e files/wvstreams-4.4-external-xplc.patch 1205
+RMD160 0b55a10c19647ae5d792283ea9b1f1b123498e3e files/wvstreams-4.4-external-xplc.patch 1205
+SHA256 99521d3b5649cec99b4d6251bd7b7f59273b0a495dd51e4b36b77eb343ba700b files/wvstreams-4.4-external-xplc.patch 1205
+AUX wvstreams-4.4-linux-serial.patch 1632 RMD160 6731576316598f2f2cdbe00b08ab6ced9eee0fd8 SHA1 8852774b47f941edbf24943b5895f3497ddc18c9 SHA256 068866ac51058cff6e5b789c9a5ebd007bf5301ed001a27b4d84ba80e5d5cb2e
+MD5 f443828142673c8e6541fb3a9ed250a2 files/wvstreams-4.4-linux-serial.patch 1632
+RMD160 6731576316598f2f2cdbe00b08ab6ced9eee0fd8 files/wvstreams-4.4-linux-serial.patch 1632
+SHA256 068866ac51058cff6e5b789c9a5ebd007bf5301ed001a27b4d84ba80e5d5cb2e files/wvstreams-4.4-linux-serial.patch 1632
+AUX wvstreams-4.4-sane-cflags.patch 1566 RMD160 2ba116157a8226b75e1901da8d56f85db828d43a SHA1 f58e0f74d89b70855f15b4ecae186c21bb55d4da SHA256 1e9d3f2b3042e544eb8012356ab87fd72db503eade4aadb2df576fad2290713a
+MD5 35aa567ab541c6785593f834ecb0265a files/wvstreams-4.4-sane-cflags.patch 1566
+RMD160 2ba116157a8226b75e1901da8d56f85db828d43a files/wvstreams-4.4-sane-cflags.patch 1566
+SHA256 1e9d3f2b3042e544eb8012356ab87fd72db503eade4aadb2df576fad2290713a files/wvstreams-4.4-sane-cflags.patch 1566
+AUX wvstreams-4.4-sigaction.patch 503 RMD160 8bf25b06026e64dc3b0679738e37ae4b8a9a1174 SHA1 7ca737f3faf5b611596d1f114dbc199a928425b5 SHA256 fe61219b67ba974ba920726dd09f39fe36453fe07026f1feaa389c86fa13f32f
+MD5 f0fe38f2a9acb9366b70b85bf233477b files/wvstreams-4.4-sigaction.patch 503
+RMD160 8bf25b06026e64dc3b0679738e37ae4b8a9a1174 files/wvstreams-4.4-sigaction.patch 503
+SHA256 fe61219b67ba974ba920726dd09f39fe36453fe07026f1feaa389c86fa13f32f files/wvstreams-4.4-sigaction.patch 503
+AUX wvstreams-4.4-type-punned.patch 649 RMD160 be490cc3b91f818c6ffc5b0793a53ebce0a7d701 SHA1 2e997401fb98fa70bd26a21f084fb3ec246044ba SHA256 215e6c2e0b52efc2a0b16a558452fcf6a8f2d62b0e18c6a2c420f401e1e40c3c
+MD5 3aac22a032570492c745c2641504a35b files/wvstreams-4.4-type-punned.patch 649
+RMD160 be490cc3b91f818c6ffc5b0793a53ebce0a7d701 files/wvstreams-4.4-type-punned.patch 649
+SHA256 215e6c2e0b52efc2a0b16a558452fcf6a8f2d62b0e18c6a2c420f401e1e40c3c files/wvstreams-4.4-type-punned.patch 649
+AUX wvstreams-4.4-uniconfd-ini.patch 796 RMD160 57b582cb5b4fbfe038b057295024b10210a9b830 SHA1 0823b65f5ef5c09b4446a0ed923fca438287c122 SHA256 7d9526f56e0adc748081a8dc910a83cb851ab88521613efe4331487d4abf6770
+MD5 ca4dda3b3d88c84c84c16e46e8f297d3 files/wvstreams-4.4-uniconfd-ini.patch 796
+RMD160 57b582cb5b4fbfe038b057295024b10210a9b830 files/wvstreams-4.4-uniconfd-ini.patch 796
+SHA256 7d9526f56e0adc748081a8dc910a83cb851ab88521613efe4331487d4abf6770 files/wvstreams-4.4-uniconfd-ini.patch 796
+AUX wvstreams-4.4-wireless-user.patch 489 RMD160 d96b35981362aff522c1d6c92a2d8af792b6a539 SHA1 0d6e3a6f78f9a2829ea2225f6f09b0ee5147e2f1 SHA256 e6425c6416db5d5f50be74aa67c4dccde91162d844655b07366b9dd8f26386c8
+MD5 ab70cd2d89c2be57ad04da5b058a693a files/wvstreams-4.4-wireless-user.patch 489
+RMD160 d96b35981362aff522c1d6c92a2d8af792b6a539 files/wvstreams-4.4-wireless-user.patch 489
+SHA256 e6425c6416db5d5f50be74aa67c4dccde91162d844655b07366b9dd8f26386c8 files/wvstreams-4.4-wireless-user.patch 489
+AUX wvstreams-4.4-wvconfemu.patch 384 RMD160 2ee5b030cd101923f88cbd7bc63b4587cfb2190f SHA1 33eeb9b0288f2d0ceedcbacf11ad10c4550c36cf SHA256 88d1897c41763b3616ffdee8e9e361dd53b38e18f6c73b98fac02942aa842e11
+MD5 b90a61ddcdbb8bc14fa18bae3d340a59 files/wvstreams-4.4-wvconfemu.patch 384
+RMD160 2ee5b030cd101923f88cbd7bc63b4587cfb2190f files/wvstreams-4.4-wvconfemu.patch 384
+SHA256 88d1897c41763b3616ffdee8e9e361dd53b38e18f6c73b98fac02942aa842e11 files/wvstreams-4.4-wvconfemu.patch 384
 DIST wvstreams-4.3.tar.gz 1294177 RMD160 fb6c480903cb725bf4911a05bfa1ef12bf05dfec SHA1 9347696d28a482c0be741a222436f0529283c304 SHA256 54b2a693ef67fde375292d768fc6471bb00105870714cc4051289986a51aabb9
+DIST wvstreams-4.4.tar.gz 1296853 RMD160 82ad9584d586895612f42dcb1709edb8a7fcb6a6 SHA1 8a7ec82c0c4002bec16ec521747a689fb50d8f27 SHA256 c478eb0755b383baebe66e55135257eebbdb113e194946a40be0c765e14fb4d6
 EBUILD wvstreams-4.3-r2.ebuild 2555 RMD160 b3fab5b254f2c2833436df8a2bad6aa8755476ba SHA1 e2ccc68c0610e39722f10d45ab56a55cf9fc22a3 SHA256 86b19f3ee9373521d62fc9bcd7cf1b21641268d805df9386cc9b46c24b527c2a
 MD5 fc8dc74777713c1e790dc63ac2362c40 wvstreams-4.3-r2.ebuild 2555
 RMD160 b3fab5b254f2c2833436df8a2bad6aa8755476ba wvstreams-4.3-r2.ebuild 2555
 SHA256 86b19f3ee9373521d62fc9bcd7cf1b21641268d805df9386cc9b46c24b527c2a wvstreams-4.3-r2.ebuild 2555
-MISC ChangeLog 18485 RMD160 6b5960eaa0b0474f42cebb8eb2fbbec4c0e8c464 SHA1 10e6317229f95d8052c0284474ce0066fbc7fb81 SHA256 665850fa2d8dcb1609c3edc2b3b01a2222be69a531bc017bf65cc4c298afe248
-MD5 42e437023b399d465c34051726425dbc ChangeLog 18485
-RMD160 6b5960eaa0b0474f42cebb8eb2fbbec4c0e8c464 ChangeLog 18485
-SHA256 665850fa2d8dcb1609c3edc2b3b01a2222be69a531bc017bf65cc4c298afe248 ChangeLog 18485
+EBUILD wvstreams-4.4.ebuild 2572 RMD160 4edb7cb3ee3cd0c792cebfe3c247155f9a713d26 SHA1 81cc563d6c4b194a04f8d1f4daeec36f91e4ea9b SHA256 ffe4c3cd56b94c52ecd024c746d95f26cbc65666d45f8a82e2188795e762fca9
+MD5 e29fefb52a38be68733b23c97400b9bb wvstreams-4.4.ebuild 2572
+RMD160 4edb7cb3ee3cd0c792cebfe3c247155f9a713d26 wvstreams-4.4.ebuild 2572
+SHA256 ffe4c3cd56b94c52ecd024c746d95f26cbc65666d45f8a82e2188795e762fca9 wvstreams-4.4.ebuild 2572
+MISC ChangeLog 19017 RMD160 1933ac0bc9b9a0d2d3d38cfa723ddc263c2c0c4f SHA1 4c2a74dc7080b12f2cd4ec4e1e348fbb11e55f72 SHA256 ad0b4e79a8d6b0060b8226c0a9e361048ff07aa870f67999acc253b5b26a49aa
+MD5 3e9afef8587eae8a981bdb3ac3612060 ChangeLog 19017
+RMD160 1933ac0bc9b9a0d2d3d38cfa723ddc263c2c0c4f ChangeLog 19017
+SHA256 ad0b4e79a8d6b0060b8226c0a9e361048ff07aa870f67999acc253b5b26a49aa ChangeLog 19017
 MISC metadata.xml 313 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b SHA1 a40d5fd17e50dc9f983efc63e5cbb8b407b95c7a SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b metadata.xml 313
@@ -57,10 +102,13 @@ SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37 metadata
 MD5 573eed9105c7a3828296d072fbc449eb files/digest-wvstreams-4.3-r2 244
 RMD160 323f0e3ef47ac41b690134fc8b9a73f5ffbbd9ca files/digest-wvstreams-4.3-r2 244
 SHA256 e3bb902f085262bd9e556d98911fdf2940e54befc15a71c88e4eb726df6a1692 files/digest-wvstreams-4.3-r2 244
+MD5 ceee5c95287df7fca234cd12a86b578f files/digest-wvstreams-4.4 244
+RMD160 6578a10af9ce7ba188e7a2426f49b66ea5eceb46 files/digest-wvstreams-4.4 244
+SHA256 299f4bb0f233f1609ccae2b0661d873fc986d50f49c888c2aa642ad22dbaf49a files/digest-wvstreams-4.4 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGhKGOVSA5X31g7/gRApW3AJ9eTNDSveJibUo/dyhRBaUQacRCFgCfdQDl
-KqB5t5rzwq6JyFki5rouf2A=
-=VPzQ
+iD8DBQFGxonvVSA5X31g7/gRAkTvAJwLviz8IjJp8D616Cf7iB1BwSIJegCeIDnB
+jIc7UKPmr7WOD1bRBlKqPrY=
+=y98E
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.4 b/net-libs/wvstreams/files/digest-wvstreams-4.4
new file mode 100644
index 000000000000..318916df5a97
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.4
@@ -0,0 +1,3 @@
+MD5 441c85c2347e118965e47124b0c867ff wvstreams-4.4.tar.gz 1296853
+RMD160 82ad9584d586895612f42dcb1709edb8a7fcb6a6 wvstreams-4.4.tar.gz 1296853
+SHA256 c478eb0755b383baebe66e55135257eebbdb113e194946a40be0c765e14fb4d6 wvstreams-4.4.tar.gz 1296853
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.4-MOC-fix.patch
new file mode 100644
index 000000000000..7f835d7f4fc3
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-MOC-fix.patch
@@ -0,0 +1,12 @@
+diff -Nru wvstreams-4.4.orig/wvrules.mk wvstreams-4.4/wvrules.mk
+--- wvstreams-4.4.orig/wvrules.mk	2007-08-17 22:45:07.000000000 +0300
++++ wvstreams-4.4/wvrules.mk	2007-08-17 22:53:05.000000000 +0300
+@@ -294,7 +294,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.4-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.4-as-needed.patch
new file mode 100644
index 000000000000..4cbc702dcdb7
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-as-needed.patch
@@ -0,0 +1,45 @@
+diff -Nru wvstreams-4.4.orig/configure.ac wvstreams-4.4/configure.ac
+--- wvstreams-4.4.orig/configure.ac	2007-07-20 00:22:57.000000000 +0300
++++ wvstreams-4.4/configure.ac	2007-08-17 22:41:34.000000000 +0300
+@@ -460,16 +460,19 @@
+         wv_cv_with_qt=no
+         CPPFLAGS_save="$CPPFLAGS"
+         LDFLAGS_save="$LDFLAGS"
++        LIBS_save="$LIBS"
+         for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do
+             eval wv_qtdir="$wv_qtdir"
+             CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
+-            LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib -lqt-mt"
++            LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
++            LIBS="$LIBS_save -lqt-mt"
+             AC_TRY_LINK([#include <qstring.h>],
+                         [QString x("hello"); return 0; ],
+                         [wv_cv_with_qt=$wv_qtdir; break])
+         done
+         CPPFLAGS="$CPPFLAGS_save"
+         LDFLAGS="$LDFLAGS_save"
++        LIBS="$LIBS_save"
+     ])
+     with_qt=$wv_cv_with_qt
+     if test "$with_qt" != no; then
+diff -Nru wvstreams-4.4.orig/wvrules.mk wvstreams-4.4/wvrules.mk
+--- wvstreams-4.4.orig/wvrules.mk	2007-07-20 19:36:55.000000000 +0300
++++ wvstreams-4.4/wvrules.mk	2007-08-17 22:41:34.000000000 +0300
+@@ -60,7 +60,7 @@
+ 		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS += $(COPTS) $(C_AND_CXX_FLAGS) 
+ CXXFLAGS += $(CXXOPTS) $(C_AND_CXX_FLAGS)
+-LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB)
++LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB) -Wl,-rpath-link,$(WVSTREAMS_LIB)
+ 
+ # Default compiler we use for linking
+ WVLINK_CC = gcc
+@@ -270,7 +270,7 @@
+ %.so: SONAME=$@$(if $(SO_VERSION),.$(SO_VERSION))
+ wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1))
+ define wvlink_so
+-	$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
++	$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a,$2) $(filter %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
+ 	$(if $(filter-out $(call wvsoname,$1),$1),$(call wvlns,$1,$(call wvsoname,$1)))
+ endef
+ 
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.4-external-xplc.patch
new file mode 100644
index 000000000000..744c96bfd784
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-external-xplc.patch
@@ -0,0 +1,36 @@
+diff -Nru wvstreams-4.4.orig/configure.ac wvstreams-4.4/configure.ac
+--- wvstreams-4.4.orig/configure.ac	2007-08-17 22:43:47.000000000 +0300
++++ wvstreams-4.4/configure.ac	2007-08-17 22:52:07.000000000 +0300
+@@ -488,7 +488,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}`])
+@@ -500,15 +499,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])
+@@ -516,7 +506,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.4-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.4-linux-serial.patch
new file mode 100644
index 000000000000..7b8fa08deb86
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-linux-serial.patch
@@ -0,0 +1,42 @@
+diff -Nru wvstreams-4.4.orig/streams/wvmodem.cc wvstreams-4.4/streams/wvmodem.cc
+--- wvstreams-4.4.orig/streams/wvmodem.cc	2007-07-20 00:22:57.000000000 +0300
++++ wvstreams-4.4/streams/wvmodem.cc	2007-08-17 22:36:21.000000000 +0300
+@@ -194,22 +194,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.4-sane-cflags.patch b/net-libs/wvstreams/files/wvstreams-4.4-sane-cflags.patch
new file mode 100644
index 000000000000..70553659f045
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-sane-cflags.patch
@@ -0,0 +1,59 @@
+diff -Nru wvstreams-4.4.orig/vars.mk wvstreams-4.4/vars.mk
+--- wvstreams-4.4.orig/vars.mk	2007-07-20 00:22:57.000000000 +0300
++++ wvstreams-4.4/vars.mk	2007-08-17 22:43:29.000000000 +0300
+@@ -52,10 +52,10 @@
+ CXXFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+-ifeq ($(DEBUG),)
+-CXXFLAGS+=-g
+-CFLAGS+=-g
+-endif
++#ifeq ($(DEBUG),)
++#CXXFLAGS+=-g
++#CFLAGS+=-g
++#endif
+ 
+ ifneq ($(DEBUG),)
+ CXXFLAGS+=-ggdb -DDEBUG$(if $(filter-out yes,$(DEBUG)), -DDEBUG_$(DEBUG))
+@@ -77,9 +77,9 @@
+ endif
+ 
+ ifneq ("$(enable_optimization)", "no")
+-CXXFLAGS+=-O2
++#CXXFLAGS+=-O2
+ #CXXFLAGS+=-felide-constructors
+-CFLAGS+=-O2
++#CFLAGS+=-O2
+ endif
+ 
+ ifneq ("$(enable_warnings)", "no")
+diff -Nru wvstreams-4.4.orig/wvrules.mk wvstreams-4.4/wvrules.mk
+--- wvstreams-4.4.orig/wvrules.mk	2007-08-17 22:43:47.000000000 +0300
++++ wvstreams-4.4/wvrules.mk	2007-08-17 22:43:29.000000000 +0300
+@@ -82,9 +82,9 @@
+ endif
+ 
+ ifneq ("$(enable_optimization)", "no")
+-  CXXFLAGS+=-O2
++  #CXXFLAGS+=-O2
+   #CXXFLAGS+=-felide-constructors
+-  CFLAGS+=-O2
++  #CFLAGS+=-O2
+ endif
+ 
+ ifneq ("$(enable_warnings)", "no")
+@@ -175,11 +175,11 @@
+   C_AND_CXX_FLAGS += -ggdb -DDEBUG=1
+   LDFLAGS += -ggdb
+ else
+-  C_AND_CXX_FLAGS += -g -DDEBUG=0
++  C_AND_CXX_FLAGS += -DDEBUG=0
+   #CFLAGS += -DNDEBUG    # I don't like disabling assertions...
+   #CFLAGS += -fomit-frame-pointer  # really evil
+   #CXXFLAGS += -fno-implement-inlines  # causes trouble with egcs 1.0
+-  LDFLAGS += -g
++  #LDFLAGS += -g
+ endif
+ 
+ ifeq ($(PROFILE),1)
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-sigaction.patch b/net-libs/wvstreams/files/wvstreams-4.4-sigaction.patch
new file mode 100644
index 000000000000..3478430df88f
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-sigaction.patch
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.4.orig/utils/wvcrash.cc wvstreams-4.4/utils/wvcrash.cc
+--- wvstreams-4.4.orig/utils/wvcrash.cc	2007-07-20 00:22:55.000000000 +0300
++++ wvstreams-4.4/utils/wvcrash.cc	2007-08-17 22:49:50.000000000 +0300
+@@ -385,7 +385,6 @@
+     act.sa_handler = wvcrash;
+     sigfillset(&act.sa_mask);
+     act.sa_flags = SA_ONSTACK | SA_RESTART;
+-    act.sa_restorer = NULL;
+     
+     if (sigaction(sig, &act, NULL))
+         fprintf(stderr, "Failed to setup wvcrash handler for signal %d: %s\n",
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-type-punned.patch b/net-libs/wvstreams/files/wvstreams-4.4-type-punned.patch
new file mode 100644
index 000000000000..f4dff0f69e1a
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-type-punned.patch
@@ -0,0 +1,17 @@
+diff -Nru wvstreams-4.4.orig/urlget/wvhttppool.cc wvstreams-4.4/urlget/wvhttppool.cc
+--- wvstreams-4.4.orig/urlget/wvhttppool.cc	2007-07-20 00:22:36.000000000 +0300
++++ wvstreams-4.4/urlget/wvhttppool.cc	2007-08-17 23:07:41.000000000 +0300
+@@ -43,7 +43,12 @@
+     {
+         WvBufUrlStream *x = new WvBufUrlStream;
+         outstream = x;
+-        x->death_notify = (WvStream **)&outstream;
++        union {
++            WvBufUrlStream** ppbufurlstream;
++            WvStream**       ppstream;
++        } s;
++        s.ppbufurlstream = &outstream;
++        x->death_notify = s.ppstream;
+         x->url = url;
+ 
+         putstream = content_source;
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-uniconfd-ini.patch b/net-libs/wvstreams/files/wvstreams-4.4-uniconfd-ini.patch
new file mode 100644
index 000000000000..e6b8c48edb95
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-uniconfd-ini.patch
@@ -0,0 +1,14 @@
+diff -Nru wvstreams-4.4.orig/Makefile wvstreams-4.4/Makefile
+--- wvstreams-4.4.orig/Makefile	2007-07-20 19:31:03.000000000 +0300
++++ wvstreams-4.4/Makefile	2007-08-17 22:39:56.000000000 +0300
+@@ -185,8 +185,8 @@
+ 	$(INSTALL_PROGRAM) uniconf/tests/uni $(DESTDIR)$(bindir)/
+ 	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	$(INSTALL_PROGRAM) uniconf/daemon/uniconfd $(DESTDIR)$(sbindir)/
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/uniconf
+-	touch $(DESTDIR)$(localstatedir)/lib/uniconf/uniconfd.ini
++	$(INSTALL) -d $(DESTDIR)$(localstatedir)/uniconf
++	$(INSTALL_DATA) uniconf/daemon/uniconfd.ini $(DESTDIR)$(localstatedir)/uniconf
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+ 	$(INSTALL_DATA) uniconf/daemon/uniconfd.8 $(DESTDIR)$(mandir)/man8
+ 	$(INSTALL_DATA) uniconf/tests/uni.8 $(DESTDIR)$(mandir)/man8
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.4-wireless-user.patch
new file mode 100644
index 000000000000..7f3d9cb31704
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-wireless-user.patch
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.4.orig/linuxstreams/wvinterface.cc wvstreams-4.4/linuxstreams/wvinterface.cc
+--- wvstreams-4.4.orig/linuxstreams/wvinterface.cc	2007-07-20 00:22:51.000000000 +0300
++++ wvstreams-4.4/linuxstreams/wvinterface.cc	2007-08-17 22:38:13.000000000 +0300
+@@ -21,6 +21,7 @@
+ #include <errno.h>
+ #include <linux/sockios.h>
+ 
++#include <sys/sysctl.h> /* Needed for __user definition */
+ #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
+ #include <linux/wireless.h>
+ 
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-wvconfemu.patch b/net-libs/wvstreams/files/wvstreams-4.4-wvconfemu.patch
new file mode 100644
index 000000000000..6c942c21b9a9
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-wvconfemu.patch
@@ -0,0 +1,13 @@
+diff -Nru wvstreams-4.4.orig/vars.mk wvstreams-4.4/vars.mk
+--- wvstreams-4.4.orig/vars.mk	2007-08-18 00:13:15.000000000 +0300
++++ wvstreams-4.4/vars.mk	2007-08-17 23:39:09.000000000 +0300
+@@ -156,7 +156,8 @@
+ 	streams/wvfile.o \
+ 	streams/wvstreamclone.o  \
+ 	streams/wvconstream.o \
+-	utils/wvcrashbase.o
++	utils/wvcrashbase.o \
++	uniconf/wvconfemu.o
+ 
+ TESTOBJS = utils/wvtest.o 
+ 
diff --git a/net-libs/wvstreams/wvstreams-4.4.ebuild b/net-libs/wvstreams/wvstreams-4.4.ebuild
new file mode 100644
index 000000000000..d286876fd7a9
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.4.ebuild,v 1.1 2007/08/18 05:55:48 mrness Exp $
+
+WANT_AUTOCONF=2.59
+WANT_AUTOMAKE=none
+
+inherit eutils fixheadtails autotools qt3
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
+SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="qt3 qdbm pam slp doc debug"
+
+RESTRICT="test"
+
+RDEPEND=">=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
+	>=dev-libs/xplc-0.3.13
+	qt3? ( $(qt_min_version 3.1) )
+	qdbm? ( dev-db/qdbm )
+	pam? ( >=sys-libs/pam-0.75 )
+	slp? ( >=net-libs/openslp-1.0.9a )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-linux-serial.patch"
+	epatch "${FILESDIR}/${P}-wireless-user.patch"
+	epatch "${FILESDIR}/${P}-uniconfd-ini.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-sane-cflags.patch"
+	epatch "${FILESDIR}/${P}-type-punned.patch"
+	epatch "${FILESDIR}/${P}-sigaction.patch"
+	epatch "${FILESDIR}/${P}-wvconfemu.patch"
+
+	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"
+
+	use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch"
+
+	ht_fix_file "${S}/configure.ac"
+
+	#needed by xplc and as-needed patch:
+	cd "${S}"
+	eautoconf || die "autoconf failed"
+	#without following, the makefile would remove some files and request
+	#you to run ./configure again
+	touch include/wvautoconf.h.in configure
+}
+
+src_compile() {
+	econf \
+		`use_with qdbm` \
+		`use_with pam` \
+		`use_with slp openslp` \
+		`use_with qt3 qt` \
+		`use_enable debug` \
+		--without-tcl \
+		--without-swig \
+		--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() {
+	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" 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
+}