fix configure.ac to use the installed version of dev-libs/xplc instead the bundled version (#103059)

(Portage version: 2.0.51.22-r2)

5 files changed, 159 insertions, 20 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 6f618e94873e..0c18f332f828 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2005/07/02 18:33:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.63 2005/09/07 20:22:28 mrness Exp $
+
+*wvstreams-4.0.2-r1 (07 Sep 2005)
+
+  07 Sep 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.2-external-xplc.patch, +wvstreams-4.0.2-r1.ebuild:
+  Fix configure.ac to use the installed version of dev-libs/xplc
+  instead the bundled version (#103059).
 
   02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> wvstreams-4.0.2.ebuild:
   Stable on alpha.
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 5aab5f8be468..b9c778a1c059 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c3b66a15b0e14b7c49cf37a683e2989f ChangeLog 9269
+MD5 7bb7a8afe87393668a5338f46f9c1362 wvstreams-4.0.1-r2.ebuild 2190
+MD5 64f44658fca2ac775e77edb390122376 wvstreams-4.0.2-r1.ebuild 2583
 MD5 f15111c6abd9ff4de94cf3320adcf153 wvstreams-4.0.2.ebuild 2200
+MD5 c3b66a15b0e14b7c49cf37a683e2989f ChangeLog 9269
 MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
-MD5 7bb7a8afe87393668a5338f46f9c1362 wvstreams-4.0.1-r2.ebuild 2190
-MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
+MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
+MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
 MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68
+MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r1 68
 MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412
-MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
+MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68
 MD5 0cb9b1e5a568cd8f0e5f186a131a74a5 files/wvstreams-4.0.1-wireless-user.patch 466
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
-MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
-MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
 MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCxt3+Kf2g/qXtneoRAo4rAJ0b3LS0S2CL7OvpKc2DiLRhzYhYvQCfVDbB
-2EQOLm++OEVnhx5be/PNnrk=
-=HRKy
------END PGP SIGNATURE-----
+MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
+MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
+MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r1
new file mode 100644
index 000000000000..011b5158f39b
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r1
@@ -0,0 +1 @@
+MD5 ecb4e74ebaa1f45206f5d88eb34c5623 wvstreams-4.0.2.tar.gz 1098599
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch
new file mode 100644
index 000000000000..27a356eac6ea
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch
@@ -0,0 +1,44 @@
+diff -Nru wvstreams-4.0.2.orig/configure.ac wvstreams-4.0.2/configure.ac
+--- wvstreams-4.0.2.orig/configure.ac	2005-09-06 23:20:51.000000000 +0300
++++ wvstreams-4.0.2/configure.ac	2005-09-06 23:23:37.277564368 +0300
+@@ -546,32 +546,25 @@
+ 
+ # xplc
+ if test "$with_xplc" != "no"; then
+-    if test "$with_xplc" = ""; then
+-	if pkg-config --modversion xplc-0.3.10 2>/dev/null >/dev/null; then
+-            WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-0.3.10`])
+-	    WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-0.3.10`])
++	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}`])
+ 	    AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
+ 	    AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
+ 	    xplc_pc="xplc-${xplc_version}"
+ 	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])
+-	AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
+-	xplc_pc="xplc-${xplc_version}"
+-    fi
+-    # What if we can't find it?
+-    if test "$with_xplc" = "no" && test -d xplc; then
++
++	# What if we can't find it?
++	if test "$with_xplc" = "no" && test -d xplc; then
+         WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include])
+         WV_APPEND(LDFLAGS, [-L\$(WVSTREAMS)/xplc])
+         AC_CONFIG_SUBDIRS(xplc)
+         build_xplc=yes
+         with_xplc='$(WVSTREAMS)/xplc'
+-	xplc_pc='wvxplc'
+-    fi
++        xplc_pc='wvxplc'
++	fi
+ fi
+ 
+ # zlib
diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..446b45a18c36
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
@@ -0,0 +1,94 @@
+# 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.2-r1.ebuild,v 1.1 2005/09/07 20:22:28 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
+SRC_URI="http://www.csclub.uwaterloo.ca/~ja2morri/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="gtk qt vorbis speex fam qdbm pam slp ssl doc fftw tcltk debug"
+
+RDEPEND="virtual/libc
+	dev-libs/xplc
+	gtk? ( >=x11-libs/gtk+-2.2.0 )
+	qt? ( =x11-libs/qt-3* )
+	vorbis? ( >=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
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	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
+	epatch ${FILESDIR}/${P}-wireless-user.patch
+	epatch ${FILESDIR}/${P}-speex-const.patch
+
+	if useq tcltk; 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"
+
+	useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
+}
+
+src_compile() {
+	env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" #needed by xplc and tcl patch
+
+	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 vorbis ogg` \
+		`use_with vorbis` \
+		`use_with speex` \
+		`use_with fam` \
+		`use_with qdbm` \
+		`use_with pam` \
+		`use_with fftw` \
+		`use_with ssl openssl` \
+		`use_with slp openslp` \
+		`use_with tcltk tcl` \
+		`use_enable debug` \
+		--enable-verbose \
+		--with-bdb \
+		--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/*
+}