diff options
16 files changed, 14 insertions, 587 deletions
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog index 1e6b4438bf08..6e8c6af205f3 100644 --- a/net-libs/wvstreams/ChangeLog +++ b/net-libs/wvstreams/ChangeLog @@ -1,6 +1,19 @@ # 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.109 2007/06/28 18:23:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.110 2007/06/29 06:06:56 mrness Exp $ + + 29 Jun 2007; Alin Năstac <mrness@gentoo.org> + -files/wvstreams-4.2.2-MOC-fix.patch, + -files/wvstreams-4.2.2-as-needed.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-sane-cflags.patch, + -files/wvstreams-4.2.2-tcl_8_4.patch, + -files/wvstreams-4.2.2-uniconfd-ini.patch, + -files/wvstreams-4.2.2-wireless-user.patch, -wvstreams-4.2.2.ebuild, + -wvstreams-4.2.2-r2.ebuild, -wvstreams-4.2.2-r3.ebuild: + Remove obsolete versions. 28 Jun 2007; Raúl Porcel <armin76@gentoo.org> wvstreams-4.3-r2.ebuild: alpha stable wrt #179401 diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2 deleted file mode 100644 index 02e8894f22b4..000000000000 --- a/net-libs/wvstreams/files/digest-wvstreams-4.2.2 +++ /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/digest-wvstreams-4.2.2-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2 deleted file mode 100644 index 02e8894f22b4..000000000000 --- a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2 +++ /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/digest-wvstreams-4.2.2-r3 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r3 deleted file mode 100644 index 02e8894f22b4..000000000000 --- a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r3 +++ /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.2.2-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-MOC-fix.patch deleted file mode 100644 index 9ab381c64801..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-MOC-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) - --%.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.2.2-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-as-needed.patch deleted file mode 100644 index 99687ff01767..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-as-needed.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- wvstreams-4.2.2/configure.ac.orig 2006-05-07 13:28:59.000000000 +0200 -+++ wvstreams-4.2.2/configure.ac 2006-05-07 13:31:34.000000000 +0200 -@@ -517,16 +517,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 ---- wvstreams-4.2.2/wvrules.mk.orig 2006-05-07 13:39:44.000000000 +0200 -+++ wvstreams-4.2.2/wvrules.mk 2006-05-07 13:41:02.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.2.2-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-external-xplc.patch deleted file mode 100644 index 40db380bf2d5..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-external-xplc.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 -- 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}`]) -@@ -554,15 +553,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]) -@@ -570,7 +560,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.2.2-gcc41.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-gcc41.patch deleted file mode 100644 index ad9a72de8812..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-gcc41.patch +++ /dev/null @@ -1,64 +0,0 @@ -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; - - /** Returns true if the key has a trailing slash. */ -- bool UniConfKey::hastrailingslash() const; -+ bool hastrailingslash() const; - - /** - * Returns the number of segments in this path. -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 :) - */ -- void WvX509Mgr::set_version(); -+ void set_version(); - - /** - * Get and set the keyUsage field. - */ -- WvString WvX509Mgr::get_key_usage(); -- void WvX509Mgr::set_key_usage(WvStringParm values); -+ WvString get_key_usage(); -+ void set_key_usage(WvStringParm values); - - /** - * Get and set the extendedKeyUsage field. - */ -- WvString WvX509Mgr::get_ext_key_usage(); -- void WvX509Mgr::set_ext_key_usage(WvStringParm values); -+ WvString get_ext_key_usage(); -+ void set_ext_key_usage(WvStringParm values); - - /** - * Return the Subject alt name if it exists, and WvString::null if diff --git a/net-libs/wvstreams/files/wvstreams-4.2.2-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-linux-serial.patch deleted file mode 100644 index f5d5215745ce..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-linux-serial.patch +++ /dev/null @@ -1,42 +0,0 @@ -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(); - - #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.2.2-sane-cflags.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-sane-cflags.patch deleted file mode 100644 index 4435681ccb62..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-sane-cflags.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Nru wvstreams-4.2.2.orig/vars.mk wvstreams-4.2.2/vars.mk ---- wvstreams-4.2.2.orig/vars.mk 2007-02-08 20:50:16.000000000 +0200 -+++ wvstreams-4.2.2/vars.mk 2007-02-08 20:50:36.000000000 +0200 -@@ -66,10 +66,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)) -@@ -91,9 +91,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.2.2.orig/wvrules.mk wvstreams-4.2.2/wvrules.mk ---- wvstreams-4.2.2.orig/wvrules.mk 2007-02-08 20:50:16.000000000 +0200 -+++ wvstreams-4.2.2/wvrules.mk 2007-02-08 20:49:04.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.2.2-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-tcl_8_4.patch deleted file mode 100644 index a751ca150567..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-tcl_8_4.patch +++ /dev/null @@ -1,24 +0,0 @@ -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" -- 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 -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) - 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.2.2-uniconfd-ini.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-uniconfd-ini.patch deleted file mode 100644 index db7edd9a4d44..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-uniconfd-ini.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru wvstreams-4.2.2.orig/Makefile wvstreams-4.2.2/Makefile ---- wvstreams-4.2.2.orig/Makefile 2006-01-10 23:53:31.000000000 +0200 -+++ wvstreams-4.2.2/Makefile 2006-05-06 10:13:33.211497500 +0300 -@@ -182,8 +182,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.2.2-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch deleted file mode 100644 index 35092a93cf01..000000000000 --- a/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 <sys/sysctl.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.2-r2.ebuild b/net-libs/wvstreams/wvstreams-4.2.2-r2.ebuild deleted file mode 100644 index e97ebacaff5c..000000000000 --- a/net-libs/wvstreams/wvstreams-4.2.2-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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.2-r2.ebuild,v 1.8 2007/06/26 02:27:44 mr_bones_ Exp $ - -inherit eutils fixheadtails - -DESCRIPTION="A network programming library in C++" -HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams" -SRC_URI="http://open.nit.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? ( =x11-libs/qt-3* ) - qdbm? ( dev-db/qdbm ) - pam? ( >=sys-libs/pam-0.75 ) - slp? ( >=net-libs/openslp-1.0.9a ) - doc? ( app-doc/doxygen )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/autoconf-2.59" - -src_unpack() { - unpack ${A} - - epatch "${FILESDIR}/${P}-gcc41.patch" - 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}-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}" - env WANT_AUTOCONF=2.5 autoconf || 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() { - local myconf - if use qt3; then - myconf="--with-qt=/usr/qt/3/" - export MOC="/usr/qt/3/bin/moc" - else - myconf="--without-qt" - fi - econf ${myconf} \ - `use_with qdbm` \ - `use_with pam` \ - `use_with slp openslp` \ - `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() { - make 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 -} diff --git a/net-libs/wvstreams/wvstreams-4.2.2-r3.ebuild b/net-libs/wvstreams/wvstreams-4.2.2-r3.ebuild deleted file mode 100644 index bbc6352e2883..000000000000 --- a/net-libs/wvstreams/wvstreams-4.2.2-r3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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.2.2-r3.ebuild,v 1.2 2007/06/26 02:27:44 mr_bones_ Exp $ - -WANT_AUTOCONF=2.59 -WANT_AUTOMAKE=none - -inherit eutils fixheadtails autotools qt3 - -DESCRIPTION="A network programming library in C++" -HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams" -SRC_URI="http://open.nit.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}-gcc41.patch" - 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}-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 -} diff --git a/net-libs/wvstreams/wvstreams-4.2.2.ebuild b/net-libs/wvstreams/wvstreams-4.2.2.ebuild deleted file mode 100644 index e41a093aae5a..000000000000 --- a/net-libs/wvstreams/wvstreams-4.2.2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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.2.ebuild,v 1.10 2007/06/26 02:27:44 mr_bones_ Exp $ - -inherit eutils fixheadtails - -DESCRIPTION="A network programming library in C++" -HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams" -SRC_URI="http://open.nit.ca/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc sparc x86" -IUSE="gtk qt3 qdbm pam slp doc tcl debug" - -RDEPEND=">=sys-libs/db-3 - >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.7 - >=dev-libs/xplc-0.3.13 - qt3? ( =x11-libs/qt-3* ) - qdbm? ( dev-db/qdbm ) - pam? ( >=sys-libs/pam-0.75 ) - slp? ( >=net-libs/openslp-1.0.9a ) - doc? ( app-doc/doxygen ) - tcl? ( >=dev-lang/tcl-8.4 dev-lang/swig )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/autoconf-2.59" - -src_unpack() { - unpack ${A} - - epatch "${FILESDIR}/${P}-gcc41.patch" - epatch "${FILESDIR}/${P}-linux-serial.patch" - epatch "${FILESDIR}/${P}-wireless-user.patch" - - if use tcl; then - epatch "${FILESDIR}/${P}-tcl_8_4.patch" - 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" - rm -r "${S}/xplc" - - use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch" - - ht_fix_file "${S}/configure.ac" -} - -src_compile() { - env WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" #needed by xplc and tcl patch - #without following, the makefile would remove some files and request - #you to run ./configure again - touch include/wvautoconf.h.in configure - - local myconf - if use qt3; then - myconf="--with-qt=/usr/qt/3/" - export MOC="/usr/qt/3/bin/moc" - else - myconf="--without-qt" - fi - econf ${myconf} \ - $(use_with qdbm) \ - $(use_with pam) \ - $(use_with slp openslp) \ - $(use_with tcl) \ - $(use_enable debug) \ - --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_test() { - ewarn "Test is disabled for this package!" -} - -src_install() { - make 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 -} |