Remove unsused version, allow epatch_user in latest one

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 13 insertions, 101 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index bf28f8c144ca..36579563986d 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.154 2014/01/26 12:17:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.155 2014/01/31 23:32:25 voyageur Exp $
+
+  31 Jan 2014; Bernard Cafarelli <voyageur@gentoo.org> -rdesktop-1.8.0.ebuild,
+  rdesktop-1.8.1.ebuild:
+  Remove unsused version, allow epatch_user in latest one
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> rdesktop-1.8.1.ebuild:
   Stable for sparc, wrt bug #495884
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 294a7b5fa698..a90d8f931ac7 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -8,27 +8,15 @@ AUX rdesktop-keymap-additional 1568 SHA256 3642f38bff8902fa1b5093001ce8e076dcfed
 AUX rdesktop-keymap-cs 1536 SHA256 91bd229fdb7fb1f0d9e6d0dcf35a429a2c51afa1fb8e2b3414852dc528218b6e SHA512 ce12e9b05220e2d6d16ee2d283a69c4ef72e6b2438e0b76be1e96a7e20f8502b349706d4f9321723307c2e04cb687558cdbd3596b71b022fd47b3e0133178d96 WHIRLPOOL 1455435aaed5e6e2e79dbbbaad79b0cc43360559a0ccf28cb1cbd29e719b85b0c80f1d9905dfa881a9dcbccf59f3c5e73c40a78ae3e0e0147efc14678da106dc
 AUX rdesktop-keymap-sk 1561 SHA256 33024ca566d97b5c041d3ca45634d3baa075b456389140bd5991e3927fd37b07 SHA512 208fb85b60a0734ff76c71e9375b4cf014857d5d434ea9fa36d6bdc7e313a8f7225a9d2e4547cf0485d9fec65b22d7dfc555bc74d6a01ef87ab66deb824f864e WHIRLPOOL b6026e1291bf4af591852f7e7f6571f23d5fc8b27488101f9dde280a7b857691f2f374a666075c325ebc3d15c5cd404c511774fbf560338a7ca96c6763282528
 DIST rdesktop-1.7.1.tar.gz 298808 SHA256 d1ea43adeb23ef1ba425983670372a87cd7560baf8c94ba34215105ed2ef8479 SHA512 aaefbcda77a333ec065e42aa20e5335e48c51858dab860495528b399696c0ed6594ab9c5234716682e7ebef81d36cc6d157eedae700e0df209da9034d04887fc WHIRLPOOL a186bbf3200af87ef6e111210e3dbf9d71f2a495c44dca583673466ccc9f67606a9a9c2bf3c801addd7c3b1af26a0a03e4e63b15bb72a52d7cfb4e4f381596ae
-DIST rdesktop-1.8.0.tar.gz 313312 SHA256 1f12562c0dc1c599d1c3d2ac4829d229763744fe7aef879c8eaaa5abae8edcb3 SHA512 6e0116b16cf8586f0fd233c7fb8ec93e6fae8ad39a016e6d47b6f1ae35d9502a8fd46ea338546e4f5af3bcf9bdfaed3771b99b46e9413484d792f4bc77446cfd WHIRLPOOL 8730e7ecfebf6ee9bfc594266df13ff93e84ffa18c6ec4bb56e5a644463904f53a0ea29bd23e38f0a93a86927e50c69a8c144d288bf9c69b4ed1b1ca2c0ebd91
 DIST rdesktop-1.8.1.tar.gz 314198 SHA256 76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246 SHA512 31f13bf644ef16939a8c6c12709b89f59b0de276cc113c5e43ba505c5a352f515fdd1302c32f3095caca66796c9a15d574374391b4a67745fa505512499ed071 WHIRLPOOL f4df2b07c3e157c0fdd38a6477008bd0f4aa256f423a6a4d8bb53538028ff484776b74b171343d19ea4f508ae84e1dc758b26a5810052f94978d0fca9b4e3190
 EBUILD rdesktop-1.7.1.ebuild 2351 SHA256 1b9aa1508745a3765bb4cf18d367289eaebff708485c973e67f0a53cb53842fa SHA512 eba983e26e46b74ec4433976048b037766831043705a0cf744e8c16012fd77bc26938d7a2f87cbefccd58b474e1f555017b10d750cc60d2d7c5ca211246160a6 WHIRLPOOL 48eef124b550ec21617c70bf7d37f9fb0801bbeb52c6ede392abd9122a30fec0ca42049ef0ab8f99b56cf3e9e1a20f05def423efafa1c61cd27db13bf4ad3dd8
