Add unfinished version to the tree (work in progress - #167939).
authorAlin Năstac <mrness@gentoo.org>
Mon, 12 Mar 2007 15:54:55 +0000 (15:54 +0000)
committerAlin Năstac <mrness@gentoo.org>
Mon, 12 Mar 2007 15:54:55 +0000 (15:54 +0000)
Package-Manager: portage-2.1.2.2

12 files changed:
net-libs/wvstreams/ChangeLog
net-libs/wvstreams/Manifest
net-libs/wvstreams/files/digest-wvstreams-4.3 [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-64bit.patch [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-external-xplc.patch [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-linux-serial.patch [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-sane-cflags.patch [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-uniconfd-ini.patch [new file with mode: 0644]
net-libs/wvstreams/files/wvstreams-4.3-wireless-user.patch [new file with mode: 0644]
net-libs/wvstreams/wvstreams-4.3.ebuild [new file with mode: 0644]

index 91a2eb91da7d85c45e1345029d4b3e1782a07653..06412d14f4ecab00c7b60620ffac4ee9783a4e74 100644 (file)
@@ -1,6 +1,18 @@
 # 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.98 2007/02/08 19:07:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.99 2007/03/12 15:54:55 mrness Exp $
+
+*wvstreams-4.3 (12 Mar 2007)
+
+  12 Mar 2007; Alin Năstac <mrness@gentoo.org>
+  +files/wvstreams-4.3-64bit.patch, +files/wvstreams-4.3-MOC-fix.patch,
+  +files/wvstreams-4.3-as-needed.patch,
+  +files/wvstreams-4.3-external-xplc.patch,
+  +files/wvstreams-4.3-linux-serial.patch,
+  +files/wvstreams-4.3-sane-cflags.patch,
+  +files/wvstreams-4.3-uniconfd-ini.patch,
+  +files/wvstreams-4.3-wireless-user.patch, +wvstreams-4.3.ebuild:
+  Add unfinished version to the tree (work in progress - #167939).
 
 *wvstreams-4.2.2-r3 (08 Feb 2007)
 
index 446011bebb7c28fd9f89a8abad30b5846ead224e..7e46e9aac86515c962ce5c4e5302837d5b6d0753 100644 (file)
@@ -37,7 +37,40 @@ AUX wvstreams-4.2.2-wireless-user.patch 462 RMD160 2c206e7d3373813c733e2f0b10436
 MD5 d6b7827616d5527165007c1afeedfd06 files/wvstreams-4.2.2-wireless-user.patch 462
 RMD160 2c206e7d3373813c733e2f0b10436a0fd88dccf8 files/wvstreams-4.2.2-wireless-user.patch 462
 SHA256 ee6cf04970b7ee20c406b8cd30a1ae36754eaa32edc76b44514bac5e462fb8b4 files/wvstreams-4.2.2-wireless-user.patch 462
+AUX wvstreams-4.3-64bit.patch 559 RMD160 9a2bf2ea25d637c262c61c1d5f7b31075999b3ca SHA1 d28e28e2f59437a11cbb0562c203c284270988b7 SHA256 7902099576d9e320e6fd19b0c8fad203348dce5bc946201e8c9becd311667af7
+MD5 b3e08e99de6c41b2078129630d8c62e0 files/wvstreams-4.3-64bit.patch 559
+RMD160 9a2bf2ea25d637c262c61c1d5f7b31075999b3ca files/wvstreams-4.3-64bit.patch 559
+SHA256 7902099576d9e320e6fd19b0c8fad203348dce5bc946201e8c9becd311667af7 files/wvstreams-4.3-64bit.patch 559
+AUX wvstreams-4.3-MOC-fix.patch 488 RMD160 94b8dea2b2bf2c634173906e29b4bb1a7f4a51d8 SHA1 3b422083c4e1856d24a17092843ceab707d6d8cf SHA256 f80cb4f43c80bcf256d397e72d0bf45f98e3bc93d93c2b37d0eb98caacfc94be
+MD5 aecda7bb5ad7f28ad2a12e4c10bb84d7 files/wvstreams-4.3-MOC-fix.patch 488
+RMD160 94b8dea2b2bf2c634173906e29b4bb1a7f4a51d8 files/wvstreams-4.3-MOC-fix.patch 488
+SHA256 f80cb4f43c80bcf256d397e72d0bf45f98e3bc93d93c2b37d0eb98caacfc94be files/wvstreams-4.3-MOC-fix.patch 488
+AUX wvstreams-4.3-as-needed.patch 1805 RMD160 05b70f9280a0592bd2effcf60988d3c7732df447 SHA1 ba428bbfc676b3059bbbcbfded294c5d540ef741 SHA256 147ddb92fc82ff034d5d2e896b9db897b6c4bbcd8e176dcc68729af624a51025
+MD5 d556456abed0a55f709b1ab7810047dd files/wvstreams-4.3-as-needed.patch 1805
+RMD160 05b70f9280a0592bd2effcf60988d3c7732df447 files/wvstreams-4.3-as-needed.patch 1805
+SHA256 147ddb92fc82ff034d5d2e896b9db897b6c4bbcd8e176dcc68729af624a51025 files/wvstreams-4.3-as-needed.patch 1805
+AUX wvstreams-4.3-external-xplc.patch 1205 RMD160 9f6097f47c234b3ce2adc0f1b667fab4d8a31520 SHA1 265e6f194d45292c9a23a6aacb695ea628ab333f SHA256 e369bb507059aa6087b42ccfc2bee7f8c9a6b9a7872f71a6f4296836f453930a
+MD5 11211b97d0560d12f76b5431a95e9c95 files/wvstreams-4.3-external-xplc.patch 1205
+RMD160 9f6097f47c234b3ce2adc0f1b667fab4d8a31520 files/wvstreams-4.3-external-xplc.patch 1205
+SHA256 e369bb507059aa6087b42ccfc2bee7f8c9a6b9a7872f71a6f4296836f453930a files/wvstreams-4.3-external-xplc.patch 1205
+AUX wvstreams-4.3-linux-serial.patch 1632 RMD160 b813faeb6aa21f31b362c87b48f5d48d2f12bd79 SHA1 3bb93a937d66116e5df500f629cc851985fbcb11 SHA256 bb685b64b9490c3d3af95e4bbf3335f810fbdeb454df59d37bb6868aac33106d
+MD5 bb7ed6e7092433869c6a65f6c227127d files/wvstreams-4.3-linux-serial.patch 1632
+RMD160 b813faeb6aa21f31b362c87b48f5d48d2f12bd79 files/wvstreams-4.3-linux-serial.patch 1632
+SHA256 bb685b64b9490c3d3af95e4bbf3335f810fbdeb454df59d37bb6868aac33106d files/wvstreams-4.3-linux-serial.patch 1632
+AUX wvstreams-4.3-sane-cflags.patch 1566 RMD160 609e48c40707946ef69187f643fa1e2f59584a67 SHA1 910f62e0ab75a835a82a176d0b08ec1a7abfcb00 SHA256 ef649c68e9334f06fa526c07bdf2aab88ee53db89f6917e5972677244db254f7
+MD5 a31feb9828c520c7a2df8ba48534e2ab files/wvstreams-4.3-sane-cflags.patch 1566
+RMD160 609e48c40707946ef69187f643fa1e2f59584a67 files/wvstreams-4.3-sane-cflags.patch 1566
+SHA256 ef649c68e9334f06fa526c07bdf2aab88ee53db89f6917e5972677244db254f7 files/wvstreams-4.3-sane-cflags.patch 1566
+AUX wvstreams-4.3-uniconfd-ini.patch 796 RMD160 1ded678370f6abb9615b62bebe544566cedb055d SHA1 e97dc392b054370427874c51c70b1c4f764cf880 SHA256 e194c877f2d253eadb7c1784c695f4562675ea7c865ad07e629585180d6bbeee
+MD5 13f791bb5b4ae8fd7aef57387f4ff7be files/wvstreams-4.3-uniconfd-ini.patch 796
+RMD160 1ded678370f6abb9615b62bebe544566cedb055d files/wvstreams-4.3-uniconfd-ini.patch 796
+SHA256 e194c877f2d253eadb7c1784c695f4562675ea7c865ad07e629585180d6bbeee files/wvstreams-4.3-uniconfd-ini.patch 796
+AUX wvstreams-4.3-wireless-user.patch 489 RMD160 cc3bc883c746b509a99cce7559b11f0c40d4dae6 SHA1 dd1bbd221fc43f9b7b9dbac850d6f8658dc576a7 SHA256 10caaf927e595b46d7d0ca32cc989f68b8e6abf928160a04cfab2d055d7ca168
+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
 DIST wvstreams-4.2.2.tar.gz 1269821 RMD160 dece6092e847976d01568f20707701a8241d30d2 SHA1 a44a9ded6339fb2c53eb472d0763e4cf6b0c0534 SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14
+DIST wvstreams-4.3.tar.gz 1294177 RMD160 fb6c480903cb725bf4911a05bfa1ef12bf05dfec SHA1 9347696d28a482c0be741a222436f0529283c304 SHA256 54b2a693ef67fde375292d768fc6471bb00105870714cc4051289986a51aabb9
 EBUILD wvstreams-4.2.2-r2.ebuild 2501 RMD160 5cbae61a26d20d2234160df64009b9c86549fae4 SHA1 5686270c6bca044fbf722712f940c414b26b1a8a SHA256 7eba6e6b030546b58eb40c44dc900916e09024687292cbc9464583c3510d4d35
 MD5 8f737e2ff600fb4bb676f1b6a611c963 wvstreams-4.2.2-r2.ebuild 2501
 RMD160 5cbae61a26d20d2234160df64009b9c86549fae4 wvstreams-4.2.2-r2.ebuild 2501
@@ -50,10 +83,14 @@ EBUILD wvstreams-4.2.2.ebuild 2537 RMD160 93309344254038873a0c706117c850e280e01a
 MD5 bfef0ede67c42cb43776f76d6ec982e3 wvstreams-4.2.2.ebuild 2537
 RMD160 93309344254038873a0c706117c850e280e01ab0 wvstreams-4.2.2.ebuild 2537
 SHA256 01d7807c175eaa446084241b2e123ed87449a3289c62992686f0e37db77b22c3 wvstreams-4.2.2.ebuild 2537
-MISC ChangeLog 16026 RMD160 360fbb6312160d2b2fe92e411e416f8990b807d0 SHA1 a6d80c0fbb4c650ff1e888e9f0b00d1782310b18 SHA256 169cdc32987bf5d49b1f8fea6e2b8f2e478a02b08cd2c3c6967539f151291d1f
-MD5 20da2ea2d1ab507cabc32f34f63d2507 ChangeLog 16026
-RMD160 360fbb6312160d2b2fe92e411e416f8990b807d0 ChangeLog 16026
-SHA256 169cdc32987bf5d49b1f8fea6e2b8f2e478a02b08cd2c3c6967539f151291d1f ChangeLog 16026
+EBUILD wvstreams-4.3.ebuild 2428 RMD160 1df38d7e78513f7f9c0c3e31759a30a263305c70 SHA1 714c53f0ce5b75e1013e5e91622710f10e08def9 SHA256 b55462b31f24f96222c42d6375c4a4b5121d95b6762923d758e1f3bcc33b14b0
+MD5 849b876072d6d716c619cbab4fccf7a8 wvstreams-4.3.ebuild 2428
+RMD160 1df38d7e78513f7f9c0c3e31759a30a263305c70 wvstreams-4.3.ebuild 2428
+SHA256 b55462b31f24f96222c42d6375c4a4b5121d95b6762923d758e1f3bcc33b14b0 wvstreams-4.3.ebuild 2428
+MISC ChangeLog 16523 RMD160 3bdaefec89a22cabe05bd36bd2efde85c6081463 SHA1 74c68cdacedaadb28a5a491d937ac324a0b82f2e SHA256 8b63a84dd389bd275aa6ca7b18eea04c8509ab1a1fba758776fa64c04a03cfb2
+MD5 3c984cfeef5c55e8cb73f0b6e05b51b2 ChangeLog 16523
+RMD160 3bdaefec89a22cabe05bd36bd2efde85c6081463 ChangeLog 16523
+SHA256 8b63a84dd389bd275aa6ca7b18eea04c8509ab1a1fba758776fa64c04a03cfb2 ChangeLog 16523
 MISC metadata.xml 313 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b SHA1 a40d5fd17e50dc9f983efc63e5cbb8b407b95c7a SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b metadata.xml 313
@@ -67,10 +104,13 @@ SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/di
 MD5 ce2f63ffae6742f96ede8200eb39c3d1 files/digest-wvstreams-4.2.2-r3 250
 RMD160 ad134621ec5ac0b3b3884506e3abfbf770e34b52 files/digest-wvstreams-4.2.2-r3 250
 SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/digest-wvstreams-4.2.2-r3 250
+MD5 573eed9105c7a3828296d072fbc449eb files/digest-wvstreams-4.3 244
+RMD160 323f0e3ef47ac41b690134fc8b9a73f5ffbbd9ca files/digest-wvstreams-4.3 244
+SHA256 e3bb902f085262bd9e556d98911fdf2940e54befc15a71c88e4eb726df6a1692 files/digest-wvstreams-4.3 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFy3TyJnxX6mF440QRAhxBAKC1/zOnx95TCuNSAst7dZI7ftz6xgCgp15p
-M/o9/MubKoHzlptOB0ggpeg=
-=XeWV
+iD8DBQFF9XfdJnxX6mF440QRAjHoAKC6WbJLmcm39vh1o0MlPdAkDNtckACg61hm
+uKIGZdcUuaLfqMvTuIUxV/Q=
+=sLWd
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.3 b/net-libs/wvstreams/files/digest-wvstreams-4.3
new file mode 100644 (file)
index 0000000..3b2f6d5
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 eb34544384c951fd14470d583273e02a wvstreams-4.3.tar.gz 1294177
+RMD160 fb6c480903cb725bf4911a05bfa1ef12bf05dfec wvstreams-4.3.tar.gz 1294177
+SHA256 54b2a693ef67fde375292d768fc6471bb00105870714cc4051289986a51aabb9 wvstreams-4.3.tar.gz 1294177
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-64bit.patch b/net-libs/wvstreams/files/wvstreams-4.3-64bit.patch
new file mode 100644 (file)
index 0000000..2fc39ea
--- /dev/null
@@ -0,0 +1,14 @@
+diff -Nru wvstreams-4.3.orig/utils/wvcrash.cc wvstreams-4.3/utils/wvcrash.cc
+--- wvstreams-4.3.orig/utils/wvcrash.cc        2007-02-07 21:06:12.000000000 +0200
++++ wvstreams-4.3/utils/wvcrash.cc     2007-03-12 14:23:47.000000000 +0200
+@@ -91,8 +91,8 @@
+     char digits[] = "0123456789ABCDEF";
+     
+     write(fd, "0x", 2);
+-    for (int shift=28; shift>=0; shift-=4)
+-        write(fd, &digits[(((unsigned)addr)>>shift)&0xF], 1);
++    for (int shift = (sizeof(addr) << 3) - 4; shift>=0; shift-=4)
++        write(fd, &digits[(((ptrdiff_t)addr)>>shift)&0xF], 1);
+ }
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch
new file mode 100644 (file)
index 0000000..135c414
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Nru wvstreams-4.3.orig/wvrules.mk wvstreams-4.3/wvrules.mk
+--- wvstreams-4.3.orig/wvrules.mk      2007-03-12 14:02:55.000000000 +0200
++++ wvstreams-4.3/wvrules.mk   2007-03-12 14:05:29.000000000 +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.3-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch
new file mode 100644 (file)
index 0000000..3e1f205
--- /dev/null
@@ -0,0 +1,36 @@
+diff -Nru wvstreams-4.3.orig/configure.ac wvstreams-4.3/configure.ac
+--- wvstreams-4.3.orig/configure.ac    2007-02-07 21:06:17.000000000 +0200
++++ wvstreams-4.3/configure.ac 2007-03-12 13:59:25.000000000 +0200
+@@ -528,16 +528,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.3.orig/wvrules.mk wvstreams-4.3/wvrules.mk
+--- wvstreams-4.3.orig/wvrules.mk      2007-02-07 21:06:17.000000000 +0200
++++ wvstreams-4.3/wvrules.mk   2007-03-12 13:59:25.000000000 +0200
+@@ -272,7 +272,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.3-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.3-external-xplc.patch
new file mode 100644 (file)
index 0000000..0e63071
--- /dev/null
@@ -0,0 +1,36 @@
+diff -Nru wvstreams-4.3.orig/configure.ac wvstreams-4.3/configure.ac
+--- wvstreams-4.3.orig/configure.ac    2007-03-12 14:00:52.000000000 +0200
++++ wvstreams-4.3/configure.ac 2007-03-12 14:03:33.000000000 +0200
+@@ -556,7 +556,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}`])
+@@ -568,15 +567,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])
+@@ -584,7 +574,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.3-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.3-linux-serial.patch
new file mode 100644 (file)
index 0000000..5cb9880
--- /dev/null
@@ -0,0 +1,42 @@
+diff -Nru wvstreams-4.3.orig/streams/wvmodem.cc wvstreams-4.3/streams/wvmodem.cc
+--- wvstreams-4.3.orig/streams/wvmodem.cc      2007-02-07 21:06:17.000000000 +0200
++++ wvstreams-4.3/streams/wvmodem.cc   2007-03-12 13:49:13.000000000 +0200
+@@ -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.3-sane-cflags.patch b/net-libs/wvstreams/files/wvstreams-4.3-sane-cflags.patch
new file mode 100644 (file)
index 0000000..749b9d4
--- /dev/null
@@ -0,0 +1,59 @@
+diff -Nru wvstreams-4.3.orig/vars.mk wvstreams-4.3/vars.mk
+--- wvstreams-4.3.orig/vars.mk 2007-02-07 21:06:17.000000000 +0200
++++ wvstreams-4.3/vars.mk      2007-03-12 14:02:19.000000000 +0200
+@@ -71,10 +71,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))
+@@ -96,9 +96,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.3.orig/wvrules.mk wvstreams-4.3/wvrules.mk
+--- wvstreams-4.3.orig/wvrules.mk      2007-03-12 14:00:52.000000000 +0200
++++ wvstreams-4.3/wvrules.mk   2007-03-12 14:02:19.000000000 +0200
+@@ -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")
+@@ -177,11 +177,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.3-uniconfd-ini.patch b/net-libs/wvstreams/files/wvstreams-4.3-uniconfd-ini.patch
new file mode 100644 (file)
index 0000000..664086e
--- /dev/null
@@ -0,0 +1,14 @@
+diff -Nru wvstreams-4.3.orig/Makefile wvstreams-4.3/Makefile
+--- wvstreams-4.3.orig/Makefile        2007-02-07 21:06:17.000000000 +0200
++++ wvstreams-4.3/Makefile     2007-03-12 13:57:57.000000000 +0200
+@@ -186,8 +186,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.3-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.3-wireless-user.patch
new file mode 100644 (file)
index 0000000..c7247f5
--- /dev/null
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.3.orig/linuxstreams/wvinterface.cc wvstreams-4.3/linuxstreams/wvinterface.cc
+--- wvstreams-4.3.orig/linuxstreams/wvinterface.cc     2007-02-07 21:06:03.000000000 +0200
++++ wvstreams-4.3/linuxstreams/wvinterface.cc  2007-03-12 13:55:29.000000000 +0200
+@@ -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/wvstreams-4.3.ebuild b/net-libs/wvstreams/wvstreams-4.3.ebuild
new file mode 100644 (file)
index 0000000..9e92039
--- /dev/null
@@ -0,0 +1,91 @@
+# 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.3.ebuild,v 1.1 2007/03/12 15:54:55 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://alumnit.ca/download/${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}-64bit.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 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
+}