Closing #33896.

6 files changed, 88 insertions, 3 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 531ca44a28f3..8b3b4a55c515 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/wvstreams
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.10 2003/09/26 03:40:01 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.11 2004/02/22 12:58:32 aliz Exp $
+
+*wvstreams-3.74 (22 Feb 2004)
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> wvstreams-3.74.ebuild:
+  Version bump. ebuild contributed by Peter Colijn <sirjoltalot@yahoo.com> in
+  #33896.
 
 *wvstreams-3.70-r2 (31 Oct 2002)
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 6756cb4e5e85..52240a2e294a 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,6 +1,9 @@
 MD5 579701a83363285927f97576bbb3fea2 wvstreams-3.70-r2.ebuild 862
+MD5 033acb0abbf27bd237634836e48b2093 wvstreams-3.74.ebuild 970
+MD5 ceddaa2e00a1df07644baf56030b24d9 ChangeLog 1324
 MD5 dab468062cf36e0e81e72fb2a59299e0 files/3.70-gcc3.patch 3171
 MD5 5d649f23e7b31fb9224bace4c35bcf3e files/3.70-openssl.patch 470
+MD5 0ee90e98345afff96aaf89dbda1910fc files/digest-wvstreams-3.74 68
+MD5 c48022170e1e20f8222af4b4711373eb files/wvstreams-3.74-makefile.patch 363
 MD5 f2058097f693e07dadf248b1a3319db3 files/digest-wvstreams-3.70-r2 66
 MD5 b8b38bbbccf83a9024a243149fd9b7d1 files/wvstreams-3.70-gentoo.patch 1174
-MD5 ceddaa2e00a1df07644baf56030b24d9 ChangeLog 1324
diff --git a/net-libs/wvstreams/files/digest-wvstreams-3.74 b/net-libs/wvstreams/files/digest-wvstreams-3.74
new file mode 100644
index 000000000000..0978cee9f3fc
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-3.74
@@ -0,0 +1 @@
+MD5 f31e8e140e0d91e2617b166154051998 wvstreams-3.74.0.tar.gz 493757
diff --git a/net-libs/wvstreams/files/wvstreams-3.74-fPIC.patch b/net-libs/wvstreams/files/wvstreams-3.74-fPIC.patch
new file mode 100644
index 000000000000..f40395a0c2e2
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-3.74-fPIC.patch
@@ -0,0 +1,11 @@
+--- rules.mk	2004-02-22 12:20:43.004314615 +0000
++++ rules.mk	2004-02-22 12:21:58.419788467 +0000
+@@ -25,7 +25,7 @@
+ 	$(LINK_MSG)$(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
+ 
+ %.o: %.cc
+-	$(COMPILE_MSG)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
++	$(COMPILE_MSG)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $<
+ 	$(DEPEND_MSG)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -E $< | \
+ 		sed -e 's|^$(notdir $@)|$@|' > $(dir $@).$(DEPFILE)
+ 
diff --git a/net-libs/wvstreams/files/wvstreams-3.74-makefile.patch b/net-libs/wvstreams/files/wvstreams-3.74-makefile.patch
new file mode 100644
index 000000000000..cb63dcec196c
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-3.74-makefile.patch
@@ -0,0 +1,8 @@
+diff -ruN wvstreams-3.74.0/vars.mk wvstreams-3.74.0.fix/vars.mk
+--- wvstreams-3.74.0/vars.mk	2003-11-14 16:09:07.000000000 -0500
++++ wvstreams-3.74.0.fix/vars.mk	2003-11-20 00:07:53.000000000 -0500
+@@ -183,3 +183,4 @@
+ libwvutils.a libwvutils.so: $(call objects,utils)
+ libwvutils.so: -lz -lcrypt
+ 
++uniconf/daemon/uniconfdaemon: libuniconf.so libwvutils.so -ldb-3
diff --git a/net-libs/wvstreams/wvstreams-3.74.ebuild b/net-libs/wvstreams/wvstreams-3.74.ebuild
new file mode 100644
index 000000000000..18ba33019735
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-3.74.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
+SRC_URI="http://open.nit.ca/download/${P}.0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~hppa"
+IUSE="gtk qt oggvorbis speex fam berkdb gdbm pam zlib ssl"
+
+RDEPEND="gtk? ( >=x11-libs/gtk+-2.2.0 )
+	qt? ( >=x11-libs/qt-3.0.5 )
+	oggvorbis? ( >=media-libs/libogg-1.0
+		>=media-libs/libvorbis-1.0 )
+	speex? ( >=media-libs/speex-1.0 )
+	fam? ( >=app-admin/fam-2.7.0 )
+	>=sys-libs/db-3
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	pam? ( >=sys-libs/pam-0.75 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	ssl? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	virtual/glibc"
+
+S=${WORKDIR}/${P}.0
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+}
+
+src_compile() {
+	econf `use_with gtk` \
+		`use_with qt` \
+		`use_with oggvorbis ogg` \
+		`use_with oggvorbis vorbis` \
+		`use_with fam` \
+		`use_with gdbm` \
+		`use_with ssl openssl` \
+		`use_with pam` \
+		`use_with qt` \
+		`use_with zlib` \
+		--enable-verbose \
+		--with-bdb \
+		|| die
+	make || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}