Fix 180313 and clean up old builds

Package-Manager: portage-2.1.2.9

11 files changed, 359 insertions, 121 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 70dcfcce22a2..2e3d2de15930 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.92 2007/07/22 08:15:37 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.93 2007/07/28 04:30:55 mjolnir Exp $
+
+*rdesktop-1.5.0-r3 (28 Jul 2007)
+
+  28 Jul 2007; Martin Jackson <mjolnir@gentoo.org>
+  +files/rdesktop-keymap-additional, +files/rdesktop-keymap-cs,
+  +files/rdesktop-keymap-sk, -rdesktop-1.4.1.ebuild, -rdesktop-1.5.0.ebuild,
+  -rdesktop-1.5.0-r1.ebuild, +rdesktop-1.5.0-r3.ebuild:
+  Fix #180313 and remove older ebuilds
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   rdesktop-1.4.1.ebuild, rdesktop-1.5.0.ebuild:
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 6e9ac2cc126c..275c7a5d96e5 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -2,41 +2,38 @@ AUX rdesktop-1.5.0-libX11-segfault-fix.patch 444 RMD160 a20a41b2ee302b40065efb33
 MD5 0f155f65c31de653c777fa9cc6c73d0a files/rdesktop-1.5.0-libX11-segfault-fix.patch 444
 RMD160 a20a41b2ee302b40065efb338112e3c0c452d1a3 files/rdesktop-1.5.0-libX11-segfault-fix.patch 444
 SHA256 07a41cbf405ea992954b2691e5d9e4360ee64aace28f39e85a081b700a3ec1c3 files/rdesktop-1.5.0-libX11-segfault-fix.patch 444
-DIST rdesktop-1.4.1.tar.gz 216017 RMD160 c49a2425f1e00f5933d3873f6ea742b2ad4fea0c SHA1 412ffa06dc216cc7ce1082a8a4912778f82425d9 SHA256 db3da6016ceec07efda277adcb175b14c4e5255b0f85137f4a1dce79b0ee5144
+AUX rdesktop-keymap-additional 1568 RMD160 002873aa8c51fd8bb16357a57d90148c9a64c130 SHA1 6b84deeee4fc368459fcee897f90328be1f3c1db SHA256 3642f38bff8902fa1b5093001ce8e076dcfeddf906b745173dec4ce61da42196
+MD5 13fef9b3c6f99b37262abb99c4d3fee4 files/rdesktop-keymap-additional 1568
+RMD160 002873aa8c51fd8bb16357a57d90148c9a64c130 files/rdesktop-keymap-additional 1568
+SHA256 3642f38bff8902fa1b5093001ce8e076dcfeddf906b745173dec4ce61da42196 files/rdesktop-keymap-additional 1568
+AUX rdesktop-keymap-cs 1536 RMD160 bd529b2b5f4adffd4f6914d6067ac23b0edb30da SHA1 d6cdae7769e22fbdf5cc13c4ef447e6ffe5def15 SHA256 91bd229fdb7fb1f0d9e6d0dcf35a429a2c51afa1fb8e2b3414852dc528218b6e
+MD5 38ef5d240c00c0f105ff560136465c5b files/rdesktop-keymap-cs 1536
+RMD160 bd529b2b5f4adffd4f6914d6067ac23b0edb30da files/rdesktop-keymap-cs 1536
+SHA256 91bd229fdb7fb1f0d9e6d0dcf35a429a2c51afa1fb8e2b3414852dc528218b6e files/rdesktop-keymap-cs 1536
+AUX rdesktop-keymap-sk 1561 RMD160 0f8378b6eadd549ef735d92887d1c51003bbfbdf SHA1 117cf53e7c914f698cdd6cb77881bf2e580afbf4 SHA256 33024ca566d97b5c041d3ca45634d3baa075b456389140bd5991e3927fd37b07
+MD5 c4cf50d35aebcea5d81cc1116fab0bf6 files/rdesktop-keymap-sk 1561
+RMD160 0f8378b6eadd549ef735d92887d1c51003bbfbdf files/rdesktop-keymap-sk 1561
+SHA256 33024ca566d97b5c041d3ca45634d3baa075b456389140bd5991e3927fd37b07 files/rdesktop-keymap-sk 1561
 DIST rdesktop-1.5.0.tar.gz 245137 RMD160 350e08166d0b7620b4ed9c6594addae7ec53d15a SHA1 e3086bf865191eed41631813125f482e279c7f3d SHA256 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
