Added openssl to DEPEND unconditionally and closing bug #92457.

(Portage version: 2.0.51.22-r1)

3 files changed, 17 insertions, 33 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/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
 }