Remove badly packaged version. Version bump.

Package-Manager: portage-2.0.54

13 files changed, 107 insertions, 93 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 464e02094dd3..141dbf898d6d 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.79 2006/01/15 22:14:42 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.80 2006/02/03 20:17:06 mrness Exp $
+
+*wvstreams-4.2.2 (03 Feb 2006)
+
+  03 Feb 2006; 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-ptr2int-cast.patch,
+  -files/wvstreams-4.2.1-tcl_8_4.patch,
+  -files/wvstreams-4.2.1-wireless-user.patch,
+  +files/wvstreams-4.2.2-MOC-fix.patch,
+  +files/wvstreams-4.2.2-external-xplc.patch,
+  +files/wvstreams-4.2.2-gcc41.patch,
+  +files/wvstreams-4.2.2-linux-serial.patch,
+  +files/wvstreams-4.2.2-tcl_8_4.patch,
+  +files/wvstreams-4.2.2-wireless-user.patch, -wvstreams-4.2.1.ebuild,
+  +wvstreams-4.2.2.ebuild:
+  Remove badly packaged version. Version bump.
 
   15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
   files/wvstreams-4.2.1-gcc41.patch:
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 3f248219ebc4..1903df5f4c2d 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e3507320b4851a8ecee83d92e4284649 ChangeLog 12112
+MD5 1bcb9923d5a929df5f837d7042f819a6 ChangeLog 12845
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r1 68
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r2 68
-MD5 5e3ce238e271e55db146969b050836da files/digest-wvstreams-4.2.1 68
+MD5 2182d9c21e12e64892b2ff69088ff5e1 files/digest-wvstreams-4.2.2 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
@@ -12,21 +12,20 @@ MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 64
 MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
 MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
 MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
-MD5 637930659665610f5bfe52f077fe5112 files/wvstreams-4.2.1-MOC-fix.patch 496
-MD5 7325e9c7f69a6d03560dc3b2c5700f7e files/wvstreams-4.2.1-external-xplc.patch 1213
-MD5 661c717a39715ecdc27330245f08c61f files/wvstreams-4.2.1-gcc41.patch 2221
-MD5 fe54c7dbb4770aad4ef9a5dcb44106ec files/wvstreams-4.2.1-linux-serial.patch 1649
-MD5 b44c2e240e03736bc5acc41ce7069455 files/wvstreams-4.2.1-ptr2int-cast.patch 356
-MD5 dcb8a3f592baa616e6123867b2fdced8 files/wvstreams-4.2.1-tcl_8_4.patch 1022
-MD5 62675720135a871a7332b3a924a6c0f9 files/wvstreams-4.2.1-wireless-user.patch 466
+MD5 d5c8bf76b0489abb5a4462b9d2908ced files/wvstreams-4.2.2-MOC-fix.patch 496
+MD5 3ddd94457f929b986d63723ddc9a0107 files/wvstreams-4.2.2-external-xplc.patch 1213
+MD5 cd3499947a721c4f42bfd5f7df77abd3 files/wvstreams-4.2.2-gcc41.patch 2467
+MD5 3728d5a371443c7bf725bd9518bcec6f files/wvstreams-4.2.2-linux-serial.patch 1649
+MD5 eb612ca9150b75c84d0a8dedeb2f483e files/wvstreams-4.2.2-tcl_8_4.patch 1022
+MD5 78cabecec5a214b5919c61cde43ab70c files/wvstreams-4.2.2-wireless-user.patch 466
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 MD5 e594922148c5a6f7087f083cf392e55c wvstreams-4.0.2-r1.ebuild 2558
 MD5 1176f09d8109b258ee1bbbe54919df5c wvstreams-4.0.2-r2.ebuild 2597
-MD5 c3f188d12bf345985f947c6066d92cc9 wvstreams-4.2.1.ebuild 2529
+MD5 74287de1f6b1e930b6461f2edd0f123d wvstreams-4.2.2.ebuild 2531
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyslfCRZPokWLroQRApC8AKDdnMCw4pGkVy2q4OOT3ZJSPtjTvQCgtpJy
-XIolGvRGiuj00xng/pzIu74=
-=afAp
+iD8DBQFD47pUjG8pv1lIUX4RAr5WAJ4z1EIuBbrIQyYkIIDyOC4s3Tm1IACgiBx8
+fDA+qd0qWhGl1hVXxhGroes=
+=ecSZ
 -----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