-EBUILD rdesktop-1.4.1.ebuild 977 RMD160 244257c3f7a0a477d245740a2e68731a63962f89 SHA1 17dc0a6d8936cd521e7d804c88c887dede0cc676 SHA256 b8bed6190b947d15126c84bbaf533a509b3459aa3f6335f36527ca98daf54678
-MD5 d85602a25193e4fe15a45a323378aaf5 rdesktop-1.4.1.ebuild 977
-RMD160 244257c3f7a0a477d245740a2e68731a63962f89 rdesktop-1.4.1.ebuild 977
-SHA256 b8bed6190b947d15126c84bbaf533a509b3459aa3f6335f36527ca98daf54678 rdesktop-1.4.1.ebuild 977
-EBUILD rdesktop-1.5.0-r1.ebuild 1281 RMD160 021fc02792ae913a08f37f82699bdda2a117b16a SHA1 3991dde1f1518e499dd4aaafc2ca6bb11ee06725 SHA256 92be5f80889cc01f7d7580039e57985766a9542b187f7704513d462b85433b2c
-MD5 afeedbb79c5edc04823d115e77e9f8cc rdesktop-1.5.0-r1.ebuild 1281
-RMD160 021fc02792ae913a08f37f82699bdda2a117b16a rdesktop-1.5.0-r1.ebuild 1281
-SHA256 92be5f80889cc01f7d7580039e57985766a9542b187f7704513d462b85433b2c rdesktop-1.5.0-r1.ebuild 1281
 EBUILD rdesktop-1.5.0-r2.ebuild 1376 RMD160 333cf55ff5cc28f6519d2b4fe6bd1c94a96e49ea SHA1 2cacb24f2deef1b976489a21e3d3e3859bf34688 SHA256 5ec3a49d2068b227baf6621de2a5756b45ad563a02528282fbccc74c7e95e338
 MD5 0f134551aba8e78da480d7bda0575e7d rdesktop-1.5.0-r2.ebuild 1376
 RMD160 333cf55ff5cc28f6519d2b4fe6bd1c94a96e49ea rdesktop-1.5.0-r2.ebuild 1376
 SHA256 5ec3a49d2068b227baf6621de2a5756b45ad563a02528282fbccc74c7e95e338 rdesktop-1.5.0-r2.ebuild 1376