-EBUILD rdesktop-1.8.0.ebuild 2346 SHA256 7b74b80e2d7781e3c6160988d6f954de4179b3dc4ea82d8aea569d41b053610f SHA512 d1fec730dd22cedce4ec91f1d143c33d4ebccc814f35a55952aaed74723486d46890e12785c24c0efd1c8cf2194671cc27d54b5f11d2254cb8a187e45aa7929f WHIRLPOOL 826b57851fc45c3bc5851d250375c80811cf31641a1f2ff97235c28e757202173b35d9a69a737d185fc8c275513a9d08470e13783a2df76afc8a10689e0057e6
-EBUILD rdesktop-1.8.1.ebuild 2333 SHA256 58d1af83161d1e65f13875fdcd0fc3d40bd31c8a0d4527ee1fa5d83b447d324e SHA512 f7fec6fd78e7f3a9fc86bfb3940f23af79a905fab06df81bdb804782174011634f7cea288cfc468c4b05102a727ed1a830af92969950acc0d2c8a69d4e764b6b WHIRLPOOL 5ee177eda512ff10569210bb39ad3b463feb58881dd831bddb166c94536c0065e7bd57ad7182a3a24c0c802b961065e15c00535aecdfd741e1056ee6bd34228d
-MISC ChangeLog 20991 SHA256 3c320cddc65b16d1fcd3723cc0096c812485596140c3d8d9ac5d0232b6601dac SHA512 69f40c60a65e99f0876f7b103e1c480ccdf35c5c2a758709849f7a608c50a4f1ba95432324cd36e62ec21211f1fa95940c37d808a4f9424ccb20685313129ec9 WHIRLPOOL 16f699010a2a7ef967973f1d500720b3626308f49ed6872ad61f046efd213231213ba2b1c0a27b973d2fe9241901ba9871b1fdba645e581f381a8fd54fb948c6
+EBUILD rdesktop-1.8.1.ebuild 2352 SHA256 4c0ae6fccb2cff351bbc4c5aac87a2f62ad2155e8f0e74a0ae27e12d8b71033a SHA512 334d9f5f33552911e3e0d1c246e7d7aef5306072c534efb4f7f6d492a5d8b3e2ccabe9164568d5628841f28e216b117b653a211f9f093d63b11b5ae5e88ecf6f WHIRLPOOL 8fc788ed8698977799f2e97b2cb5b90356e00da30cbfb17598834480c212d35110cdbf0a58a84c7233bc58f352b636537f02312e15b67cc4ed906c6ded438f2e
+MISC ChangeLog 21159 SHA256 6d35fa9bb67fd07e33baece0bb8cd58c329d1f1f43a1eb22ec590257b487039b SHA512 4b985ea696b469070199a0b7370268661a3793fcb3060b03ce3585f6e9d5de389ddc3f2a2a55f7ae0bec2c31ce2f38d84fcb78913f9904156bc825b6a0ca0bf5 WHIRLPOOL ae5921959ee2c8b9abc7dd787bc5fe04fadf06aedd05eac2a2053e6ddb72dbd799eb6314cc776c6fb1a4e3bfcc6b85073d41a14c2f4b6b05d19331cc94828b95
 MISC metadata.xml 767 SHA256 c8739a800839c735a9cc89c8f603a785aee3d240ae18112c5d504c9727860c7f SHA512 ebfe1c8fa5e5f236e6d3701a7f497a6d11b90c91bbd2c4643789697081788884a4b7922b181a17a5105d580d40fb969c8c8d150fe09ab99afc990102e9dbe49a WHIRLPOOL 80e72ee5b49e3aeac93cc80224dbae7890ae9661e1cba19705bee108035eebc6e45a7e2418162fa278921ecf90f51363d00ec02c7d23e51c1c73624603fb5dd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5PzcAAoJELp701BxlEWf5LMQAKQALCjyF5xFd7axS76Z8nve
-bNoqBG2DNHAK7J6njKcR4WwDE6XcJv5FsDU2hWVczxHdW4bnKdCCjPYAh40jLVqv
-oZJ3WvRQXDU43ds0OG2XZb1Rxo80vsOz3wRhMlfJm82/HMXkdsDT8ZuaaDogJ0wC
-qxzZs6PRGfE96M4f8ZzVvHmNMBWTqAskh6aitiC53fLhJUxMbXGLss7T78O25lqM
-tahScBKX9cH1Q7ElWRmYiPVoxAJEtZQt6j+eRyYZQU2d2+cvPihAVjpYyYmpKA/6
-5Z5C7X0+psNSMLfirebxOh72WECbWiJ1rUIe1Bv1X+8UCd5Pob2mJ+oTXUNkwemh
-BMa04bU1yt0jx4xJvEeJS8DoKgVkKDd7HU1guVvL6aO/xC0T+2BYJ5GPDUo/7jUw
-Ek0P94wMqdZCZ1XuIZEYtZbMqkr2iA5QeErVZoSk2dkEjDjMyIUmv0ywakHwdCgh
-zdc9+6phSylYe2xfxrF14Yxr9Dh5wZalxUYTeQTtJhiIzxTuI2CAlN9Op7dp2nCq
-x5tbLjf6WKIj9nOx3/HfwShstV+4ONl4hu7Hfu0CTuYXqEM23u4rASCvaDaEqbad
-cg7WzMrpkr1tPi6UN0GZfo38NicvDDk9d44JM7d1HcdErHZT7ebdHVv63VT48iKw
-ilv4Cim50dE1NOSdvK26
-=Fggh
+iF4EAREIAAYFAlLsMo8ACgkQFYEBGcdFJfJAwgEAoaPLIc8TcvAShdeOylB7tQJT
+pu3s0t2WoO8hCLOWOvIA/09DK3Vusz6/UVrqXbmBkMhy6Hayd1+/PFcnHNOoBZSd
+=DhZJ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.ebuild b/net-misc/rdesktop/rdesktop-1.8.0.ebuild
deleted file mode 100644
index 8d7a9e434eb6..000000000000
--- a/net-misc/rdesktop/rdesktop-1.8.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.0.ebuild,v 1.1 2013/08/13 09:02:45 voyageur Exp $
-
-EAPI=5
-
-inherit autotools 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-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	kerberos? ( net-libs/libgssglue )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	# bug #280923
-	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc 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.8.1.ebuild b/net-misc/rdesktop/rdesktop-1.8.1.ebuild
index 851fad4191e4..efb51b395fff 100644
--- a/net-misc/rdesktop/rdesktop-1.8.1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.1.ebuild,v 1.10 2014/01/26 12:17:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.1.ebuild,v 1.11 2014/01/31 23:32:25 voyageur Exp $
 
 EAPI=5
 
@@ -44,6 +44,8 @@ src_prepare() {
 	# bug #280923
 	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
 
+	epatch_user
+
 	eautoreconf
 }