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

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

5 files changed, 81 insertions, 72 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/Manifest b/net-misc/rdesktop/Manifest
index fcb56f2528e6..317312516261 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rdesktop-1.6.0+pcsc-lite-1.6.6.patch 8776 RMD160 1f3aca960e80049b968e284e1016265a58d19d3b SHA1 1241b12c12475094de0887cfae66813748dc7915 SHA256 41a192bd8a3c34f8d12d5e33faff08773eab55f50a839d29f08066a9e0e9b02c
 AUX rdesktop-1.6.0-smartcard_configure.patch 616 RMD160 1d5a67fd22426fbe2167cb8c7b4812590b7615d5 SHA1 7071e6ae1de7a8b6d9431288765bb20dd26ac2ef SHA256 04130d39c0472eda28600fd24592cf46ca0c222ef6c40d3bdd141670e388f365
 AUX rdesktop-1.6.0-sound_configure.patch 799 RMD160 1c44e9b87505454c2e5b135b36328a38c45e9dd7 SHA1 00a78abf151f7aa280b282fc0607550149bf3d6b SHA256 71db62d88e3c3bf5cbfceeddeb33958b2f24980ab3d7734511f13fd48a43e119
+AUX rdesktop-1.7.0+pcsc-lite-1.6.6.patch 2085 RMD160 ea2485799f6427718ee75ef05bb816607c03f6b0 SHA1 3ef24d8aa57552228f0ebecd893948c46159751d SHA256 afd117fd0f8f266cc15ea19561493ade8fac44b9199a8f46eee7366eeae41c1a
 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-rdpusb.patch.bz2 20547 RMD160 a6a33432e8bc0cc2cb09bc5d5d650f534eebc690 SHA1 e67308ab1e94a2239d885b944290836074b4d094 SHA256 c090acd39e02bebfa5d3045ec661939db3df5a0d66c3124a0e1109e5bb143a3b
 DIST rdesktop-1.6.0.tar.gz 284728 RMD160 cf604cd1bc0707b485deb653efa3e47e21fabc4c SHA1 b8bfd03d4640d285a0aee5b3fb199a47cb4225f2 SHA256 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
-EBUILD rdesktop-1.6.0-r3.ebuild 2210 RMD160 a880280606855b1945282e7be60ddd3814cadbd2 SHA1 45d8061022da5e3bd2fb341975e36eca94a4a7c4 SHA256 5d41443b192cec7f9d17706aaec354a215bf026614fc2d98ccaba7ccf1da6da5
+DIST rdesktop-1.7.0.tar.gz 297239 RMD160 0860d3027b19ebb3b5c9ef91d7c6ba47b730e2f1 SHA1 4f21a8fb2379ce05859e7fb13efa60071125d27f SHA256 3be0420d7f35887ec0f03d3b69b19017b2d4ffaec42261a355b66a50f7b75074
 EBUILD rdesktop-1.6.0-r4.ebuild 2423 RMD160 ae5752aaa970372eebce98c910b9cd8f33d3caac SHA1 9cb5620a1471bfe8800616d589635477a1c23276 SHA256 2108975eb8776909bdefdeae690f4e57824224db7fce8c769f85526593b54ce3
-EBUILD rdesktop-1.6.0.ebuild 1678 RMD160 587f79c6d9a6f7523395d316d4712732838b72ed SHA1 676b25d0a45cc22777fe385670cacd5a4051e299 SHA256 5b2fbaa11c63ac80657f1aed9f9b1d36d90bb0258ed0208cd417b7bfe4f33119
-MISC ChangeLog 16511 RMD160 8641d45d646977bff99c8740ffc9a988ead2c874 SHA1 76be6ed72e0421aab137cf4f819faec73d9cedf3 SHA256 7b15da8c1c1e5c61521f9ef2843c71170019343f010351247c7e145f0cc13819
+EBUILD rdesktop-1.7.0.ebuild 2286 RMD160 daffdd36b271c393ab1d9d9ef737f1a1be010be0 SHA1 0c4d63335aed53aed9a400905c148538bb03c192 SHA256 254f0bb0e1fcb5436de6164a25074b7b95cb8527b490d816870ca3f153ec1f36
+MISC ChangeLog 16830 RMD160 c103bc70b85260aa9092d7895243bcba65c2131b SHA1 b29a22254bf05997e483f5c17e3694c92da8ac45 SHA256 768187342b2dfbdc0c55403df7c481616b4e6e3cda2460ede1ab92af842397fc
 MISC metadata.xml 778 RMD160 309d776677ddd6688597175f76b5d2ee42ffb81b SHA1 a80d6d83c7b1bc8662f076ba14f0f28f49d05c58 SHA256 e146ff3079693d17c8602d895b0a85f0b857a722c99f8477706a927f21962a0b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2uxlsACgkQFYEBGcdFJfK9RwEAmWkF9okQdlDwpCHhUWUhpgxG
+XMT3uBKQ4anHA8m28LEA/i1HluNrMPQAsBE2EO844MCErrIx5EqalBuw7yznCOdk
+=Shd1
+-----END PGP SIGNATURE-----
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
 }