-EBUILD rdesktop-1.5.0.ebuild 1142 RMD160 37289d2d24ddfdc239a346beeae3587682abdcff SHA1 be69bfd4f17b38431520e5ef0cebf49427d9eb31 SHA256 3f2024f607ba43a40cdc6e6c80a7527db5b0d4ab1a4d57d96be93193c3d07f6e
-MD5 2d8f693836ae75a208b6026cd0263b28 rdesktop-1.5.0.ebuild 1142
-RMD160 37289d2d24ddfdc239a346beeae3587682abdcff rdesktop-1.5.0.ebuild 1142
-SHA256 3f2024f607ba43a40cdc6e6c80a7527db5b0d4ab1a4d57d96be93193c3d07f6e rdesktop-1.5.0.ebuild 1142
-MISC ChangeLog 12412 RMD160 6e23a4949db580aacb5bd80d2f5844200d1352c9 SHA1 e49448633cf7226d9467a773bc13761619254eb1 SHA256 42b0df027afdfc2e9a5661dc21d2ccbef2134bcb80b553b764234be38a99e71e
-MD5 31e1472fb4d5461a785f87987342b057 ChangeLog 12412
-RMD160 6e23a4949db580aacb5bd80d2f5844200d1352c9 ChangeLog 12412
-SHA256 42b0df027afdfc2e9a5661dc21d2ccbef2134bcb80b553b764234be38a99e71e ChangeLog 12412
+EBUILD rdesktop-1.5.0-r3.ebuild 1792 RMD160 1ac14a29e8f9abe4c2eee7bf6918fef8d291319f SHA1 d00931161e6f2f76e4b1ae6b865397e335036e01 SHA256 15564c64c3a771bcd027103a10cde2f1e9edab940b4766cce7f14b4d59c3002a
+MD5 7f33317245907ebe95ca4a3a5854d9f1 rdesktop-1.5.0-r3.ebuild 1792
+RMD160 1ac14a29e8f9abe4c2eee7bf6918fef8d291319f rdesktop-1.5.0-r3.ebuild 1792
+SHA256 15564c64c3a771bcd027103a10cde2f1e9edab940b4766cce7f14b4d59c3002a rdesktop-1.5.0-r3.ebuild 1792
+MISC ChangeLog 12732 RMD160 32749e1cdc90244b5829dc64ccaabbab58f365ae SHA1 18ceb7fad0a586eca08ed8bd546fcac447b365c8 SHA256 545fbc33ed0342fde05622c09579760bac93b7e77f35ac51077f0e9dea0ed8a9
+MD5 295138aa6c55e38445dc853f9ffc841b ChangeLog 12732
+RMD160 32749e1cdc90244b5829dc64ccaabbab58f365ae ChangeLog 12732
+SHA256 545fbc33ed0342fde05622c09579760bac93b7e77f35ac51077f0e9dea0ed8a9 ChangeLog 12732
 MISC metadata.xml 540 RMD160 fe15b82c0a18cea160e4557c7093d520f008eebf SHA1 b3f9ca285289591105fb84c49f7dde2d219fb67d SHA256 46dc788af304f60ad0bfb3502a81cdb6b91ac17a9ce39bc45a8b260acd5b0601
 MD5 a21bd9a928442cb85adefc24132719e6 metadata.xml 540
 RMD160 fe15b82c0a18cea160e4557c7093d520f008eebf metadata.xml 540
 SHA256 46dc788af304f60ad0bfb3502a81cdb6b91ac17a9ce39bc45a8b260acd5b0601 metadata.xml 540
-MD5 1af4fcad87d501fa03211d67e07ff9ef files/digest-rdesktop-1.4.1 244
-RMD160 810b3e1491899b422ef0e2556aa6b9a613af000e files/digest-rdesktop-1.4.1 244
-SHA256 b49b134cd35ff5323d927c7fe8aa3f3f2c3b0279233ae529dc159262b4a95290 files/digest-rdesktop-1.4.1 244
-MD5 99b7c6bf42f60bd079994bd0e170cf70 files/digest-rdesktop-1.5.0 244
-RMD160 c9c4ab4e28c401fcd21fd2f510eb4698f503dc3f files/digest-rdesktop-1.5.0 244
-SHA256 2c6dadd4c4ceb7ac98766476972b6fff4f90c679175cf166a413c8b664daf9d8 files/digest-rdesktop-1.5.0 244
-MD5 99b7c6bf42f60bd079994bd0e170cf70 files/digest-rdesktop-1.5.0-r1 244
-RMD160 c9c4ab4e28c401fcd21fd2f510eb4698f503dc3f files/digest-rdesktop-1.5.0-r1 244
-SHA256 2c6dadd4c4ceb7ac98766476972b6fff4f90c679175cf166a413c8b664daf9d8 files/digest-rdesktop-1.5.0-r1 244
 MD5 99b7c6bf42f60bd079994bd0e170cf70 files/digest-rdesktop-1.5.0-r2 244
 RMD160 c9c4ab4e28c401fcd21fd2f510eb4698f503dc3f files/digest-rdesktop-1.5.0-r2 244
 SHA256 2c6dadd4c4ceb7ac98766476972b6fff4f90c679175cf166a413c8b664daf9d8 files/digest-rdesktop-1.5.0-r2 244
