Fix autoconf logic on enabling pcsc-lite, bug #275972

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

4 files changed, 36 insertions, 4 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index b57f0a3ac0fd..988d84134ee9 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rdesktop
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.113 2009/07/05 14:26:22 voyageur Exp $
+
+*rdesktop-1.6.0-r3 (05 Jul 2009)
+
+  05 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -rdesktop-1.6.0-r2.ebuild, +rdesktop-1.6.0-r3.ebuild,
+  +files/rdesktop-1.6.0-smartcard_configure.patch:
+  Fix autoconf logic on enabling pcsc-lite, bug #275972
 
 *rdesktop-1.6.0-r2 (30 Jun 2009)
 
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 79244889c4f7..16416a69170b 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,10 +1,11 @@
+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-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-r3.ebuild 2210 RMD160 a880280606855b1945282e7be60ddd3814cadbd2 SHA1 45d8061022da5e3bd2fb341975e36eca94a4a7c4 SHA256 5d41443b192cec7f9d17706aaec354a215bf026614fc2d98ccaba7ccf1da6da5
 EBUILD rdesktop-1.6.0.ebuild 1678 RMD160 587f79c6d9a6f7523395d316d4712732838b72ed SHA1 676b25d0a45cc22777fe385670cacd5a4051e299 SHA256 5b2fbaa11c63ac80657f1aed9f9b1d36d90bb0258ed0208cd417b7bfe4f33119
-MISC ChangeLog 15234 RMD160 78cafd98949cb17f4d8fece3ea7e043207096664 SHA1 1769f6b3473f564ed9c97575917560a15086adf8 SHA256 d06a6cb9cc867ae49048e0b78d9a2957ece1b5bcc986d7f1b24043b88709fab5
+MISC ChangeLog 15487 RMD160 fef0bb209b893496be937edd9c2e24b8a99feffa SHA1 a28a02fb031886623f9046d11cac620079f71e6c SHA256 e1b3cfeb081b6701ec6d096e38b1f9c51bdb9627d0f5417c9e4adf8dd6bf9ae5
 MISC metadata.xml 654 RMD160 3358277015ae7939b914ec3144883fe06a6aa2fe SHA1 b852f2e394bae44d5d43cd5d2a1c628194190290 SHA256 33cb4ce401a8e00daed5410b9514fd4d55abdda7e92c6f387c2a43b03965a895
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch
new file mode 100644
index 000000000000..a23796694429
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2009-07-05 16:13:23.000000000 +0200
++++ configure.ac	2009-07-05 16:19:39.000000000 +0200
+@@ -108,7 +108,10 @@
+ AC_ARG_ENABLE(smartcard, 
+              [  --enable-smartcard	  Enables smart-card support.
+ 	     ],
+-             [ 
++             [
++			  if test "$enableval" = no; then
++				  WITH_SCARD=0
++			  else
+ 	     	case "$OSTYPE" in
+ 			darwin*)
+ 				AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0])
+@@ -143,6 +146,7 @@
+ 			[AC_MSG_RESULT(yes) AC_DEFINE(WITH_PCSC120, 1, [old version of PCSC])],
+ 			[AC_MSG_RESULT(no)]
+ 		)
++		fi
+              ])
+ 
+ AC_SUBST(SCARDOBJ)
diff --git a/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.6.0-r3.ebuild
index 9da6b3967419..d9476cf71440 100644
--- a/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.6.0-r3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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 $
 
 EAPI=2
 
@@ -39,6 +39,8 @@ src_prepare() {
 
 	# Automagic dependency on libsamplerate
 	epatch "${FILESDIR}"/${P}-sound_configure.patch
+	# Fix --enable-smartcard logic
+	epatch "${FILESDIR}"/${P}-smartcard_configure.patch
 	eautoreconf
 }