From 27e2b62f6d047817443aebf0a8578a3119d174b5 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Sat, 11 Nov 2006 16:43:10 +0000 Subject: Remove old versions. (Portage version: 2.1.1) (Signed Manifest commit) --- net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 | 3 - net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1 | 3 - .../wvstreams/files/wvstreams-4.0.2-MOC-fix.patch | 12 -- .../files/wvstreams-4.0.2-external-xplc.patch | 44 ----- .../wvstreams/files/wvstreams-4.0.2-gcc41.patch | 22 --- .../files/wvstreams-4.0.2-linux-serial.patch | 193 --------------------- .../files/wvstreams-4.0.2-speex-const.patch | 24 --- .../wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch | 24 --- .../files/wvstreams-4.0.2-wireless-user.patch | 11 -- 9 files changed, 336 deletions(-) delete mode 100644 net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 delete mode 100644 net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1 delete mode 100644 net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch delete mode 100644 net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch delete mode 100644 net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch delete mode 100644 net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch delete mode 100644 net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch delete mode 100644 net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch delete mode 100644 net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch (limited to 'net-libs/wvstreams/files') diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 deleted file mode 100644 index e769764e3d9e..000000000000 --- a/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ecb4e74ebaa1f45206f5d88eb34c5623 wvstreams-4.0.2.tar.gz 1098599 -RMD160 8f041f3b8059d20230f114f171f6c31b6ad872f3 wvstreams-4.0.2.tar.gz 1098599 -SHA256 186a576115916598a3786df28aed7689bd9551c0ed3eda1a9f991f3bf5b18bb6 wvstreams-4.0.2.tar.gz 1098599 diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1 deleted file mode 100644 index 02e8894f22b4..000000000000 --- a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz 1269821 -RMD160 dece6092e847976d01568f20707701a8241d30d2 wvstreams-4.2.2.tar.gz 1269821 -SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14 wvstreams-4.2.2.tar.gz 1269821 diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch deleted file mode 100644 index f72d4a43b7ee..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.2-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.2-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch deleted file mode 100644 index 27a356eac6ea..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nru wvstreams-4.0.2.orig/configure.ac wvstreams-4.0.2/configure.ac ---- wvstreams-4.0.2.orig/configure.ac 2005-09-06 23:20:51.000000000 +0300 -+++ wvstreams-4.0.2/configure.ac 2005-09-06 23:23:37.277564368 +0300 -@@ -546,32 +546,25 @@ - - # xplc - if test "$with_xplc" != "no"; then -- if test "$with_xplc" = ""; then -- if pkg-config --modversion xplc-0.3.10 2>/dev/null >/dev/null; then -- WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-0.3.10`]) -- WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-0.3.10`]) -+ 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}`]) - AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE]) - AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no]) - xplc_pc="xplc-${xplc_version}" - 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]) -- AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no]) -- xplc_pc="xplc-${xplc_version}" -- fi -- # What if we can't find it? -- if test "$with_xplc" = "no" && test -d xplc; then -+ -+ # What if we can't find it? -+ if test "$with_xplc" = "no" && test -d xplc; then - WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include]) - WV_APPEND(LDFLAGS, [-L\$(WVSTREAMS)/xplc]) - AC_CONFIG_SUBDIRS(xplc) - build_xplc=yes - with_xplc='$(WVSTREAMS)/xplc' -- xplc_pc='wvxplc' -- fi -+ xplc_pc='wvxplc' -+ fi - fi - - # zlib diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch deleted file mode 100644 index a3c20831c36a..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/files/wvstreams-4.0.2-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch deleted file mode 100644 index 153d9ff04e2e..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff -Nru wvstreams-4.0.2.orig/config.guess wvstreams-4.0.2/config.guess ---- wvstreams-4.0.2.orig/config.guess 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/config.guess 2005-03-29 12:02:45.364438808 +0300 -@@ -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.2.orig/config.sub wvstreams-4.0.2/config.sub ---- wvstreams-4.0.2.orig/config.sub 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/config.sub 2005-03-29 12:02:45.365438656 +0300 -@@ -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.2.orig/debian/control wvstreams-4.0.2/debian/control ---- wvstreams-4.0.2.orig/debian/control 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/debian/control 2005-03-29 12:02:45.367438352 +0300 -@@ -3,7 +3,7 @@ - Priority: optional - Maintainer: Simon Law - Uploaders: James Morrison , Patrick Patterson --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.2.orig/streams/wvmodem.cc wvstreams-4.0.2/streams/wvmodem.cc ---- wvstreams-4.0.2.orig/streams/wvmodem.cc 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/streams/wvmodem.cc 2005-03-29 12:09:25.258645648 +0300 -@@ -192,22 +192,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) -- seterr("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) -- seterr("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.0.2-speex-const.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch deleted file mode 100644 index b20e8d90bb59..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru wvstreams-4.0.2.orig/oggspeex/wvoggspeex.cc wvstreams-4.0.2/oggspeex/wvoggspeex.cc ---- wvstreams-4.0.2.orig/oggspeex/wvoggspeex.cc 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/oggspeex/wvoggspeex.cc 2005-03-30 21:23:57.357906840 +0300 -@@ -15,6 +15,10 @@ - - #define OGG_SPEEX_DECODER_BUF_SIZE 16384 // at most 16k at once - -+#ifndef MAX_BYTES_PER_FRAME -+#define MAX_BYTES_PER_FRAME 2000 -+#endif -+ - /** Extracts a little endian integer from a buffer. */ - static unsigned long int getint_le(WvBuf &inbuf) - { -@@ -170,8 +174,7 @@ - // generate stream header - ogg_packet header; - SpeexHeader spxheader; -- SpeexMode *spxmode = speex_mode_list[mode()]; -- speex_init_header(&spxheader, samplingrate(), channels(), spxmode); -+ speex_init_header(&spxheader, samplingrate(), channels(), speex_mode_list[mode()]); - spxheader.vbr = vbr(); - spxheader.bitrate = nominalbitrate(); - spxheader.frames_per_packet = 1; diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch deleted file mode 100644 index da5fd71b5a34..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru wvstreams-4.0.2.orig/configure.ac wvstreams-4.0.2/configure.ac ---- wvstreams-4.0.2.orig/configure.ac 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/configure.ac 2005-03-29 12:11:53.268144784 +0300 -@@ -474,9 +474,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 -Nru wvstreams-4.0.2.orig/vars.mk wvstreams-4.0.2/vars.mk ---- wvstreams-4.0.2.orig/vars.mk 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/vars.mk 2005-03-29 12:11:53.267144936 +0300 -@@ -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 diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch deleted file mode 100644 index 6ba608656fee..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru wvstreams-4.0.2.orig/linuxstreams/wvinterface.cc wvstreams-4.0.2/linuxstreams/wvinterface.cc ---- wvstreams-4.0.2.orig/linuxstreams/wvinterface.cc 2005-03-24 04:01:23.000000000 +0200 -+++ wvstreams-4.0.2/linuxstreams/wvinterface.cc 2005-04-04 23:06:23.927608040 +0300 -@@ -21,6 +21,7 @@ - #include - #include - -+#include - #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */ - #include - -- cgit v1.2.3-65-gdbad