$DEBUG -> use debug

6 files changed, 28 insertions, 105 deletions

diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.2_beta1-r1 b/net-misc/rdesktop/files/digest-rdesktop-1.2_beta1-r1
deleted file mode 100644
index a4bbae4901ca..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.2_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db39ce21a03832495b75a8b338525a15 rdesktop-1.2beta1.tar.gz 107568
diff --git a/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild
index b7d9a876bd3f..1b67992b012a 100644
--- a/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild
@@ -1,32 +1,26 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild,v 1.10 2003/02/10 10:32:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild,v 1.11 2003/08/03 04:01:58 vapier Exp $
 
-IUSE="ssl"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A Remote Desktop Protocol Client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE="ssl debug"
 
 DEPEND="virtual/x11
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
 src_compile() {
-	local myconf
-	use ssl && myconf="--with-openssl"
-	use ssl || myconf="--without-openssl"
-
-	[ "${DEBUG}" ] && myconf="${myconf} --with-debug"
-
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		${myconf} || die
+		`use_with ssl openssl` \
+		`use_with debug` \
+		|| die
 
 	use ssl && echo "CFLAGS += -I/usr/include/openssl" >> Makeconf
 
@@ -40,7 +34,7 @@ src_compile() {
 	emake || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	dobin rdesktop
 	doman rdesktop.1
 	dodoc COPYING
diff --git a/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild b/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild
index 1832607a98e3..4de822a0d662 100644
--- a/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild
@@ -1,24 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild,v 1.4 2003/02/10 10:32:00 seemant Exp $
-
-inherit eutils
-
-IUSE="ssl"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild,v 1.5 2003/08/03 04:01:58 vapier Exp $
 
 PATCH_PV="19-9-0"
 PATCH_PV_SED=".${PATCH_PV//-/.}"
 MY_P=${P/$PATCH_PV_SED}
-
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
 SRC_URI="mirror://sourceforge/rdesktop/${MY_P}.tar.gz
 	http://bibl4.oru.se/projects/rdesktop/rdesktop-unified-patch${PATCH_PV}.bz2"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
+IUSE="ssl debug"
 
 DEPEND="virtual/x11
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
@@ -30,17 +26,12 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use ssl && myconf="--with-openssl"
-	use ssl || myconf="--without-openssl"
-
-	[ "${DEBUG}" ] && myconf="${myconf} --with-debug"
-
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		${myconf} || die
+		`use_with ssl openssl` \
+	        `use_with debug` \
+		|| die
 
 	use ssl && echo "CFLAGS += -I/usr/include/openssl" >> Makeconf
 
@@ -55,7 +46,7 @@ src_compile() {
 	emake || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	dobin rdesktop
 	doman rdesktop.1
 	dodoc COPYING CHANGES readme.txt rdp-srvr-readme.txt
diff --git a/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild
index a8a769b47f1a..92b093b18f2c 100644
--- a/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild
@@ -1,20 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild,v 1.3 2003/07/13 14:31:36 aliz Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild,v 1.4 2003/08/03 04:01:58 vapier Exp $
 
 DESCRIPTION="A Remote Desktop Protocol Client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~alpha ~sparc"
+IUSE="ssl debug"
 
 DEPEND="x11-base/xfree 
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
@@ -27,7 +22,7 @@ src_unpack() {
 	# cut'n'paste.  This isn't really supported by the RDP4 protocol,
 	# but official support for clipboard interaction will be in RDP5.
 	# http://sf.net/mailarchive/forum.php?thread_id=1920955&forum_id=8865
-	epatch ${FILESDIR}/rdesktop-paste.patch || die "epatch failed"
+	epatch ${FILESDIR}/rdesktop-paste.patch
 
 	# Note there is an additional patch further down that conversation
 	# to send a middle click to TS if the clipboard is empty.  I
@@ -37,13 +32,10 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	
 	use ssl \
 		&& myconf="--with-openssl=/usr/include/openssl" \
 		|| myconf="--without-openssl"
-	    
-	[ "${DEBUG}" ] && myconf="${myconf} --with-debug"
-	
+
 	sed -e "s:-O2:${CFLAGS}:g" Makefile > Makefile.tmp
 	mv Makefile.tmp Makefile
 	echo "CFLAGS += ${CXXFLAGS}" >> Makeconf
@@ -52,13 +44,13 @@ src_compile() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sharedir=/usr/share/${PN} \
+		`use_with debug` \
 		${myconf} || die
 
 	emake || die 
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install
-	
 	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
 }
diff --git a/net-misc/rdesktop/rdesktop-1.2.0.ebuild b/net-misc/rdesktop/rdesktop-1.2.0.ebuild
index fcc7742583c7..09a14df6b295 100644
--- a/net-misc/rdesktop/rdesktop-1.2.0.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.2.0.ebuild
@@ -1,30 +1,24 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.2.0.ebuild,v 1.3 2003/03/26 07:15:10 bcowan Exp $
-
-IUSE="ssl"
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.2.0.ebuild,v 1.4 2003/08/03 04:01:58 vapier Exp $
 
 DESCRIPTION="A Remote Desktop Protocol Client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 alpha ~sparc"
+IUSE="ssl debug"
 
 DEPEND="x11-base/xfree 
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
 src_compile() {
 	local myconf
-	
 	use ssl \
 		&& myconf="--with-openssl=/usr/include/openssl" \
 		|| myconf="--without-openssl"
-	    
-	[ "${DEBUG}" ] && myconf="${myconf} --with-debug"
 	
 	sed -e "s:-O2:${CFLAGS}:g" Makefile > Makefile.tmp
 	mv Makefile.tmp Makefile
@@ -34,13 +28,13 @@ src_compile() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sharedir=/usr/share/${PN} \
+		`use_with debug` \
 		${myconf} || die
 
 	emake || die 
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install
-	
 	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
 }
diff --git a/net-misc/rdesktop/rdesktop-1.2_beta1-r1.ebuild b/net-misc/rdesktop/rdesktop-1.2_beta1-r1.ebuild
deleted file mode 100644
index 2488631556b2..000000000000
--- a/net-misc/rdesktop/rdesktop-1.2_beta1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.2_beta1-r1.ebuild,v 1.6 2003/07/13 14:31:36 aliz Exp $
-
-IUSE="ssl"
-
-MY_P="${P/_/}"
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha ~sparc"
-
-DEPEND="x11-base/xfree 
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_compile() {
-	local myconf
-	
-	use ssl \
-		&& myconf="--with-openssl=/usr/include/openssl" \
-		|| myconf="--without-openssl"
-	    
-	[ "${DEBUG}" ] && myconf="${myconf} --with-debug"
-	
-	sed -e "s:-O2:${CFLAGS}:g" Makefile > Makefile.tmp
-	mv Makefile.tmp Makefile
-	echo "CFLAGS += ${CXXFLAGS}" >> Makeconf
-	
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--sharedir=/usr/share/${PN} \
-		${myconf} || die
-
-	emake || die 
-}
-
-src_install () {
-	make DESTDIR=${D} install
-	
-	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
-}