Added version 1.3.1 as ~x86 and cleaning up old versions.

10 files changed, 16 insertions, 357 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index d40abbf29826..c1b244607fda 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/rdesktop
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.27 2003/12/10 14:18:59 wolf31o2 Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.28 2004/01/24 20:36:07 wolf31o2 Exp $
+
+  24 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  rdesktop-1.2.0-r1.ebuild, rdesktop-1.2.0.ebuild, rdesktop-1.3.0.ebuild,
+  files/rdesktop-paste.patch:
+  Added version 1.3.1 as ~x86 and cleaning up old versions.
 
 *rdesktop-1.3.0-r1 (10 Dec 2003)
 
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 14b0cdea9746..ac2c578ea872 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,16 +1,9 @@
-MD5 a7a251ea23814836483058004b463fbd rdesktop-1.2.0-r1.ebuild 1588
-MD5 1690ad41c9162d1fec17f57f9ed140ad rdesktop-1.3.1.ebuild 1652
+MD5 a6fa5d808cc8436fcbcee6f12b4eb26c rdesktop-1.3.1.ebuild 1023
 MD5 9e864866223caa100bc605ade0535733 rdesktop-1.3.0-r1.ebuild 1878
-MD5 7c24e74ed6702aed29b4797fe2147fdf rdesktop-1.2.0.ebuild 1004
-MD5 14772f3d2a9f73d7f84169468befa67b rdesktop-1.3.0.ebuild 1875
-MD5 834009fb792c3839596fedf693270e9a ChangeLog 3722
+MD5 c7977c8e1869a05106476396c1e4acbc ChangeLog 3941
 MD5 ba5cbd501be829c4dd810293a86e28c2 metadata.xml 554
 MD5 4120908a83d84e4150a2cce191f2bbc0 files/rdesktop-1.3.0-last-two-certs.patch 1146
-MD5 9781aae48c8d45e8762d2c21670fab9e files/rdesktop-paste.patch 5766
-MD5 a79de715834dc26c2336e60271ea10d2 files/digest-rdesktop-1.2.0 66
-MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0 66
 MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1 66
 MD5 575e5d9fe8a75cb24dcf3c4d1f4348b4 files/rdesktop-1.3.0-geometry.patch 1868
