Closing #42603.

6 files changed, 110 insertions, 2 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index f78f9e2edcd9..7ced22590486 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.12 2004/02/24 16:30:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.13 2004/04/03 14:05:24 aliz Exp $
+
+*wvstreams-3.75 (03 Apr 2004)
+
+  03 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wvstreams-3.75.ebuild:
+  Version bump and fixing speex dependecies when oggvorbis is enabled. Closing
+  #45797.
 
   24 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> wvstreams-3.74.ebuild,
   files/wvstreams-3.74-makefile.patch:
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 76e32048a610..1723d5ccf0d2 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,10 +1,14 @@
 MD5 579701a83363285927f97576bbb3fea2 wvstreams-3.70-r2.ebuild 862
+MD5 4026556d65fadedf11e3b885e186975f wvstreams-3.75.ebuild 1295
 MD5 f4ace71bf92972c0ac5c067e5876c10c wvstreams-3.74.ebuild 1253
-MD5 92b4f3cacc6dadf1d39cb3be7987dcfe ChangeLog 1700
+MD5 8600aea6f8a08a161f9b2ce7359dd3f8 ChangeLog 1892
 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 9f5fc56a6f1636fa2b6673a16888c0ea files/digest-wvstreams-3.75 68
+MD5 c48022170e1e20f8222af4b4711373eb files/wvstreams-3.75-makefile.patch 363
 MD5 185e2acbb79c70873208936653ff2407 files/wvstreams-3.74-fPIC.patch 431
+MD5 1ac6673ae2b040012b3ff91a32335610 files/wvstreams-3.75-fPIC.patch 1197
 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
diff --git a/net-libs/wvstreams/files/digest-wvstreams-3.75 b/net-libs/wvstreams/files/digest-wvstreams-3.75
new file mode 100644
index 000000000000..d368057d0506
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-3.75
@@ -0,0 +1 @@
+MD5 8682997d2494c7defbe9b211067635b2 wvstreams-3.75.0.tar.gz 526295
diff --git a/net-libs/wvstreams/files/wvstreams-3.75-fPIC.patch b/net-libs/wvstreams/files/wvstreams-3.75-fPIC.patch
new file mode 100644
index 000000000000..988f5e3e9399
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-3.75-fPIC.patch
@@ -0,0 +1,31 @@
+--- wvrules.mk	2004-03-30 11:06:53.678390208 +0000
++++ wvrules.mk	2004-03-30 11:07:24.470786433 +0000
+@@ -98,8 +98,8 @@
+ 
+ # macros that expand to the object files in the given directories
+ objects=$(sort $(foreach type,c cc,$(call objects_$(type),$1)))
+-objects_c=$(patsubst %.c,%.o,$(wildcard $(addsuffix /*.c,$1)))
+-objects_cc=$(patsubst %.cc,%.o,$(wildcard $(addsuffix /*.cc,$1)))
++objects_c=$(patsubst %.c,%.fpic.o,$(wildcard $(addsuffix /*.c,$1)))
++objects_cc=$(patsubst %.cc,%.fpic.o,$(wildcard $(addsuffix /*.cc,$1)))
+ 
+ # we need a default rule, since the 'includes' below causes trouble
+ .PHONY: default all
+@@ -225,7 +225,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
+--- qt/rules.mk	2004-03-30 11:49:37.765484752 +0000
++++ qt/rules.mk	2004-03-30 11:49:45.994461367 +0000
+@@ -1,4 +1,4 @@
+ 
+-qt/wvqtstreamclone.o: include/wvqtstreamclone.moc
+-qt/wvqthook.o: include/wvqthook.moc
++qt/wvqtstreamclone.fpic.o: include/wvqtstreamclone.moc
++qt/wvqthook.fpic.o: include/wvqthook.moc
+ 
diff --git a/net-libs/wvstreams/files/wvstreams-3.75-makefile.patch b/net-libs/wvstreams/files/wvstreams-3.75-makefile.patch
new file mode 100644
index 000000000000..f28e1e5758a5
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-3.75-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
diff --git a/net-libs/wvstreams/wvstreams-3.75.ebuild b/net-libs/wvstreams/wvstreams-3.75.ebuild
new file mode 100644
index 000000000000..3e13ea0f4560
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-3.75.ebuild
@@ -0,0 +1,58 @@
+# 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://people.nit.ca/~jim/${P}.0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc -alpha ~amd64 -hppa"
+IUSE="gtk qt oggvorbis speex fam berkdb gdbm pam"
+
+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 ) )
+	:
+		( 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 )
+	>=sys-libs/zlib-1.1.4
+	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 pam` \
+		`use_with qt` \
+		--enable-verbose \
+		--with-bdb \
+		--with-openssl \
+		--with-zlib \
+		|| die
+	make || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}