Version bump with some important bugfixes, update license, drop rdpusb patch. Drop previous 1.6.0 ebuilds

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 67 insertions, 69 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 9ebb50dc304b..487e7855b203 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,14 @@
 # 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.120 2011/01/10 11:13:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.121 2011/04/20 11:40:53 voyageur Exp $
+
+*rdesktop-1.7.0 (20 Apr 2011)
+
+  20 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org> -rdesktop-1.6.0.ebuild,
+  -rdesktop-1.6.0-r3.ebuild, +rdesktop-1.7.0.ebuild,
+  +files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch:
+  Version bump with some important bugfixes, update license, drop rdpusb patch.
+  Drop previous 1.6.0 ebuilds
 
   10 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   rdesktop-1.6.0-r4.ebuild:
diff --git a/net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch b/net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch
new file mode 100644
index 000000000000..9b8d3aa5b600
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch
@@ -0,0 +1,50 @@
+Index: scard.c
+===================================================================
+--- scard.c	(revision 1609)
++++ scard.c	(working copy)
+@@ -1165,10 +1165,10 @@
+ 	in_uint8a(in, pAtrMasks, atrMaskCount * sizeof(SCARD_ATRMASK_L));
+ 
+ 	in_uint32_le(in, readerCount);
+-	rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE_A));
++	rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE));
+ 	if (!rsArray)
+ 		return SC_returnNoMemoryError(&lcHandle, in, out);
+-	memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE_A));
++	memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE));
+ 
+ 	DEBUG_SCARD(("SCARD: SCardLocateCardsByATR(context: 0x%08x, atrs: %d, readers: %d)\n",
+ 		     (unsigned) hContext, (int) atrMaskCount, (int) readerCount));
+@@ -1253,7 +1253,7 @@
+ 				if (equal)
+ 				{
+ 					rsCur->dwEventState |= 0x00000040;	/* SCARD_STATE_ATRMATCH 0x00000040 */
+-					memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE_A));
++					memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE));
+ 					DEBUG_SCARD(("SCARD:    \"%s\"\n",
+ 						     rsCur->szReader ? rsCur->szReader : "NULL"));
+ 					DEBUG_SCARD(("SCARD:        user: 0x%08x, state: 0x%08x, event: 0x%08x\n", (unsigned) rsCur->pvUserData, (unsigned) rsCur->dwCurrentState, (unsigned) rsCur->dwEventState));
+@@ -1274,7 +1274,7 @@
+ 		rsCur->cbAtr = swap32(rsCur->cbAtr);
+ 
+ 		out_uint8p(out, (void *) ((unsigned char **) rsCur + 2),
+-			   sizeof(SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *));
++			   sizeof(SCARD_READERSTATE) - 2 * sizeof(unsigned char *));
+ 	}
+ 
+ 	outForceAlignment(out, 8);
+Index: scard.h
+===================================================================
+--- scard.h	(revision 1609)
++++ scard.h	(working copy)
+@@ -50,8 +50,8 @@
+ typedef uint32_t SERVER_SCARDCONTEXT;
+ typedef uint32_t SERVER_SCARDHANDLE;
+ 
+-typedef SCARD_READERSTATE_A MYPCSC_SCARD_READERSTATE_A;
+-typedef LPSCARD_READERSTATE_A MYPCSC_LPSCARD_READERSTATE_A;
++typedef SCARD_READERSTATE MYPCSC_SCARD_READERSTATE_A;
++typedef LPSCARD_READERSTATE MYPCSC_LPSCARD_READERSTATE_A;
+ 
+ typedef struct
+ {
diff --git a/net-misc/rdesktop/rdesktop-1.6.0.ebuild b/net-misc/rdesktop/rdesktop-1.6.0.ebuild
deleted file mode 100644
index de004f55d35f..000000000000
--- a/net-misc/rdesktop/rdesktop-1.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.8 2008/05/17 13:31:27 klausman Exp $
-
-inherit 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="ao debug ipv6 oss"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	ao? ( >=media-libs/libao-0.8.6 )"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-
-src_compile() {
-	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	if use oss; then
-		extra_conf=`use_with oss sound`
-	else
-		extra_conf=`use_with ao sound libao`
-	fi
-
-	econf \
-		--with-openssl=/usr \
-		`use_with debug` \
-		`use_with ipv6` \
-		${extra_conf} \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	make 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.6.0-r3.ebuild b/net-misc/rdesktop/rdesktop-1.7.0.ebuild
index d9476cf71440..32cfe07d6b66 100644
--- a/net-misc/rdesktop/rdesktop-1.6.0-r3.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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-r3.ebuild,v 1.1 2009/07/05 14:26:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.7.0.ebuild,v 1.1 2011/04/20 11:40:53 voyageur Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ DESCRIPTION="A Remote Desktop Protocol Client"
 HOMEPAGE="http://rdesktop.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="GPL-2"
+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"
@@ -38,9 +38,12 @@ src_prepare() {
 		|| die "sed failed in Makefile.in"
 
 	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${P}-sound_configure.patch
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
 	# Fix --enable-smartcard logic
-	epatch "${FILESDIR}"/${P}-smartcard_configure.patch
+	epatch "${FILESDIR}"/${PN}-1.6.0-smartcard_configure.patch
+	# bug #349813
+	epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.6.patch
+
 	eautoreconf
 }