-MD5 a79de715834dc26c2336e60271ea10d2 files/digest-rdesktop-1.2.0-r1 66
 MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0-r1 66
 MD5 4ff22b875cb790ab578b6ef3426225ee files/rdesktop-1.3.0-builtin-license.patch 2395
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.2.0 b/net-misc/rdesktop/files/digest-rdesktop-1.2.0
deleted file mode 100644
index 514ca21fb75d..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5e108e83e9de883e965a2bb0c7e7036 rdesktop-1.2.0.tar.gz 125674
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.2.0-r1 b/net-misc/rdesktop/files/digest-rdesktop-1.2.0-r1
deleted file mode 100644
index 514ca21fb75d..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5e108e83e9de883e965a2bb0c7e7036 rdesktop-1.2.0.tar.gz 125674
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.0 b/net-misc/rdesktop/files/digest-rdesktop-1.3.0
deleted file mode 100644
index 10a010eeceb8..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8108781d227221a823c34b861486a5d rdesktop-1.3.0.tar.gz 136704
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.1 b/net-misc/rdesktop/files/digest-rdesktop-1.3.1
new file mode 100644
index 000000000000..928168058f7c
--- /dev/null
+++ b/net-misc/rdesktop/files/digest-rdesktop-1.3.1
@@ -0,0 +1 @@
+MD5 968a1e3f5161bab80c306df31c54cfb1 rdesktop-1.3.1.tar.gz 139686
diff --git a/net-misc/rdesktop/files/rdesktop-paste.patch b/net-misc/rdesktop/files/rdesktop-paste.patch
deleted file mode 100644
index 4a5bbdfa4bcd..000000000000
--- a/net-misc/rdesktop/files/rdesktop-paste.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -bBdru -x Makeconf -x TAGS rdesktop-1.2.0/proto.h rdesktop-1.2.0-paste/proto.h
---- rdesktop-1.2.0/proto.h	Tue Jan 28 12:11:01 2003
-+++ rdesktop-1.2.0-paste/proto.h	Wed Apr  2 17:47:56 2003
-@@ -77,6 +77,7 @@
- void ensure_remote_modifiers(uint32 ev_time, key_translation tr);
- void reset_modifier_keys(unsigned int state);
- void rdp_send_scancode(uint32 time, uint16 flags, uint8 scancode);
-+void rdp_send_keystring(uint32 time, const unsigned char *string);
- /* xwin.c */
- void mwm_hide_decorations(void);
- BOOL get_key_state(unsigned int state, uint32 keysym);
-diff -bBdru -x Makeconf -x TAGS rdesktop-1.2.0/xkeymap.c rdesktop-1.2.0-paste/xkeymap.c
---- rdesktop-1.2.0/xkeymap.c	Thu Jan 30 11:04:07 2003
-+++ rdesktop-1.2.0-paste/xkeymap.c	Thu Apr  3 13:16:49 2003
-@@ -19,6 +19,7 @@
- */
- 
- #include <X11/Xlib.h>
-+#include <X11/Xutil.h>
- #define XK_MISCELLANY
- #include <X11/keysymdef.h>
- #include <ctype.h>
-@@ -41,6 +42,15 @@
- static int min_keycode;
- static uint16 remote_modifier_state = 0;
- 
-+typedef struct
-+{
-+    KeySym       sym;
-+    unsigned int keycode;
-+    unsigned int state;
-+} ascii_map_entry;
-+    
-+static ascii_map_entry ascii_map[256];
-+
- static void update_modifier_state(uint8 scancode, BOOL pressed);
- 
- static void
-@@ -208,6 +218,52 @@
- 	return True;
- }
- 
-+static void
-+init_ascii_entry(unsigned int keycode, unsigned int state)
-+{
-+    XKeyEvent       event;
-+    unsigned char   buf[4];
-+    KeySym          sym;
-+    ascii_map_entry *ent;
-+    
-+    event.type = KeyPress;
-+    event.display = display;
-+    event.keycode = keycode;
-+    event.state = state;
-+    if (XLookupString(&event, buf, sizeof(buf), &sym, NULL) == 1)
-+    {
-+	ent = &ascii_map[*buf];
-+	if (ent->sym == NoSymbol)
-+	{
-+	    ent->sym = sym;
-+	    ent->keycode = keycode;
-+	    ent->state = state;
-+	}
-+    }
-+}
-+    
-+static void
-+init_ascii_map(unsigned int min_keycode, unsigned int max_keycode)
-+{
-+    int           ix;
-+    unsigned int  key;
-+
-+    for (ix = 0; ix < 256; ix++)
-+	ascii_map[ix].sym = NoSymbol;
-+    for (key = min_keycode; key <= max_keycode; key++)
-+    {
-+	init_ascii_entry(key, 0);
-+	init_ascii_entry(key, ShiftMask);
-+	init_ascii_entry(key, LockMask);
-+	init_ascii_entry(key, ControlMask);
-+	init_ascii_entry(key, Mod1Mask);
-+	init_ascii_entry(key, Mod2Mask);
-+	init_ascii_entry(key, Mod3Mask);
-+	init_ascii_entry(key, Mod4Mask);
-+	init_ascii_entry(key, Mod5Mask);
-+    }
-+    ascii_map[10] = ascii_map[13]; /* Make '\n' send the Return key */
-+}
- 
- /* Before connecting and creating UI */
- void
-@@ -231,6 +287,7 @@
- 	}
- 
- 	XDisplayKeycodes(display, &min_keycode, (int *) &max_keycode);
-+	init_ascii_map(min_keycode, max_keycode);
- }
- 
- /* Handles, for example, multi-scancode keypresses (which is not
-@@ -602,3 +659,26 @@
- 		rdp_send_input(time, RDP_INPUT_SCANCODE, flags, scancode, 0);
- 	}
- }
-+
-+void
-+rdp_send_keystring(uint32 time, const unsigned char *string)
-+{
-+    unsigned        ch;
-+    ascii_map_entry *ent;
-+    key_translation tr;
-+    
-+    while ((ch = *string++))
-+    {
-+	ent = &ascii_map[ch];
-+	if (ent->sym == NoSymbol)
-+	    fprintf(stderr, "ascii_map failed for %03o\n", ch);
-+	else
-+	{
-+	    tr = xkeymap_translate_key(ent->sym, ent->keycode, ent->state);
-+	    ensure_remote_modifiers(time, tr);	    
-+	    rdp_send_scancode(time, tr.modifiers, tr.scancode);
-+	    rdp_send_scancode(time, tr.modifiers|RDP_KEYRELEASE, tr.scancode);
-+	}
-+    }
-+}
-+    
-diff -bBdru -x Makeconf -x TAGS rdesktop-1.2.0/xwin.c rdesktop-1.2.0-paste/xwin.c
---- rdesktop-1.2.0/xwin.c	Thu Jan 30 11:27:45 2003
-+++ rdesktop-1.2.0-paste/xwin.c	Wed Apr  2 18:06:14 2003
-@@ -20,6 +20,7 @@
- 
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <X11/Xatom.h>
- #include <time.h>
- #include <errno.h>
- #include "rdesktop.h"
-@@ -47,7 +48,7 @@
- static XIC IC;
- static XModifierKeymap *mod_map;
- static Cursor current_cursor;
--static Atom protocol_atom, kill_atom;
-+static Atom protocol_atom, kill_atom, selection_atom;
- 
- /* endianness */
- static BOOL host_be;
-@@ -457,6 +458,7 @@
- 	protocol_atom = XInternAtom(display, "WM_PROTOCOLS", True);
- 	kill_atom = XInternAtom(display, "WM_DELETE_WINDOW", True);
- 	XSetWMProtocols(display, wnd, &kill_atom, 1);
-+	selection_atom = XInternAtom(display, "RdeskopSelect", False);
- 
- 	return True;
- }
-@@ -495,6 +497,30 @@
- 	}
- }
- 
-+static void
-+xwin_send_selection(XEvent *xevent)
-+{
-+    Atom          act_type;
-+    int           act_fmt;
-+    unsigned long nitems;
-+    unsigned long bytes_after;
-+    unsigned char *prop;
-+    
-+    if (xevent->xselection.property == None)
-+	fputs("selection conversion failed\n", stderr);
-+    else
-+    {
-+	if (XGetWindowProperty(display, wnd, selection_atom, 0, 256, True,
-+			       XA_STRING, &act_type, &act_fmt,
-+			       &nitems, &bytes_after, &prop) == 0)
-+	{
-+	    rdp_send_keystring(xevent->xselection.time, prop);
-+	}
-+	else
-+	    fputs("failed to fetch selection window property\n", stderr);
-+    }
-+}
-+
- /* Process all events in Xlib queue 
-    Returns 0 after user quit, 1 otherwise */
- static int
-@@ -594,10 +620,23 @@
- 				break;
- 
- 			case ButtonPress:
-+			        if (xevent.xbutton.button == Button2)
-+				{
-+				    /* request the primary selection */
-+				    XConvertSelection(display,
-+						      XA_PRIMARY,
-+						      XA_STRING,
-+						      selection_atom,
-+						      wnd,
-+						      xevent.xbutton.time);
-+				        break;
-+				}
- 				flags = MOUSE_FLAG_DOWN;
- 				/* fall through */
- 
- 			case ButtonRelease:
-+			        if (xevent.xbutton.button == Button2)
-+				        break;
- 				button = xkeymap_translate_button(xevent.xbutton.button);
- 				if (button == 0)
- 					break;
-@@ -677,6 +716,9 @@
- 				}
- 				break;
- 
-+		        case SelectionNotify:
-+			    xwin_send_selection(&xevent);
-+			    break;
- 		}
- 	}
- 	/* Keep going */
diff --git a/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild
deleted file mode 100644
index c0465c1c6073..000000000000
--- a/net-misc/rdesktop/rdesktop-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,56 +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.0-r1.ebuild,v 1.6 2003/09/25 13:25:15 lu_zero 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 ~alpha ~sparc"
-IUSE="ssl debug"
-
-DEPEND="x11-base/xfree
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Apply patch from Steve Fosdick to do rudimentary X->TS
-	# 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
-
-	# Note there is an additional patch further down that conversation
-	# to send a middle click to TS if the clipboard is empty.  I
-	# don't think I'll need that.  If somebody wants to add it here,
-	# that's fine for a later rev...
-}
-
-src_compile() {
-	local myconf
-	use ssl \
-		&& myconf="--with-openssl=/usr/include/openssl" \
-		|| myconf="--without-openssl"
-
-	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} \
-		`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.3.0.ebuild b/net-misc/rdesktop/rdesktop-1.3.0.ebuild
deleted file mode 100644
index 424f3bf79403..000000000000
--- a/net-misc/rdesktop/rdesktop-1.3.0.ebuild
+++ /dev/null
@@ -1,66 +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.3.0.ebuild,v 1.8 2003/12/10 14:18:59 wolf31o2 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 alpha sparc amd64 ia64"
-IUSE="ssl debug"
-
-DEPEND="x11-base/xfree
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Adds extra functionality to the geometry settings, allowing for example:
-	# -g1024x768+10+10
-	# Patch is from Martin Gallwey and ported from rdesktop 1.2.0 and submitted
-	# by Daniele Foci (sunscan@sunscan.org)
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=664800&group_id=24366&atid=381349
-
-	epatch ${FILESDIR}/rdesktop-1.3.0-geometry.patch
-
-	# This second patch gives rdesktop the ability to emulate Windows 2000's
-	# built-in license.  This is especially useful for testing deployments.  I
-	# am including it for PXES.
-
-	epatch ${FILESDIR}/rdesktop-1.3.0-builtin-license.patch
-
-	# This third patch has been applied to the rdesktop CVS and fixes some
-	# problems with certificates on Windows 2000 and 2003, using RDP5.
-
-	epatch ${FILESDIR}/rdesktop-1.3.0-last-two-certs.patch
-}
-
-src_compile() {
-	local myconf
-	use ssl \
-		&& myconf="--with-openssl=/usr/include/openssl" \
-		|| myconf="--without-openssl"
-
-	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} \
-		`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.2.0.ebuild b/net-misc/rdesktop/rdesktop-1.3.1.ebuild
index 276f0481cc27..9b3cc4409b8c 100644
--- a/net-misc/rdesktop/rdesktop-1.2.0.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2003/09/05 22:01:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.1.ebuild,v 1.1 2004/01/24 20:36:07 wolf31o2 Exp $
 
 DESCRIPTION="A Remote Desktop Protocol Client"
 HOMEPAGE="http://rdesktop.sourceforge.net/"
@@ -8,12 +8,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha ~sparc"
+KEYWORDS="~x86"
 IUSE="ssl debug"
 
 DEPEND="x11-base/xfree
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
+src_unpack() {
+	unpack ${A}
+}
+
 src_compile() {
 	local myconf
 	use ssl \