Remove unsused version, allow epatch_user in latest one

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

3 files changed, 8 insertions, 84 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/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
 }