Fix DEPEND by adding unconditional dependency of openssl (#108095). Mark 4.0.2-r1 stable on x86.

(Portage version: 2.0.51.22-r3)

5 files changed, 36 insertions, 41 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 14a3170888b5..383354294085 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,11 @@
 # 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.64 2005/09/21 23:22:29 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.65 2005/10/16 11:06:29 mrness Exp $
+
+  16 Oct 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild, wvstreams-4.0.2-r1.ebuild:
+  Fix DEPEND by adding unconditional dependency of openssl (#108095). Mark
+  4.0.2-r1 stable on x86.
 
   21 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
   Adding to cpp herd, marking mrness as primary maintainer
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 50b2fa732d88..c35e2d78b780 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 b55abb6f11b9f8b0c2187da7929b8608 wvstreams-4.0.1-r2.ebuild 2169
+MD5 a35805a370627b4577850d3e3e19b06c wvstreams-4.0.2-r1.ebuild 2564
+MD5 a08b428622772c97c8276c0b5759affa wvstreams-4.0.2.ebuild 2179
 MD5 5afbb6c9b10819c9983704108a9b764b ChangeLog 9655
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
-MD5 7bb7a8afe87393668a5338f46f9c1362 wvstreams-4.0.1-r2.ebuild 2190
-MD5 f15111c6abd9ff4de94cf3320adcf153 wvstreams-4.0.2.ebuild 2200
-MD5 11e06fc4313947d55f6cc02a9ea4eb25 wvstreams-4.0.2-r1.ebuild 2585
+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 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
-MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
-MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
 MD5 0cb9b1e5a568cd8f0e5f186a131a74a5 files/wvstreams-4.0.1-wireless-user.patch 466
-MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
-MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412
+MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
 MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
 MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
-MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r1 68
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
 MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMetECRZPokWLroQRAnzJAJ9U8X/VnBVKPVdYwgWbJKvrpEdzIQCeM0l/
-Rv4E4F6tl5N5UYILERI4+Gc=
-=CaOI
------END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
index 831699324066..e0a94e45c652 100644
--- a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2005/05/29 10:53:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.13 2005/10/16 11:06:29 mrness Exp $
 
 inherit eutils
 
@@ -11,21 +11,21 @@ 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 vorbis speex fam qdbm pam slp ssl doc fftw tcltk debug"
+IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
+	>=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
 	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 )"
@@ -66,13 +66,13 @@ src_compile() {
 		`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-openssl \
 		--with-xplc \
 		|| die "configure failed"
 	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
index 446b45a18c36..923b4bb73abf 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild,v 1.2 2005/10/16 11:06:29 mrness Exp $
 
 inherit eutils
 
@@ -10,22 +10,22 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
+IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
+	>=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
 	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 )"
@@ -74,13 +74,13 @@ src_compile() {
 		`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-openssl \
 		--with-xplc \
 		|| die "configure failed"
 	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
diff --git a/net-libs/wvstreams/wvstreams-4.0.2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
index 35dc373f6753..d7de175f68ff 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.11 2005/07/02 18:33:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.12 2005/10/16 11:06:29 mrness Exp $
 
 inherit eutils
 
@@ -11,21 +11,21 @@ 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"
+IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
+	>=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
 	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 )"
@@ -66,13 +66,13 @@ src_compile() {
 		`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-openssl \
 		--with-xplc \
 		|| die "configure failed"
 	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"