fix qt dependency (#84201)

(Portage version: 2.0.51.19)

5 files changed, 107 insertions, 11 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 67904f899479..b766959e7eb0 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.40 2005/02/17 19:59:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.41 2005/03/06 00:56:40 mrness Exp $
+
+*wvstreams-4.0.1-r2 (06 Mar 2005)
+
+  06 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-MOC-fix.patch, +wvstreams-4.0.1-r2.ebuild:
+  Fix qt dependencies; this library can't work with qt4 (#84201).
 
 *wvstreams-4.0.1-r1 (17 Feb 2005)
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 4f11a9ffab9f..fa622eddbc0e 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 6535f27b422b1dcfebdb9110f2ff55e4 wvstreams-4.0.1-r2.ebuild 2149
 MD5 ef0eabdb3c3c15706bee21630a0cdacb wvstreams-4.0.1-r1.ebuild 1975
 MD5 88beb02e20267e4fc08543358e899909 wvstreams-4.0-r1.ebuild 1872
 MD5 697c8eefbbfbf13b10451ba1e11d7c37 ChangeLog 6379
@@ -8,14 +6,8 @@ MD5 3dd88dcf536208ca7e46e823c82550be wvstreams-4.0.1.ebuild 1899
 MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
 MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
 MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r1 68
+MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68
 MD5 f606f86f5ef7d07937128fc8dc043c83 files/wvstreams-4.0-tcl_8_4.patch 822
 MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66
 MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1 68
 MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCFPe5jiC39V7gKu0RAjT4AKDEyyk0KGd9/H49ES80WJuU81qTywCfTaRp
-X5ZDiBw/9FqNDjko7qqK4c4=
-=YKqo
------END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r2
new file mode 100644
index 000000000000..967ae2bc824d
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r2
@@ -0,0 +1 @@
+MD5 89cdc4f979d1f6d745e173bc7485f325 wvstreams-4.0.1.tar.gz 1058667
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.1-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.0.1-MOC-fix.patch
new file mode 100644
index 000000000000..f72d4a43b7ee
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.1-MOC-fix.patch
@@ -0,0 +1,12 @@
+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/wvstreams-4.0.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
new file mode 100644
index 000000000000..f2ac6e6b7312
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.1 2005/03/06 00:56:40 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
+SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk debug"
+
+RDEPEND="virtual/libc
+	dev-libs/xplc
+	gtk? ( >=x11-libs/gtk+-2.2.0 )
+	qt? ( =x11-libs/qt-3* )
+	oggvorbis? ( >=media-libs/libogg-1.0
+		>=media-libs/libvorbis-1.0 )
+	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
+	fam? ( virtual/fam )
+	>=sys-libs/db-3
+	qdbm? ( dev-db/qdbm )
+	pam? ( >=sys-libs/pam-0.75 )
+	slp? ( >=net-libs/openslp-1.0.9a )
+	>=sys-libs/zlib-1.1.4
+	dev-libs/openssl
+	doc? ( app-doc/doxygen )
+	fftw? ( sci-libs/fftw )
+	tcltk? ( >=dev-lang/tcl-8.4* dev-lang/swig )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.59"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-linux-serial.patch || die "failed to patch"
+
+	if useq tcltk; then
+		epatch ${FILESDIR}/${P}-tcl_8_4.patch
+		env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
+	fi
+
+	useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
+}
+
+src_compile() {
+	local myconf
+	if useq qt; then
+		myconf="--with-qt=/usr/qt/3/"
+		export MOC="/usr/qt/3/bin/moc"
+	else
+		myconf="--without-qt"
+	fi
+	econf ${myconf} \
+		`use_with gtk` \
+		`use_with oggvorbis ogg` \
+		`use_with oggvorbis vorbis` \
+		`use_with speex` \
+		`use_with fam` \
+		`use_with qdbm` \
+		`use_with pam` \
+		`use_with fftw` \
+		`use_with slp openslp` \
+		`use_with tcltk tcl` \
+		`use_enable debug` \
+		--enable-verbose \
+		--with-bdb \
+		--with-openssl \
+		--with-zlib \
+		--with-xplc \
+		|| 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"
+	dodoc README COPYING.LIB
+	use doc && dohtml -r Docs/doxy-html/*
+}