Version bump, includes fix for #499858

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

3 files changed, 96 insertions, 5 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 36579563986d..b1091ed60e7e 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # 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.155 2014/01/31 23:32:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.156 2014/05/21 08:30:11 voyageur Exp $
+
+*rdesktop-1.8.2 (21 May 2014)
+
+  21 May 2014; Bernard Cafarelli <voyageur@gentoo.org> +rdesktop-1.8.2.ebuild:
+  Version bump, includes fix for #499858
 
   31 Jan 2014; Bernard Cafarelli <voyageur@gentoo.org> -rdesktop-1.8.0.ebuild,
   rdesktop-1.8.1.ebuild:
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index a90d8f931ac7..3bcc872f34c8 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -9,14 +9,16 @@ AUX rdesktop-keymap-cs 1536 SHA256 91bd229fdb7fb1f0d9e6d0dcf35a429a2c51afa1fb8e2
 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.1.tar.gz 314198 SHA256 76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246 SHA512 31f13bf644ef16939a8c6c12709b89f59b0de276cc113c5e43ba505c5a352f515fdd1302c32f3095caca66796c9a15d574374391b4a67745fa505512499ed071 WHIRLPOOL f4df2b07c3e157c0fdd38a6477008bd0f4aa256f423a6a4d8bb53538028ff484776b74b171343d19ea4f508ae84e1dc758b26a5810052f94978d0fca9b4e3190
+DIST rdesktop-1.8.2.tar.gz 318270 SHA256 fbbf23d49d34c215c5a59b2d91c008b61ead4c9fbe1ccb7223973aed24061a78 SHA512 45b3e3220bcb2584cdfa3139c5b38775d55ab3c6c4cb6e46e4032965f5dc546682a733b5764760f20b7b6f40bb412ef0f67509f1344e69b342bbf9e9aca45bcf WHIRLPOOL 284b0746aaf9334992f1b485e4db25daeacfe5c5ade3403d94f1bf8b939ae45d22166a8a58014c51f4ebcc3e6211da44b6bacda4d89f0e9879e43c1a81ca3794
 EBUILD rdesktop-1.7.1.ebuild 2351 SHA256 1b9aa1508745a3765bb4cf18d367289eaebff708485c973e67f0a53cb53842fa SHA512 eba983e26e46b74ec4433976048b037766831043705a0cf744e8c16012fd77bc26938d7a2f87cbefccd58b474e1f555017b10d750cc60d2d7c5ca211246160a6 WHIRLPOOL 48eef124b550ec21617c70bf7d37f9fb0801bbeb52c6ede392abd9122a30fec0ca42049ef0ab8f99b56cf3e9e1a20f05def423efafa1c61cd27db13bf4ad3dd8
 EBUILD rdesktop-1.8.1.ebuild 2352 SHA256 4c0ae6fccb2cff351bbc4c5aac87a2f62ad2155e8f0e74a0ae27e12d8b71033a SHA512 334d9f5f33552911e3e0d1c246e7d7aef5306072c534efb4f7f6d492a5d8b3e2ccabe9164568d5628841f28e216b117b653a211f9f093d63b11b5ae5e88ecf6f WHIRLPOOL 8fc788ed8698977799f2e97b2cb5b90356e00da30cbfb17598834480c212d35110cdbf0a58a84c7233bc58f352b636537f02312e15b67cc4ed906c6ded438f2e
-MISC ChangeLog 21159 SHA256 6d35fa9bb67fd07e33baece0bb8cd58c329d1f1f43a1eb22ec590257b487039b SHA512 4b985ea696b469070199a0b7370268661a3793fcb3060b03ce3585f6e9d5de389ddc3f2a2a55f7ae0bec2c31ce2f38d84fcb78913f9904156bc825b6a0ca0bf5 WHIRLPOOL ae5921959ee2c8b9abc7dd787bc5fe04fadf06aedd05eac2a2053e6ddb72dbd799eb6314cc776c6fb1a4e3bfcc6b85073d41a14c2f4b6b05d19331cc94828b95
+EBUILD rdesktop-1.8.2.ebuild 2360 SHA256 bd00fc291ca3b95d9f8aab4b8b5ced3f48e626e58ebcbca326b895c15f8c7dce SHA512 60e6e835d3cfb9d19d314fca253bc3524d3388a2b4d22e9db99ae3a471fc1edd8c7b1cee78e5a5103bd101eae5623c11fdd66db04f17e0a709e273cab8524743 WHIRLPOOL 2f409d557d54fea847581e31157d0698de05e5e9a0c92de863421b623ae1e5f0d2ddce287e061d227c81a91a144a8be64a13fe17d7570a7fe7b7fcb9db266250
+MISC ChangeLog 21311 SHA256 eed11bdc320c1d3b7544c751e3436c2925a7551a500470d7f384e3840f3237ea SHA512 3d84553b18ab475b37772eecd38e99cfae2339abebf6bf73f6e68b9f1fe1e5b0c9e1d002d7d3721485bba893795562a7334e9f89925cf17a479cbce95f41a775 WHIRLPOOL 5c20f8e5ce7d12dfefcc6a1bbc99dff6d5489dae8f283e8529f0f35204d4ed46e6d5cd12ed3c9763fcaf49d1c1c69142d32425f70d110538b6ecd3a91b352460
 MISC metadata.xml 767 SHA256 c8739a800839c735a9cc89c8f603a785aee3d240ae18112c5d504c9727860c7f SHA512 ebfe1c8fa5e5f236e6d3701a7f497a6d11b90c91bbd2c4643789697081788884a4b7922b181a17a5105d580d40fb969c8c8d150fe09ab99afc990102e9dbe49a WHIRLPOOL 80e72ee5b49e3aeac93cc80224dbae7890ae9661e1cba19705bee108035eebc6e45a7e2418162fa278921ecf90f51363d00ec02c7d23e51c1c73624603fb5dd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLsMo8ACgkQFYEBGcdFJfJAwgEAoaPLIc8TcvAShdeOylB7tQJT
-pu3s0t2WoO8hCLOWOvIA/09DK3Vusz6/UVrqXbmBkMhy6Hayd1+/PFcnHNOoBZSd
-=DhZJ
+iF4EAREIAAYFAlN8ZBkACgkQFYEBGcdFJfIwHQD/dyWGaO7hTHSefLywEBm/oEoQ
+5C1PYAtYRgr/7oqnTHMA/2dpoORLZc3QgzPwbBpktcSSk/+kxYeD2p9jUENjaO4h
+=3I/4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rdesktop/rdesktop-1.8.2.ebuild b/net-misc/rdesktop/rdesktop-1.8.2.ebuild
new file mode 100644
index 000000000000..de53293ff31e
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.2.ebuild
@@ -0,0 +1,84 @@
+# 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.2.ebuild,v 1.1 2014/05/21 08:30:11 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
+
+	epatch_user
+
+	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
+}