deleted file mode 100644
index 18183f172212..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e65127cdbbb8a9216a400e2cbceba4be wvstreams-4.2.1.tar.gz 9516958
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2
new file mode 100644
index 000000000000..2e9bdd6e87ec
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.2.2
@@ -0,0 +1 @@
+MD5 103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz 1269821
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-ptr2int-cast.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-ptr2int-cast.patch
deleted file mode 100644
index 7faf9441f4a5..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-ptr2int-cast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.2.1.orig/utils/wvhash.cc wvstreams-4.2.1/utils/wvhash.cc
---- wvstreams-4.2.1.orig/utils/wvhash.cc	2005-11-17 22:45:07.000000000 +0200
-+++ wvstreams-4.2.1/utils/wvhash.cc	2005-12-26 14:31:40.882751000 +0200
-@@ -30,6 +30,6 @@
- 
- unsigned WvHash(const void *p)
- {
--    return reinterpret_cast<unsigned>(p);
-+    return (unsigned)p;
- }
- 
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
deleted file mode 100644
index 2ec585e7eb8b..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-wireless-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/files/wvstreams-4.2.1-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-MOC-fix.patch
index cafa309d9cf3..9ab381c64801 100644
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-MOC-fix.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-MOC-fix.patch
@@ -1,6 +1,6 @@
-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
+diff -Nur wvstreams-4.2.2.orig/wvrules.mk wvstreams-4.2.2/wvrules.mk
+--- wvstreams-4.2.2.orig/wvrules.mk	2005-11-24 21:46:51.000000000 +0200
++++ wvstreams-4.2.2/wvrules.mk	2006-02-03 21:26:59.439036250 +0200
 @@ -296,7 +296,7 @@
  %.E: %.cc;	$(call wvcxx,$@,$<,$*,,-E)
  %.E: %.cpp;	$(call wvcxx,$@,$<,$*,,-E)
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-external-xplc.patch
index adfeba630c17..40db380bf2d5 100644
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-external-xplc.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-external-xplc.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Nur wvstreams-4.2.2.orig/configure.ac wvstreams-4.2.2/configure.ac
+--- wvstreams-4.2.2.orig/configure.ac	2006-01-12 20:31:50.000000000 +0200
++++ wvstreams-4.2.2/configure.ac	2006-02-03 21:24:41.546418500 +0200
+@@ -542,7 +542,6 @@
  
  # xplc
  if test "$with_xplc" != "no"; then
@@ -9,7 +9,7 @@ diff -Nru wvstreams-4.2.1.orig/configure.ac wvstreams-4.2.1/configure.ac
  	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 @@
+@@ -554,15 +553,6 @@
  	else
  	    with_xplc='no'
  	fi
@@ -25,7 +25,7 @@ diff -Nru wvstreams-4.2.1.orig/configure.ac wvstreams-4.2.1/configure.ac
      # 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 @@
+@@ -570,7 +560,7 @@
          AC_CONFIG_SUBDIRS(xplc)
          build_xplc=yes
          with_xplc='$(WVSTREAMS)/xplc'
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-gcc41.patch
index 20b40b741aee..ad9a72de8812 100644
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-gcc41.patch
@@ -1,17 +1,6 @@
-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)
-     {}
- };
---- wvstreams-4.2.1.orig/include/uniconfkeybak.h	2006-01-06 19:52:09.000000000 -0400
-+++ wvstreams-4.2.1/include/uniconfkey.h	2006-01-06 19:52:48.000000000 -0400
+diff -Nur wvstreams-4.2.2.orig/include/uniconfkey.h wvstreams-4.2.2/include/uniconfkey.h
+--- wvstreams-4.2.2.orig/include/uniconfkey.h	2005-11-24 21:46:46.000000000 +0200
++++ wvstreams-4.2.2/include/uniconfkey.h	2006-02-03 21:08:14.324721000 +0200
 @@ -113,7 +113,7 @@
      bool iswild() const;
  
