Fix automagic dependency on libsamplerate, bug #275851. Also clean ebuild a bit

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 104 insertions, 3 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index d5fe8221630a..b57f0a3ac0fd 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rdesktop
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.111 2008/05/21 14:13:19 voyageur Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.112 2009/06/30 09:43:15 voyageur Exp $
+
+*rdesktop-1.6.0-r2 (30 Jun 2009)
+
+  30 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +rdesktop-1.6.0-r2.ebuild, +files/rdesktop-1.6.0-sound_configure.patch:
+  Fix automagic dependency on libsamplerate, bug #275851. Also clean ebuild
+  a bit
 
 *rdesktop-1.6.0-r1 (21 May 2008)
 
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index a9589c32b7ff..79244889c4f7 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,8 +1,10 @@
+AUX rdesktop-1.6.0-sound_configure.patch 799 RMD160 1c44e9b87505454c2e5b135b36328a38c45e9dd7 SHA1 00a78abf151f7aa280b282fc0607550149bf3d6b SHA256 71db62d88e3c3bf5cbfceeddeb33958b2f24980ab3d7734511f13fd48a43e119
 AUX rdesktop-keymap-additional 1568 RMD160 002873aa8c51fd8bb16357a57d90148c9a64c130 SHA1 6b84deeee4fc368459fcee897f90328be1f3c1db SHA256 3642f38bff8902fa1b5093001ce8e076dcfeddf906b745173dec4ce61da42196
 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.6.0.tar.gz 284728 RMD160 cf604cd1bc0707b485deb653efa3e47e21fabc4c SHA1 b8bfd03d4640d285a0aee5b3fb199a47cb4225f2 SHA256 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
 EBUILD rdesktop-1.6.0-r1.ebuild 1860 RMD160 69380ecb6e43e40d7928621d04a14a2510e2fd2d SHA1 89be7e22b0c14f6a73febbb1c69b54e0ebc1e735 SHA256 2a327df8e05fc4190f301ca2060962c8a8cf05b1fcf63b64d662764a740ee30c
+EBUILD rdesktop-1.6.0-r2.ebuild 2125 RMD160 4dc2e3125699e8dab7fe27a3bd18de6055582fa2 SHA1 983e26362d73eca5c9f2ea5ec5aadc6d194f0c65 SHA256 41da0ba9e413a46ea76011fd1559182957e3bbdf159ad2d2084f273493720cff
 EBUILD rdesktop-1.6.0.ebuild 1678 RMD160 587f79c6d9a6f7523395d316d4712732838b72ed SHA1 676b25d0a45cc22777fe385670cacd5a4051e299 SHA256 5b2fbaa11c63ac80657f1aed9f9b1d36d90bb0258ed0208cd417b7bfe4f33119
-MISC ChangeLog 14986 RMD160 b93dfeec7ffa391d03276e4874cfb3ca6a11964b SHA1 885e423ce6f4d6111297cf47b857361d9c9253f9 SHA256 9d834eabbcf5353ef2ff5f92d326434c946693f87645fc09275da93b7d30e8cd
+MISC ChangeLog 15234 RMD160 78cafd98949cb17f4d8fece3ea7e043207096664 SHA1 1769f6b3473f564ed9c97575917560a15086adf8 SHA256 d06a6cb9cc867ae49048e0b78d9a2957ece1b5bcc986d7f1b24043b88709fab5
 MISC metadata.xml 654 RMD160 3358277015ae7939b914ec3144883fe06a6aa2fe SHA1 b852f2e394bae44d5d43cd5d2a1c628194190290 SHA256 33cb4ce401a8e00daed5410b9514fd4d55abdda7e92c6f387c2a43b03965a895
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
new file mode 100644
index 000000000000..8e64ba8b48cb
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
@@ -0,0 +1,15 @@
+--- configure.ac.orig	2009-06-30 10:35:14.000000000 +0200
++++ configure.ac	2009-06-30 11:35:10.000000000 +0200
+@@ -228,7 +228,11 @@
+ if test -n "$PKG_CONFIG"; then
+     PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
+     PKG_CHECK_MODULES(ALSA, alsa, [HAVE_ALSA=1], [HAVE_ALSA=0])
+-    PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
++    AC_ARG_WITH(libsamplerate,
++        [  --without-libsamplerate disable libsamplerate support])
++    if test "x$with_libsamplerate" != "xno"; then
++        PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
++    fi
+     if test x"$HAVE_LIBSAMPLERATE" = "x1"; then
+         AC_DEFINE(HAVE_LIBSAMPLERATE)
+         if test x"$static_libsamplerate" = "xyes"; then
diff --git a/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..9da6b3967419
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild,v 1.1 2009/06/30 09:43:15 voyageur Exp $
+
+EAPI=2
+
+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-2"
+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 )"
+DEPEND="${RDEPEND}
+	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}"/${P}-sound_configure.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} \
+		|| die "configuration failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed"
+	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
+}