Version bump, mostly bugfixes

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index f3e2f81113b987aeab1e80b9aed7db5bfc0ffbee..987a219935011c8d06eda69ffac249b9ed5a80d9 100644 (file)
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/rdesktop
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.131 2011/08/22 10:02:51 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.132 2012/01/10 21:49:58 voyageur Exp $
+
+*rdesktop-1.7.1 (10 Jan 2012)
+
+  10 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org> +rdesktop-1.7.1.ebuild:
+  Version bump, mostly bugfixes
 
   22 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> rdesktop-1.7.0.ebuild,
   rdesktop-1.7.0-r1.ebuild:

diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index b9cff8b96d5d56437ca5126fcc0acad2e5c397d8..c29fd347b9e490cf041025f0c8669e57324697e8 100644 (file)
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -9,16 +9,16 @@ AUX rdesktop-keymap-additional 1568 RMD160 002873aa8c51fd8bb16357a57d90148c9a64c
 AUX rdesktop-keymap-cs 1536 RMD160 bd529b2b5f4adffd4f6914d6067ac23b0edb30da SHA1 d6cdae7769e22fbdf5cc13c4ef447e6ffe5def15 SHA256 91bd229fdb7fb1f0d9e6d0dcf35a429a2c51afa1fb8e2b3414852dc528218b6e
 AUX rdesktop-keymap-sk 1561 RMD160 0f8378b6eadd549ef735d92887d1c51003bbfbdf SHA1 117cf53e7c914f698cdd6cb77881bf2e580afbf4 SHA256 33024ca566d97b5c041d3ca45634d3baa075b456389140bd5991e3927fd37b07
 DIST rdesktop-1.7.0.tar.gz 297239 RMD160 0860d3027b19ebb3b5c9ef91d7c6ba47b730e2f1 SHA1 4f21a8fb2379ce05859e7fb13efa60071125d27f SHA256 3be0420d7f35887ec0f03d3b69b19017b2d4ffaec42261a355b66a50f7b75074
+DIST rdesktop-1.7.1.tar.gz 298808 RMD160 d9f39cb75ab13d7be846f61ea40276cddcbcb550 SHA1 c718d0f49948a964c7ef8424b8ade73ecce3aba3 SHA256 d1ea43adeb23ef1ba425983670372a87cd7560baf8c94ba34215105ed2ef8479
 EBUILD rdesktop-1.7.0-r1.ebuild 2314 RMD160 667a8284ff8ddc4b28770745e5b272d45a47fcb0 SHA1 72aefb2c8ae04c621e47f28910e3753da7fb8898 SHA256 da1cb5459ed2bd217f192fafcaa60d0cff99acb0640ad255617a7700838476d7
 EBUILD rdesktop-1.7.0.ebuild 2306 RMD160 659946a3d788e3316dcd29d001be33cbaee49d49 SHA1 49cd4b76a500c77384a01a4289c1a3126481ffc4 SHA256 c4c39d6c74efc20288577645c6577d8a84f0dfd24404d865f92ca6e37445f7f2
-MISC ChangeLog 18206 RMD160 8c03d59eae06701f7f019cd95fe62e24ae22c2b0 SHA1 b6588ef9dce8fe10eb6c88f80e8f7480e1cea28f SHA256 076255056d4eccbe39c447cd6b4ff57eafbbedb7243edd0dfdac59284b0bfef6
+EBUILD rdesktop-1.7.1.ebuild 2254 RMD160 26358a829b3ab71833451fffae40c7bff3943a4b SHA1 713cdc4a3fe68d6d627f4c8c1811a3dca72267de SHA256 1c40f10d65cd14f2467e84746cdd231381d1d7855f4bf8a165966bfa9771507c
+MISC ChangeLog 18349 RMD160 986dd74b227dec3b2dbedbc3bf67f89948430ce1 SHA1 6350d4bfaf18b94ac4452d3f32951d4e2787f315 SHA256 d53b23f9e3dd666679720237fb89d5c358e67e72fc8699de84c23d27ead5d231
 MISC metadata.xml 650 RMD160 5e788db3953ea6d710aa4ffe282a2c93f6b42db9 SHA1 09dc7b1a12a423e951bdc7abe19a364748bf7550 SHA256 77baae06d2c51abb99040d28c30019c8854beaa371e2110ab74abbdc158b5e3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rSAACgkQfXuS5UK5QB3xzwP/SSPYXAfcRwgHCBeaRuaI3nii
-/Z6jD45cftvydpw4xxSLYY2L4KqX642ww7fvwhJUTUv3vdznoyFVp2UIsNCzsEmY
-ImNYGr6CvXUrzz4PS9sDceMu3gH4W1nFs/Z+ODBLm9g3s0ujABB9qkwSBS7VuULE
-4mLskWuE+yYXl5erEJI=
-=FkMq
+iF4EAREIAAYFAk8MspAACgkQFYEBGcdFJfK/cgEAnD+yaF3+6iYb2G5gxRwL7Yl8
+6gygeLP4FN5NPqp69KkBAJWAfCjscoYTAH1oTBPFCKWHPur2iE+kSq6bQj+JuRg4
+=46kf
 -----END PGP SIGNATURE-----

diff --git a/net-misc/rdesktop/rdesktop-1.7.1.ebuild b/net-misc/rdesktop/rdesktop-1.7.1.ebuild
new file mode 100644 (file)
index 0000000..0e04afc
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.7.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.7.1.ebuild,v 1.1 2012/01/10 21:49:58 voyageur Exp $
+
+EAPI=4
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa ao debug ipv6 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 )
+       libsamplerate? ( media-libs/libsamplerate )
+       pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
+DEPEND="${RDEPEND}
+       dev-util/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
+       # Fix --enable-smartcard logic
+       epatch "${FILESDIR}"/${PN}-1.6.0-smartcard_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=/usr \
+               $(use_with debug) \
+               $(use_with ipv6) \
+               $(use_with libsamplerate) \
+               $(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
+}