correct flags and dependencies by merging 4.0 ebuild with the one attached to #70420

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 71f435862d4ba6c1f1d2a1dbc698be04df053a02..811812941b7bdf555dd394fd5cd7ec420fe3b282 100644 (file)
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.28 2004/11/30 06:27:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.29 2004/12/08 17:15:45 mrness Exp $
+
+*wvstreams-4.0-r1 (08 Dec 2004)
+
+  08 Dec 2004; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  +wvstreams-4.0-r1.ebuild:
+  Correct flags and dependencies; add doc flag for installing doxygen generated
+  documentation. See bug #70420.
 
   30 Nov 2004; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.ebuild:
   Change fam dependency to virtual/fam.

diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 2188ac80dcf8bcf8e7e5e726e8f9bab69431d152..7f559cdafb341d15f5b29a493d5e1f66ae53573f 100644 (file)
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6cddb193e6cfb753f609342fe4f79822 ChangeLog 4417
+MD5 376e22bdc309c1f7bbc0c10ce5e83d1b ChangeLog 4653
 MD5 84906df12ff06c74e269a55f292f09ac wvstreams-3.70-r2.ebuild 869
 MD5 d991640e2ff373e482b3c3478282fef1 wvstreams-3.74.ebuild 1392
 MD5 76eee65ed9ee7babf51f46e167d82bc1 wvstreams-3.75.ebuild 1736
 MD5 4ac90373143f90a1bddea60711f40568 wvstreams-3.75-r1.ebuild 1808
 MD5 32456871fa203363eaa06cf51c12ada1 wvstreams-4.0.ebuild 1654
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
+MD5 cf234f97ef7c59b20613c4a508d2e681 wvstreams-4.0-r1.ebuild 1858
 MD5 dab468062cf36e0e81e72fb2a59299e0 files/3.70-gcc3.patch 3171
 MD5 5d649f23e7b31fb9224bace4c35bcf3e files/3.70-openssl.patch 470
 MD5 f2058097f693e07dadf248b1a3319db3 files/digest-wvstreams-3.70-r2 66
@@ -24,10 +25,11 @@ MD5 9f5fc56a6f1636fa2b6673a16888c0ea files/digest-wvstreams-3.75-r1 68
 MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0 66
 MD5 4c60e22939d4518a795262edf85e5bf3 files/wvcrash-uclibc-gentoo.patch 384
 MD5 f606f86f5ef7d07937128fc8dc043c83 files/wvstreams-4.0-tcl_8_4.patch 822
+MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBrBLfjtv59x0+BrURAqZQAJ4p0qjF/VmzP/zZL7XtukoTsvDpkwCbBK8p
-ehZuPg7Pn+cSt+ZSAZ5Coxc=
-=fBbb
+iD8DBQFBtzbMjtv59x0+BrURArYtAJ97Wo5/eVctNjfvVQsWYblvdedfXwCfUQtG
+3KSVDA7JxIIqX1ez92VlSBA=
+=aNkY
 -----END PGP SIGNATURE-----

diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.0-r1
new file mode 100644 (file)
index 0000000..933c885
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.0-r1
@@ -0,0 +1 @@
+MD5 f2b282248b53653d7531cc4b3e33c77b wvstreams-4.0.tar.gz 3004311

diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index 1e11e7bbd01bcf88f447397d0e8d8baff83838ff..7a9df68dc18f7b10553b6532bc2a190f960b68cd 100644 (file)
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-dialup</herd>
+<longdescription>A network programming library in C++</longdescription>
 </pkgmetadata>

diff --git a/net-libs/wvstreams/wvstreams-4.0-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0-r1.ebuild
new file mode 100644 (file)
index 0000000..b4ecfc4
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0-r1.ebuild,v 1.1 2004/12/08 17:15:45 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="~x86 ~sparc ~alpha ~amd64 ~hppa ~ppc"
+IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk"
+
+RDEPEND="virtual/libc
+       dev-libs/xplc
+       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 !=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? ( dev-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}
+
+       if useq tcltk; then
+               epatch ${FILESDIR}/${P}-tcl_8_4.patch
+               env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
+       fi
+}
+
+src_compile() {
+       econf `use_with gtk` \
+               `use_with qt` \
+               `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` \
+               --enable-verbose \
+               --with-bdb \
+               --with-openssl \
+               --with-zlib \
+               || 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/*
+}