Added openssl to DEPEND unconditionally and closing bug #92457.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 22 insertions, 38 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 08f92b514be8..4456903fa4b1 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.58 2005/06/05 01:07:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.59 2005/06/10 17:50:48 wolf31o2 Exp $
+
+  10 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  rdesktop-1.4.0-r1.ebuild, rdesktop-1.4.1.ebuild:
+  Added openssl to DEPEND unconditionally and closing bug #92457.
 
   05 Jun 2005; Joseph Jezak <josejx@gentoo.org> rdesktop-1.4.1.ebuild:
   Marked ppc stable.
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 53bdfd262e71..d85ebab0532d 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,10 +1,10 @@
-MD5 4881a51b53e3ff9e9e30b9e069a775f5 ChangeLog 7984
+MD5 b357d7368ccdcc90795d50d3218e7755 ChangeLog 8158
 MD5 6c6c99858d7cd726a669b18be5e25ef3 metadata.xml 556
 MD5 e8ec9629caa0d0271830c94c56df7ff0 rdesktop-1.3.1-r1.ebuild 1190
-MD5 4f90cb54640a2b193a565c36c1da624a rdesktop-1.4.0-r1.ebuild 1156
-MD5 5cd6c8ad1ee5b293bcfc5e48e432e016 rdesktop-1.4.1.ebuild 996
-MD5 a843f83ff14be3e87d5528c3c31416ed files/rdesktop-1.3.1-kde.patch 2409
+MD5 6634142fb880aca2cf6ddbbfb2319243 rdesktop-1.4.1.ebuild 843
+MD5 b9b738cf2239f1344180228c6f733df5 rdesktop-1.4.0-r1.ebuild 1004
+MD5 70717a72188f467d67a86be52598bdd5 files/digest-rdesktop-1.4.1 66
 MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1-r1 66
+MD5 a843f83ff14be3e87d5528c3c31416ed files/rdesktop-1.3.1-kde.patch 2409
 MD5 0af2b98117bd38ebe2c579b741d67e79 files/digest-rdesktop-1.4.0-r1 66
 MD5 cc065e1d7df4180f2596bb76bff5aa8c files/rdesktop-1.4.0-configure-with_arg.patch 1744
-MD5 70717a72188f467d67a86be52598bdd5 files/digest-rdesktop-1.4.1 66
diff --git a/net-misc/rdesktop/rdesktop-1.4.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.4.0-r1.ebuild
index d87c03d7cea3..1fc31c496025 100644
--- a/net-misc/rdesktop/rdesktop-1.4.0-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.4.0-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-misc/rdesktop/rdesktop-1.4.0-r1.ebuild,v 1.5 2005/05/28 01:47:48 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.4.0-r1.ebuild,v 1.6 2005/06/10 17:50:48 wolf31o2 Exp $
 
 inherit eutils
 
@@ -11,10 +11,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc-macos ~ppc64 sparc x86"
-IUSE="ssl debug ipv6 oss"
+IUSE="debug ipv6 oss"
 
 DEPEND="virtual/x11
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
+	>=dev-libs/openssl-0.9.6b"
 
 src_unpack() {
 	unpack ${A}
@@ -23,23 +23,13 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-	if use ssl
-	then
-		myconf="--with-openssl=/usr"
-	else
-		myconf="--without-openssl"
-	fi
-
 	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
+	econf \
+		--with-openssl=/usr \
 		`use_with debug` \
 		`use_with ipv6` \
 		`use_with oss sound` \
-		${myconf} || die
+		 || die
 
 	emake || die
 }
diff --git a/net-misc/rdesktop/rdesktop-1.4.1.ebuild b/net-misc/rdesktop/rdesktop-1.4.1.ebuild
index 6b2ddf8dcbf2..f37a75e78d53 100644
--- a/net-misc/rdesktop/rdesktop-1.4.1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.4.1.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-misc/rdesktop/rdesktop-1.4.1.ebuild,v 1.7 2005/06/05 01:07:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.4.1.ebuild,v 1.8 2005/06/10 17:50:48 wolf31o2 Exp $
 
 inherit eutils
 
@@ -11,29 +11,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc-macos ppc64 sparc x86"
-IUSE="ssl debug ipv6 oss"
+IUSE="debug ipv6 oss"
 
 DEPEND="virtual/x11
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
+	>=dev-libs/openssl-0.9.6b"
 
 src_compile() {
-	local myconf
-	if use ssl
-	then
-		myconf="--with-openssl=/usr"
-	else
-		myconf="--without-openssl"
-	fi
-
 	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
+	econf \
+		--with-openssl=/usr \
 		`use_with debug` \
 		`use_with ipv6` \
 		`use_with oss sound` \
-		${myconf} || die
+		|| die
 
 	emake || die
 }