diff options
| -rw-r--r-- | net-libs/wvstreams/ChangeLog | 14 | ||||
| -rw-r--r-- | net-libs/wvstreams/Manifest | 22 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/digest-wvstreams-4.0.1-r2 | 1 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 (renamed from net-libs/wvstreams/files/digest-wvstreams-4.0.2) | 0 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.0.1-MOC-fix.patch | 12 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.0.1-linux-serial.patch | 231 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.0.1-tcl_8_4.patch | 22 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.0.1-wireless-user.patch | 11 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.0.1-without-pam.patch | 12 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch | 22 | ||||
| -rw-r--r-- | net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild | 86 | ||||
| -rw-r--r-- | net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild (renamed from net-libs/wvstreams/wvstreams-4.0.2.ebuild) | 15 |
12 files changed, 55 insertions, 393 deletions
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog index 43106cdbcd52..0509ca0cba5c 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.70 2005/11/11 23:08:33 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.71 2005/11/26 10:33:12 mrness Exp $ + +*wvstreams-4.0.2-r2 (26 Nov 2005) + + 26 Nov 2005; Alin Nastac <mrness@gentoo.org> + -files/wvstreams-4.0.1-MOC-fix.patch, + -files/wvstreams-4.0.1-linux-serial.patch, + -files/wvstreams-4.0.1-tcl_8_4.patch, + -files/wvstreams-4.0.1-wireless-user.patch, + -files/wvstreams-4.0.1-without-pam.patch, + +files/wvstreams-4.0.2-gcc41.patch, -wvstreams-4.0.1-r2.ebuild, + -wvstreams-4.0.2.ebuild, +wvstreams-4.0.2-r2.ebuild: + Remove obsolete versions. Fix broken compilation on gcc-4.1 (#113488). 11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> wvstreams-4.0.2-r1.ebuild: diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest index b7fafb1639f1..3d9cb139a3c7 100644 --- a/net-libs/wvstreams/Manifest +++ b/net-libs/wvstreams/Manifest @@ -1,19 +1,13 @@ +MD5 01159bcd3cfc308d7c02d725e4189431 wvstreams-4.0.2-r2.ebuild 2601 +MD5 e594922148c5a6f7087f083cf392e55c wvstreams-4.0.2-r1.ebuild 2558 MD5 607a0aab122ee80692066f4909d1a240 ChangeLog 10306 -MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68 -MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68 -MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r1 68 -MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479 -MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563 -MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822 -MD5 0cb9b1e5a568cd8f0e5f186a131a74a5 files/wvstreams-4.0.1-wireless-user.patch 466 -MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418 +MD5 227de7f678ad662524292836709de75f metadata.xml 313 MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479 -MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659 +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 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412 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 227de7f678ad662524292836709de75f metadata.xml 313 -MD5 5918fbf27cbd22f3a676a5720e82ffb6 wvstreams-4.0.1-r2.ebuild 2169 -MD5 e594922148c5a6f7087f083cf392e55c wvstreams-4.0.2-r1.ebuild 2558 -MD5 dfdaac094acad1dc03d979c2fda35c97 wvstreams-4.0.2.ebuild 2179 +MD5 6448ad9ded98b10b600e0b3386d2c4bf files/wvstreams-4.0.2-gcc41.patch 698 +MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659 diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r2 deleted file mode 100644 index 967ae2bc824d..000000000000 --- a/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 89cdc4f979d1f6d745e173bc7485f325 wvstreams-4.0.1.tar.gz 1058667 diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.2 b/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 index 011b5158f39b..011b5158f39b 100644 --- a/net-libs/wvstreams/files/digest-wvstreams-4.0.2 +++ b/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 diff --git a/net-libs/wvstreams/files/wvstreams-4.0.1-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.0.1-MOC-fix.patch deleted file mode 100644 index f72d4a43b7ee..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.1-MOC-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur wvstreams-4.0.1.orig/wvrules.mk wvstreams-4.0.1/wvrules.mk ---- wvstreams-4.0.1.orig/wvrules.mk 2005-03-05 17:11:10.000000000 +0100 -+++ wvstreams-4.0.1/wvrules.mk 2005-03-05 17:11:57.000000000 +0100 -@@ -284,7 +284,7 @@ - %.E: %.cc; $(call wvcxx,$@,$<,$*,,-E) - %.E: %.cpp; $(call wvcxx,$@,$<,$*,,-E) - --%.moc: %.h; moc -o $@ $< -+%.moc: %.h; $(MOC) -o $@ $< - - ../%.so:; @echo "Shared library $@ does not exist!"; exit 1 - ../%.a:; @echo "Library $@ does not exist!"; exit 1 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 deleted file mode 100644 index fd4c87c09677..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.1-linux-serial.patch +++ /dev/null @@ -1,231 +0,0 @@ -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/files/wvstreams-4.0.1-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.0.1-tcl_8_4.patch deleted file mode 100644 index 8749f02e9027..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.1-tcl_8_4.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vars.mk.orig 2004-11-18 16:15:05.000000000 +0200 -+++ vars.mk 2005-01-03 08:10:55.377724088 +0200 -@@ -251,3 +251,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 ---- configure.ac.orig 2004-11-18 16:15:05.000000000 +0200 -+++ configure.ac 2005-01-03 08:10:55.378723936 +0200 -@@ -473,9 +473,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 --git a/net-libs/wvstreams/files/wvstreams-4.0.1-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.0.1-wireless-user.patch deleted file mode 100644 index 79acbedf4543..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.1-wireless-user.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru wvstreams-4.0.1.orig/linuxstreams/wvinterface.cc wvstreams-4.0.1/linuxstreams/wvinterface.cc ---- wvstreams-4.0.1.orig/linuxstreams/wvinterface.cc 2004-11-18 16:15:05.000000000 +0200 -+++ wvstreams-4.0.1/linuxstreams/wvinterface.cc 2005-04-04 23:04:09.079108128 +0300 -@@ -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.0.1-without-pam.patch b/net-libs/wvstreams/files/wvstreams-4.0.1-without-pam.patch deleted file mode 100644 index 7540ef0c4a0c..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.1-without-pam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru wvstreams-4.0.1.orig/streams/wvpam.cc wvstreams-4.0.1/streams/wvpam.cc ---- wvstreams-4.0.1.orig/streams/wvpam.cc 2004-11-18 16:15:05.000000000 +0200 -+++ wvstreams-4.0.1/streams/wvpam.cc 2005-03-15 09:38:36.416927072 +0200 -@@ -68,7 +68,7 @@ - - bool WvPam::authenticate(WvStringParm rhost, WvStringParm user, WvStringParm password) - { -- return fail; -+ return false; - } - - WvString WvPam::getuser() const diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch new file mode 100644 index 000000000000..a3c20831c36a --- /dev/null +++ b/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch @@ -0,0 +1,22 @@ +--- include/wvhttppool.h 2005-03-23 22:01:23.000000000 -0400 ++++ include/wvhttppoolcp.h 2005-11-24 01:20:42.000000000 -0400 +@@ -57,7 +57,7 @@ + WvString linkname; + WvUrl url; + +- WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url) ++ WvUrlLink(WvStringParm _linkname, WvStringParm _url) + : linkname(_linkname), url(_url) + {} + }; +--- include/unilistgen.h 2005-03-23 22:01:23.000000000 -0400 ++++ include/unilistgencp.h 2005-11-24 01:28:13.000000000 -0400 +@@ -31,7 +31,7 @@ + { + public: + UniListGen(UniConfGenList *_l); +- virtual UniListGen::~UniListGen() { delete l; } ++ virtual ~UniListGen() { delete l; } + + UniConfGenList *l; + UniConfGenList::Iter i; diff --git a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild deleted file mode 100644 index e0a94e45c652..000000000000 --- a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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-r2.ebuild,v 1.13 2005/10/16 11:06:29 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 vorbis speex fam qdbm pam slp doc fftw tcltk debug" - -RDEPEND="virtual/libc - >=sys-libs/db-3 - >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.7 - dev-libs/xplc - gtk? ( >=x11-libs/gtk+-2.2.0 ) - qt? ( =x11-libs/qt-3* ) - vorbis? ( >=media-libs/libvorbis-1.0 ) - speex? ( media-libs/speex !=media-libs/speex-1.1.4 ) - fam? ( virtual/fam ) - qdbm? ( dev-db/qdbm ) - pam? ( >=sys-libs/pam-0.75 ) - slp? ( >=net-libs/openslp-1.0.9a ) - 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 - epatch ${FILESDIR}/${P}-wireless-user.patch - epatch ${FILESDIR}/${P}-without-pam.patch - - if useq tcltk; then - epatch ${FILESDIR}/${P}-tcl_8_4.patch - env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" - fi - - useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch -} - -src_compile() { - 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 gtk` \ - `use_with vorbis ogg` \ - `use_with 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-zlib \ - --with-openssl \ - --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.2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild index d7de175f68ff..8c28f3895564 100644 --- a/net-libs/wvstreams/wvstreams-4.0.2.ebuild +++ b/net-libs/wvstreams/wvstreams-4.0.2-r2.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.2.ebuild,v 1.12 2005/10/16 11:06:29 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild,v 1.1 2005/11/26 10:33:12 mrness Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="http://www.csclub.uwaterloo.ca/~ja2morri/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha ~amd64 hppa ppc sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug" RDEPEND="virtual/libc @@ -37,19 +37,28 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} ; cd ${S} + epatch ${FILESDIR}/${P}-gcc41.patch epatch ${FILESDIR}/${P}-linux-serial.patch epatch ${FILESDIR}/${P}-wireless-user.patch epatch ${FILESDIR}/${P}-speex-const.patch if useq tcltk; then epatch ${FILESDIR}/${P}-tcl_8_4.patch - env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" 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" + useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch } src_compile() { + env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" #needed by xplc and tcl patch + local myconf if useq qt; then myconf="--with-qt=/usr/qt/3/" |