Add unfinished version to the tree (work in progress - #167939).

(Portage version: 2.1.2.2)

11 files changed, 331 insertions, 1 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 91a2eb91da7d..06412d14f4ec 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -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)
 
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.3 b/net-libs/wvstreams/files/digest-wvstreams-4.3
new file mode 100644
index 000000000000..3b2f6d51a4f1
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.3
@@ -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
index 000000000000..2fc39eac68da
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-64bit.patch
@@ -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
index 000000000000..135c4142e615
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch
@@ -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
index 000000000000..3e1f205a73c4
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch
@@ -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
index 000000000000..0e6307161a3d
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-external-xplc.patch
@@ -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
index 000000000000..5cb98809beda
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-linux-serial.patch
@@ -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
index 000000000000..749b9d4acee5
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-sane-cflags.patch
@@ -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
index 000000000000..664086eff623
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-uniconfd-ini.patch
@@ -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
index 000000000000..c7247f5fb9ba
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.3-wireless-user.patch
@@ -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
index 000000000000..9e9203956805
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.3.ebuild
@@ -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
+}