Removing old versions. Added configure patch by Richard Brown <mynamewasgone@gmail.com> and closing bug #88684.

Package-Manager: portage-2.0.51.19

7 files changed, 106 insertions, 52 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index ec66cd5ba80a..102aff0aca79 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,14 @@
 # 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.48 2005/03/15 15:03:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.49 2005/04/14 12:59:07 wolf31o2 Exp $
+
+*rdesktop-1.4.0-r1 (14 Apr 2005)
+
+  14 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/rdesktop-1.4.0-configure-with_arg.patch, -rdesktop-1.3.1.ebuild,
+  +rdesktop-1.4.0-r1.ebuild, -rdesktop-1.4.0.ebuild:
+  Removing old versions. Added configure patch by Richard Brown
+  <mynamewasgone@gmail.com> and closing bug #88684.
 
 *rdesktop-1.4.0 (15 Mar 2005)
 
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index e1a4dc4b16c9..04485e0d28d5 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,9 +1,8 @@
-MD5 e8ec9629caa0d0271830c94c56df7ff0 rdesktop-1.3.1-r1.ebuild 1190
-MD5 31b995e09e4693642375b2e5c7d744be rdesktop-1.3.1.ebuild 980
-MD5 5bbb73fd61d5d8024b0ffb3645a52345 ChangeLog 6587
-MD5 f6364748f7de75fa272547cb7aa449c1 rdesktop-1.4.0.ebuild 1004
+MD5 b20a56f4353a330b66d1619067d45291 ChangeLog 6919
 MD5 6c6c99858d7cd726a669b18be5e25ef3 metadata.xml 556
-MD5 a843f83ff14be3e87d5528c3c31416ed files/rdesktop-1.3.1-kde.patch 2409
-MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1 66
-MD5 0af2b98117bd38ebe2c579b741d67e79 files/digest-rdesktop-1.4.0 66
+MD5 e8ec9629caa0d0271830c94c56df7ff0 rdesktop-1.3.1-r1.ebuild 1190
+MD5 d560f21aed2e7eb37a11a657902cbd44 rdesktop-1.4.0-r1.ebuild 1163
 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
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.1 b/net-misc/rdesktop/files/digest-rdesktop-1.3.1
deleted file mode 100644
index 928168058f7c..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 968a1e3f5161bab80c306df31c54cfb1 rdesktop-1.3.1.tar.gz 139686
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.4.0 b/net-misc/rdesktop/files/digest-rdesktop-1.4.0-r1
index 4e7f7c523112..4e7f7c523112 100644
--- a/net-misc/rdesktop/files/digest-rdesktop-1.4.0
+++ b/net-misc/rdesktop/files/digest-rdesktop-1.4.0-r1
diff --git a/net-misc/rdesktop/files/rdesktop-1.4.0-configure-with_arg.patch b/net-misc/rdesktop/files/rdesktop-1.4.0-configure-with_arg.patch
new file mode 100644
index 000000000000..241211bd4748
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.4.0-configure-with_arg.patch
@@ -0,0 +1,84 @@
+--- rdesktop-1.4.0/configure	2005-03-02 17:35:03.000000000 +0000
++++ rdesktop-1.4.0-richard/configure	2005-04-11 13:07:30.964584294 +0100
+@@ -6679,10 +6718,15 @@
+ # Check whether --with-ipv6 or --without-ipv6 was given.
+ if test "${with_ipv6+set}" = set; then
+   withval="$with_ipv6"
+-   cat >>confdefs.h <<\_ACEOF
++
++        if test $withval != "no";
++        then
++	    cat >>confdefs.h <<\_ACEOF
+ #define IPv6 1
+ _ACEOF
+ 
++	fi
++
+ fi;
+ 
+ 
+@@ -6693,40 +6737,60 @@
+ # Check whether --with-debug or --without-debug was given.
+ if test "${with_debug+set}" = set; then
+   withval="$with_debug"
+-   cat >>confdefs.h <<\_ACEOF
++
++        if test $withval != "no";
++        then
++            cat >>confdefs.h <<\_ACEOF
+ #define WITH_DEBUG 1
+ _ACEOF
+ 
++	fi
++
+ fi;
+ 
+ 
+ # Check whether --with-debug-kbd or --without-debug-kbd was given.
+ if test "${with_debug_kbd+set}" = set; then
+   withval="$with_debug_kbd"
+-   cat >>confdefs.h <<\_ACEOF
++
++        if test $withval != "no";
++        then
++            cat >>confdefs.h <<\_ACEOF
+ #define WITH_DEBUG_KBD 1
+ _ACEOF
+ 
++	fi
++
+ fi;
+ 
+ 
+ # Check whether --with-debug-rdp5 or --without-debug-rdp5 was given.
+ if test "${with_debug_rdp5+set}" = set; then
+   withval="$with_debug_rdp5"
+-   cat >>confdefs.h <<\_ACEOF
++
++        if test $withval != "no";
++        then
++            cat >>confdefs.h <<\_ACEOF
+ #define WITH_DEBUG_RDP5 1
+ _ACEOF
+ 
++	fi
++
+ fi;
+ 
+ 
+ # Check whether --with-debug-clipboard or --without-debug-clipboard was given.
+ if test "${with_debug_clipboard+set}" = set; then
+   withval="$with_debug_clipboard"
+-   cat >>confdefs.h <<\_ACEOF
++
++        if test $withval != "no";
++        then
++            cat >>confdefs.h <<\_ACEOF
+ #define WITH_DEBUG_CLIPBOARD 1
+ _ACEOF
+ 
++	fi
++
+ fi;
+ 
+ 
diff --git a/net-misc/rdesktop/rdesktop-1.3.1.ebuild b/net-misc/rdesktop/rdesktop-1.3.1.ebuild
deleted file mode 100644
index cc0ed40dc80a..000000000000
--- a/net-misc/rdesktop/rdesktop-1.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.3.1.ebuild,v 1.13 2005/01/20 11:36:55 gongloo Exp $
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ia64 ppc64"
-IUSE="ssl debug"
-
-DEPEND="virtual/x11
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	local myconf
-	use ssl \
-		&& myconf="--with-openssl=/usr/include/openssl" \
-		|| myconf="--without-openssl"
-
-	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--sharedir=/usr/share/${PN} \
-		`use_with debug` \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
-}
diff --git a/net-misc/rdesktop/rdesktop-1.4.0.ebuild b/net-misc/rdesktop/rdesktop-1.4.0-r1.ebuild
index 39d4619517cd..22e5656eaf6a 100644
--- a/net-misc/rdesktop/rdesktop-1.4.0.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.ebuild,v 1.1 2005/03/15 15:03:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.4.0-r1.ebuild,v 1.1 2005/04/14 12:59:07 wolf31o2 Exp $
 
 inherit eutils
 
@@ -16,6 +16,12 @@ IUSE="ssl debug ipv6 oss"
 DEPEND="virtual/x11
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
+src_unpack() {
+	unpack ${A}
+	# Patch provided by Richard Brown <mynamewasgone@gmail.com> to bug #88684
+	epatch ${FILESDIR}/${P}-configure-with_arg.patch
+}
+
 src_compile() {
 	local myconf
 	if use ssl