+MD5 99b7c6bf42f60bd079994bd0e170cf70 files/digest-rdesktop-1.5.0-r3 244
+RMD160 c9c4ab4e28c401fcd21fd2f510eb4698f503dc3f files/digest-rdesktop-1.5.0-r3 244
+SHA256 2c6dadd4c4ceb7ac98766476972b6fff4f90c679175cf166a413c8b664daf9d8 files/digest-rdesktop-1.5.0-r3 244
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.4.1 b/net-misc/rdesktop/files/digest-rdesktop-1.4.1
deleted file mode 100644
index 50d217048aa6..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78dd2bae04edf1cb9f65c29930dcc993 rdesktop-1.4.1.tar.gz 216017
-RMD160 c49a2425f1e00f5933d3873f6ea742b2ad4fea0c rdesktop-1.4.1.tar.gz 216017
-SHA256 db3da6016ceec07efda277adcb175b14c4e5255b0f85137f4a1dce79b0ee5144 rdesktop-1.4.1.tar.gz 216017
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r1 b/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r1
deleted file mode 100644
index 81d1b244f847..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 433546f60fc0f201e99307ba188369ed rdesktop-1.5.0.tar.gz 245137
-RMD160 350e08166d0b7620b4ed9c6594addae7ec53d15a rdesktop-1.5.0.tar.gz 245137
-SHA256 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa rdesktop-1.5.0.tar.gz 245137
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.5.0 b/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r3
index 81d1b244f847..81d1b244f847 100644
--- a/net-misc/rdesktop/files/digest-rdesktop-1.5.0
+++ b/net-misc/rdesktop/files/digest-rdesktop-1.5.0-r3
diff --git a/net-misc/rdesktop/files/rdesktop-keymap-additional b/net-misc/rdesktop/files/rdesktop-keymap-additional
new file mode 100644
index 000000000000..04a03a54dcee
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-keymap-additional
@@ -0,0 +1,64 @@
+#Additional sequences
+#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
+
+sequence ecaron dead_caron e
+sequence Ecaron dead_caron E
+sequence eogonek dead_ogonek e
+sequence Eogonek dead_ogonek E
+
+sequence rcaron dead_caron r
+sequence Rcaron dead_caron R
+sequence racute dead_acute r
+sequence Racute dead_acute R
+
+sequence tcaron dead_caron t
+sequence Tcaron dead_caron T
+sequence tcedilla dead_cedilla t
+sequence Tcedilla dead_cedilla T
+
+sequence zcaron dead_caron z
+sequence Zcaron dead_caron Z
+sequence zacute dead_acute z
+sequence Zacute dead_acute Z
+sequence zabovedot dead_abovedot z
+sequence Zabovedot dead_abovedot Z
+
+sequence uring dead_abovering u
+sequence Uring dead_abovering U
+sequence udoubleacute dead_doubleacute u
+sequence Udoubleacute dead_doubleacute U
+
+sequence odoubleacute dead_doubleacute o
+sequence Odoubleacute dead_doubleacute O
+
+sequence aogonek dead_ogonek a
+sequence Aogonek dead_ogonek A
+sequence abreve dead_breve a
+sequence Abreve dead_breve A
+
+sequence scaron dead_caron s
+sequence Scaron dead_caron S
+sequence sacute dead_acute s
+sequence Sacute dead_acute S
+sequence scedilla dead_cedilla s
+sequence Scedilla dead_cedilla S
+
+sequence dcaron dead_caron d
+sequence Dcaron dead_caron D
+
+sequence gbreve dead_breve g
+sequence Gbreve dead_breve G
+
+sequence lcaron dead_caron l
+sequence Lcaron dead_caron L
+sequence lacute dead_acute l
+sequence Lacute dead_acute L
+
+sequence ccaron dead_caron c
+sequence Ccaron dead_caron C
+
+sequence ncaron dead_caron n
+sequence Ncaron dead_caron N
+sequence nacute dead_acute n
+sequence Nacute dead_acute N
+
diff --git a/net-misc/rdesktop/files/rdesktop-keymap-cs b/net-misc/rdesktop/files/rdesktop-keymap-cs
new file mode 100644
index 000000000000..046762833dbd
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-keymap-cs
@@ -0,0 +1,122 @@
+#Czech keymap
+#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
+include common
+include additional
+map 0x405
+
+semicolon 0x29
+dead_abovering 0x29 shift
+
+plus 0x02
+1 0x02 shift
+dead_tilde 0x02 altgr
+asciitilde 0x02 altgr
+
+ecaron 0x03
+2 0x03 shift
+dead_caron 0x03 altgr
+
+scaron 0x04
+3 0x04 shift
+dead_circumflex 0x04 altgr
+
+ccaron 0x05
+4 0x05 shift
+dead_breve 0x05 altgr
+
+rcaron 0x06
+5 0x06 shift
+dead_abovering 0x06 altgr
+
+zcaron 0x07
+6 0x07 shift
+dead_ogonek 0x07 altgr
+
+yacute 0x08
+7 0x08 shift
+dead_grave 0x08 altgr
+
+aacute 0x09
+8 0x09 shift
+dead_abovedot 0x08 altgr
+
+iacute 0x0a
+9 0x0a shift
+dead_acute 0x08 altgr
+
+eacute 0x0b
+0 0x0b shift
+dead_doubleacute 0x0b altgr
+
+equal 0x0c
+percent 0x0c shift
+dead_macron 0x0c altgr
+
+dead_acute 0x0d
+dead_caron 0x0d shift
+dead_cedilla 0x0d altgr
+
+backslash 0x10 altgr
+
+bar 0x11 altgr
+
+EuroSign 0x12 altgr
+
+z 0x15 addupper
+
+uacute 0x1a
+slash 0x1a shift
+division 0x1a altgr
+
+parenright 0x1b
+parenleft 0x1b shift
+multiply 0x1b altgr
+
+dead_diaeresis 0x2b
+apostrophe 0x2b shift
+currency 0x2b altgr
+
+dstroke 0x1f altgr
+
+Dstroke 0x20 altgr
+
+bracketleft 0x21 altgr
+
+bracketright 0x22 altgr
+
+lstroke 0x25 altgr
+
+Lstroke 0x26 altgr
+
+uring 0x27
+quotedbl 0x27 shift
+dollar 0x27 altgr
+
+section 0x28
+exclam 0x28 shift
+ssharp 0x28 altgr
+
+y 0x2c addupper
+
+numbersign 0x2d altgr
+
+ampersand 0x2e altgr
+
+at 0x2f altgr
+
+braceleft 0x30 altgr
+
+braceright 0x31 altgr
+
+comma 0x33
+question 0x33 shift
+less 0x33 altgr
+
+period 0x34
+colon 0x34 shift
+greater 0x34 altgr
+
+minus 0x35
+underscore 0x35 shift
+asterisk 0x35 altgr
+
diff --git a/net-misc/rdesktop/files/rdesktop-keymap-sk b/net-misc/rdesktop/files/rdesktop-keymap-sk
new file mode 100644
index 000000000000..afa1a3bb035d
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-keymap-sk
@@ -0,0 +1,124 @@
+#Slovak keymap
+#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
+include common
+include additional
+map 0x41B
+
+semicolon 0x29
+dead_abovering 0x29 shift
+
+plus 0x02
+1 0x02 shift
+dead_tilde 0x02 altgr
+asciitilde 0x02 altgr
+
+lcaron 0x03
+2 0x03 shift
+dead_caron 0x03 altgr
+
+scaron 0x04
+3 0x04 shift
+dead_circumflex 0x04 altgr
+
+ccaron 0x05
+4 0x05 shift
+dead_breve 0x05 altgr
+
+tcaron 0x06
+5 0x06 shift
+dead_abovering 0x06 altgr
+
+zcaron 0x07
+6 0x07 shift
+dead_ogonek 0x07 altgr
+
+yacute 0x08
+7 0x08 shift
+dead_grave 0x08 altgr
+
+aacute 0x09
+8 0x09 shift
+dead_abovedot 0x08 altgr
+
+iacute 0x0a
+9 0x0a shift
+dead_acute 0x08 altgr
+
+eacute 0x0b
+0 0x0b shift
+dead_doubleacute 0x0b altgr
+
+equal 0x0c
+percent 0x0c shift
+dead_diaeresis 0x0c altgr
+
+dead_acute 0x0d
+dead_caron 0x0d shift
+dead_cedilla 0x0d altgr
+
+backslash 0x10 altgr
+
+bar 0x11 altgr
+
+EuroSign 0x12 altgr
+
+z 0x15 addupper
+
+apostrophe 0x19 altgr
+
+uacute 0x1a
+slash 0x1a shift
+division 0x1a altgr
+
+adiaeresis 0x1b
+parenleft 0x1b shift
+multiply 0x1b altgr
+
+ncaron 0x2b
+parenright 0x2b shift
+currency 0x2b altgr
+
+dstroke 0x1f altgr
+
+Dstroke 0x20 altgr
+
+bracketleft 0x21 altgr
+
+bracketright 0x22 altgr
+
+lstroke 0x25 altgr
+
+Lstroke 0x26 altgr
+
+ocircumflex 0x27
+quotedbl 0x27 shift
+dollar 0x27 altgr
+
+section 0x28
+exclam 0x28 shift
+ssharp 0x28 altgr
+
+y 0x2c addupper
+
+numbersign 0x2d altgr
+
+ampersand 0x2e altgr
+
+at 0x2f altgr
+
+braceleft 0x30 altgr
+
+braceright 0x31 altgr
+
+comma 0x33
+question 0x33 shift
+less 0x33 altgr
+
+period 0x34
+colon 0x34 shift
+greater 0x34 altgr
+
+minus 0x35
+underscore 0x35 shift
+asterisk 0x35 altgr
+
diff --git a/net-misc/rdesktop/rdesktop-1.4.1.ebuild b/net-misc/rdesktop/rdesktop-1.4.1.ebuild
deleted file mode 100644
index acd6fdeef757..000000000000
--- a/net-misc/rdesktop/rdesktop-1.4.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 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.18 2007/07/22 08:15:37 dberkholz Exp $
-
-inherit eutils
-
-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="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="debug ipv6 oss"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	>=dev-libs/openssl-0.9.6b"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-
-src_compile() {
-	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
-	sed -i -e 's:strip:true:' Makefile.in
-	econf \
-		--with-openssl=/usr \
-		`use_with debug` \
-		`use_with ipv6` \
-		`use_with oss sound` \
-		|| 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.5.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.5.0-r3.ebuild
index fa66ae1be256..6ea1b1bd30e1 100644
--- a/net-misc/rdesktop/rdesktop-1.5.0-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.5.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.5.0-r1.ebuild,v 1.9 2007/02/06 21:27:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.5.0-r3.ebuild,v 1.1 2007/07/28 04:30:55 mjolnir Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="ao debug ipv6 oss"
 
 S=${WORKDIR}/${PN}-${MY_PV}
@@ -26,6 +26,12 @@ RDEPEND=">=dev-libs/openssl-0.9.6b
 DEPEND="${RDEPEND}
 	x11-libs/libXt"
 
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	epatch "${FILESDIR}/${P}-libX11-segfault-fix.patch"
+}
+
 src_compile() {
 	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
 	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
@@ -51,4 +57,13 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install
 	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
+
+	# For #180313 - applies to versions >= 1.5.0
+	# Fixes sf.net bug
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
+	# check for next version to see if this needs to be removed
+	insinto /usr/share/rdesktop/keymaps
+	newins "${FILESDIR}/rdesktop-keymap-additional" additional
+	newins "${FILESDIR}/rdesktop-keymap-cs" cs
+	newins "${FILESDIR}/rdesktop-keymap-sk" sk
 }
diff --git a/net-misc/rdesktop/rdesktop-1.5.0.ebuild b/net-misc/rdesktop/rdesktop-1.5.0.ebuild
deleted file mode 100644
index 2e3af8f65880..000000000000
--- a/net-misc/rdesktop/rdesktop-1.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.5.0.ebuild,v 1.3 2007/07/22 08:15:37 dberkholz Exp $
-
-inherit eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ipv6 oss"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	>=dev-libs/openssl-0.9.6b"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-
-src_compile() {
-	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-	econf \
-		--with-openssl=/usr \
-		`use_with debug` \
-		`use_with ipv6` \
-		`use_with oss sound` \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
-}