@@ -21,8 +10,33 @@ diff -Nru wvstreams-4.2.1.orig/include/wvhttppool.h wvstreams-4.2.1/include/wvht
  
      /**
       * Returns the number of segments in this path.
---- wvstreams-4.2.1.orig/include/wvx509bak.h	2006-01-06 19:55:47.000000000 -0400
-+++ wvstreams-4.2.1/include/wvx509.h	2006-01-06 19:58:51.000000000 -0400
+diff -Nur wvstreams-4.2.2.orig/include/wvhttppool.h wvstreams-4.2.2/include/wvhttppool.h
+--- wvstreams-4.2.2.orig/include/wvhttppool.h	2005-11-24 21:46:46.000000000 +0200
++++ wvstreams-4.2.2/include/wvhttppool.h	2006-02-03 21:08:14.324721000 +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 -Nur wvstreams-4.2.2.orig/include/wvstring.h wvstreams-4.2.2/include/wvstring.h
+--- wvstreams-4.2.2.orig/include/wvstring.h	2005-11-24 21:46:46.000000000 +0200
++++ wvstreams-4.2.2/include/wvstring.h	2006-02-03 21:08:14.324721000 +0200
+@@ -393,7 +393,7 @@
+     
+ protected:
+     void copy_constructor(const WvFastString &s);
+-    inline void WvString::construct(const char *_str)
++    inline void construct(const char *_str)
+         {
+             link(&nullbuf, _str);
+     
+diff -Nur wvstreams-4.2.2.orig/include/wvx509.h wvstreams-4.2.2/include/wvx509.h
+--- wvstreams-4.2.2.orig/include/wvx509.h	2006-01-09 23:42:53.000000000 +0200
++++ wvstreams-4.2.2/include/wvx509.h	2006-02-03 21:08:14.324721000 +0200
 @@ -349,19 +349,19 @@
       * Set the Certificate to use X509v3, since that's all modern
       * PKI uses anyways :)
@@ -48,14 +62,3 @@ diff -Nru wvstreams-4.2.1.orig/include/wvhttppool.h wvstreams-4.2.1/include/wvht
      
      /**
       * Return the Subject alt name if it exists, and WvString::null if
---- wvstreams-4.2.1.orig/include/wvstringbak.h	2006-01-12 00:28:17.000000000 -0400
-+++ wvstreams-4.2.1/include/wvstring.h	2006-01-12 00:28:39.000000000 -0400
-@@ -393,7 +393,7 @@
-     
- protected:
-     void copy_constructor(const WvFastString &s);
--    inline void WvString::construct(const char *_str)
-+    inline void construct(const char *_str)
-         {
-             link(&nullbuf, _str);
-     
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-linux-serial.patch
index 025f3635d5c7..f5d5215745ce 100644
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-linux-serial.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-linux-serial.patch
@@ -1,6 +1,6 @@
-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
+diff -Nur wvstreams-4.2.2.orig/streams/wvmodem.cc wvstreams-4.2.2/streams/wvmodem.cc
+--- wvstreams-4.2.2.orig/streams/wvmodem.cc	2005-11-24 21:46:51.000000000 +0200
++++ wvstreams-4.2.2/streams/wvmodem.cc	2006-02-03 21:17:54.993010500 +0200
 @@ -192,22 +192,22 @@
      drain();
      
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-tcl_8_4.patch
index a9d952ee1883..a751ca150567 100644
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-tcl_8_4.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-tcl_8_4.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Nur wvstreams-4.2.2.orig/configure.ac wvstreams-4.2.2/configure.ac
+--- wvstreams-4.2.2.orig/configure.ac	2006-01-12 20:31:50.000000000 +0200
++++ wvstreams-4.2.2/configure.ac	2006-02-03 21:22:25.153894500 +0200
+@@ -483,9 +483,9 @@
  # tcl
  if test "$with_tcl" != "no"; then
      CPPFLAGS_save="$CPPFLAGS"
@@ -13,9 +13,9 @@ diff -Nru wvstreams-4.2.1.orig/configure.ac wvstreams-4.2.1/configure.ac
      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
+diff -Nur wvstreams-4.2.2.orig/vars.mk wvstreams-4.2.2/vars.mk
+--- wvstreams-4.2.2.orig/vars.mk	2005-11-24 21:46:51.000000000 +0200
++++ wvstreams-4.2.2/vars.mk	2006-02-03 21:22:25.153894500 +0200
 @@ -234,3 +234,5 @@
  
  libwvgtk.a libwvgtk.so: $(call objects,gtk)
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch
new file mode 100644
index 000000000000..cbb7f2db2c94
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch
@@ -0,0 +1,11 @@
+diff -Nur wvstreams-4.2.2.orig/linuxstreams/wvinterface.cc wvstreams-4.2.2/linuxstreams/wvinterface.cc
+--- wvstreams-4.2.2.orig/linuxstreams/wvinterface.cc	2005-11-24 21:46:47.000000000 +0200
++++ wvstreams-4.2.2/linuxstreams/wvinterface.cc	2006-02-03 21:19:32.635112750 +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.2.ebuild
index 915c02a51051..f8eeec7d7399 100644
--- a/net-libs/wvstreams/wvstreams-4.2.1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.3 2005/12/31 08:17:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.2.ebuild,v 1.1 2006/02/03 20:17:07 mrness Exp $
 
-inherit eutils
+inherit eutils fixheadtails
 
 DESCRIPTION="A network programming library in C++"
 HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
@@ -13,11 +13,10 @@ 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
+RDEPEND=">=sys-libs/db-3
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.7
-	>=dev-libs/xplc-0.3.12
+	>=dev-libs/xplc-0.3.13
 	qt? ( =x11-libs/qt-3* )
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
@@ -33,11 +32,10 @@ src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-ptr2int-cast.patch #fix compilation error on non-32-bit arches
 	epatch ${FILESDIR}/${P}-linux-serial.patch
 	epatch ${FILESDIR}/${P}-wireless-user.patch
 
-	if useq tcltk; then
+	if use tcltk; then
 		epatch ${FILESDIR}/${P}-tcl_8_4.patch
 	fi
 
@@ -49,7 +47,9 @@ src_unpack() {
 		|| die "failed to set current xplc version"
 	rm -r "${S}/xplc"
 
-	useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
+	use qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
+
+	ht_fix_file "${S}/configure.ac"
 }
 
 src_compile() {
@@ -59,7 +59,7 @@ src_compile() {
 	touch include/wvautoconf.h.in configure
 
 	local myconf
-	if useq qt; then
+	if use qt; then
 		myconf="--with-qt=/usr/qt/3/"
 		export MOC="/usr/qt/3/bin/moc"
 	else
@@ -81,6 +81,10 @@ src_compile() {
 	use doc && doxygen
 }
 
+src_test() {
+	ewarn "Test is disabled for this package!"
+}
+
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"