added fix from bug #168446

Package-Manager: portage-2.1.2.2

4 files changed, 69 insertions, 21 deletions

diff --git a/dev-libs/openct/ChangeLog b/dev-libs/openct/ChangeLog
index 21311a3f50e9..2be005cd5966 100644
--- a/dev-libs/openct/ChangeLog
+++ b/dev-libs/openct/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openct
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/ChangeLog,v 1.40 2007/03/03 23:10:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/ChangeLog,v 1.41 2007/03/31 18:43:43 kaiowas Exp $
+
+  31 Mar 2007; Petre Rodan <kaiowas@gentoo.org>
+  +files/openct-0.6.11-ifdhandlerv2.patch, openct-0.6.11-r1.ebuild:
+  added fix from bug #168446
 
   03 Mar 2007; Marius Mauch <genone@gentoo.org> openct-0.5.0.ebuild,
   openct-0.6.6.ebuild, openct-0.6.8.ebuild, openct-0.6.9.ebuild,
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index 76dd92f5ee00..8d47c4904dab 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX openct-0.6.11-ifdhandlerv2.patch 1595 RMD160 790dde6e08b9654c698170281a3ae04ed6497b0a SHA1 64c257e3166dbf34957918433db012c20e4b9179 SHA256 06952a3b71dc7036cbed3f832ce024fe99b72fcb302915e6afb8fba5aa62a574
+MD5 b25c1ba37ce3f5dfc7a169aeebdd2c94 files/openct-0.6.11-ifdhandlerv2.patch 1595
+RMD160 790dde6e08b9654c698170281a3ae04ed6497b0a files/openct-0.6.11-ifdhandlerv2.patch 1595
+SHA256 06952a3b71dc7036cbed3f832ce024fe99b72fcb302915e6afb8fba5aa62a574 files/openct-0.6.11-ifdhandlerv2.patch 1595
 AUX openct.rc 591 RMD160 527d3d4a1028882c9f36126fdefd0bd71bf39028 SHA1 6a4fd3b682d73347eb3efd44d4581bd274f0eb53 SHA256 4004ac1d1046247b15e056fcc9bef6cc29b8bfbe7d2f2c2b31eec0e11f2b434f
 MD5 f9bb624a2f171539f67614d14137476f files/openct.rc 591
 RMD160 527d3d4a1028882c9f36126fdefd0bd71bf39028 files/openct.rc 591
@@ -14,10 +15,10 @@ EBUILD openct-0.5.0.ebuild 1736 RMD160 901080eb03e60d9703745a142fcb3a2395f36a02
 MD5 04d660d849f852418bdc802f1148cf6a openct-0.5.0.ebuild 1736
 RMD160 901080eb03e60d9703745a142fcb3a2395f36a02 openct-0.5.0.ebuild 1736
 SHA256 e97175d2f9bb8d08a34764de341e8dffa8243bbb8233575257a889d4b1c27926 openct-0.5.0.ebuild 1736
-EBUILD openct-0.6.11-r1.ebuild 2111 RMD160 d51e54bc230159134f8dff2175b68e5a6e756a0a SHA1 43fdfd33fa96cdf77ab2196be03a96e26452a8e5 SHA256 ad1b8303da5eba0f75c22ae4dcc84124f00c3dc5da15d6d3cdfd2ec28deb3fcd
-MD5 37b22d1fdf49b0d25486ea250e2381d0 openct-0.6.11-r1.ebuild 2111
-RMD160 d51e54bc230159134f8dff2175b68e5a6e756a0a openct-0.6.11-r1.ebuild 2111
-SHA256 ad1b8303da5eba0f75c22ae4dcc84124f00c3dc5da15d6d3cdfd2ec28deb3fcd openct-0.6.11-r1.ebuild 2111
+EBUILD openct-0.6.11-r1.ebuild 2349 RMD160 aa88e35dc3539e044a6422cec33e11a6b684347b SHA1 0f114e755f25c5c8bf5fb345feeab15b7a58ab16 SHA256 c40f144f3fd76a202b643e4ed3ec185c2cf14943055cd6a69dba72bffcdce33b
+MD5 93c8f593fcdd3c3eb982ecc6df2183bb openct-0.6.11-r1.ebuild 2349
+RMD160 aa88e35dc3539e044a6422cec33e11a6b684347b openct-0.6.11-r1.ebuild 2349
+SHA256 c40f144f3fd76a202b643e4ed3ec185c2cf14943055cd6a69dba72bffcdce33b openct-0.6.11-r1.ebuild 2349
 EBUILD openct-0.6.6.ebuild 1941 RMD160 4a1c452143e70c5d3c2c2ec78bb1cc14ded8aafa SHA1 cd03785be6e59f5010e69d0be807df5ff6fc6de3 SHA256 54e5b39e3d5dfd59b882f334e64abdbafa9692d7586639562852debf9ac50358
 MD5 0c4fdfc27949c79e755742626800d804 openct-0.6.6.ebuild 1941
 RMD160 4a1c452143e70c5d3c2c2ec78bb1cc14ded8aafa openct-0.6.6.ebuild 1941
@@ -30,10 +31,10 @@ EBUILD openct-0.6.9.ebuild 2237 RMD160 26febd9cebea530226392762df7ff6d99ba02a60
 MD5 74acbdc60118b08a6b6b31ff5a0bcbba openct-0.6.9.ebuild 2237
 RMD160 26febd9cebea530226392762df7ff6d99ba02a60 openct-0.6.9.ebuild 2237
 SHA256 132a5992f0bf20c9f32a7a9ab51869c0ec5d5a9769fc97715796df0e876b028e openct-0.6.9.ebuild 2237
-MISC ChangeLog 4699 RMD160 dd9e7cc5b55df7a2512bbce17aa4d5b1b5b869b9 SHA1 a622c277d1055fcbb086489b67d17b5db9d01283 SHA256 072de45cccf517ede8889a02881232224b021491f7ee0655fd18d69728c0bfdd
-MD5 d20a1af25450513ef21de3f332e13ef4 ChangeLog 4699
-RMD160 dd9e7cc5b55df7a2512bbce17aa4d5b1b5b869b9 ChangeLog 4699
-SHA256 072de45cccf517ede8889a02881232224b021491f7ee0655fd18d69728c0bfdd ChangeLog 4699
+MISC ChangeLog 4846 RMD160 a8d9731dd7b2dfe53edd49977a750c1d71b8db83 SHA1 8fe4ddafec17d66d48497e07cfa78b971686efd1 SHA256 6f866851e27eeccd28c3cea07354b09930065b61ec8aa38e516a3abf9916c77d
+MD5 444738e0983c00f2f32c0ef2d9b3c9e6 ChangeLog 4846
+RMD160 a8d9731dd7b2dfe53edd49977a750c1d71b8db83 ChangeLog 4846
+SHA256 6f866851e27eeccd28c3cea07354b09930065b61ec8aa38e516a3abf9916c77d ChangeLog 4846
 MISC metadata.xml 252 RMD160 bf4ce48e9715a797c6b88e3ed79e6cd504d8fc5d SHA1 cd28dd899e3b8a21556ff4a9cf6b8a278f08268b SHA256 520ce41a7abd75c1dbdfe5656e52c400a45b95adf2826935d3dd86da086b850f
 MD5 bf3888b8063f5cb7d3600a009cf59de6 metadata.xml 252
 RMD160 bf4ce48e9715a797c6b88e3ed79e6cd504d8fc5d metadata.xml 252
@@ -53,10 +54,3 @@ SHA256 1686725d2eae416624e9b2eb8f5dfbd9f8e6f26519c00840e0b0a3101dd13cee files/di
 MD5 cc2709e0e267aa731a5c5b4a31371e16 files/digest-openct-0.6.9 238
 RMD160 28dc21c61c21888c887c6d9aa0fa34a82c806638 files/digest-openct-0.6.9 238
 SHA256 8d3e016ed871cb964578f354c50b2f47dffe3600440f350e0f8c68d9747988f7 files/digest-openct-0.6.9 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF8sGf8bi6rjpTunYRAjg/AJ0TYDmT8daQmTkSxxhIt7F199wkFgCgwK1n
-wyCNHuobPOWz0M1riC0B9cA=
-=ExxE
------END PGP SIGNATURE-----
diff --git a/dev-libs/openct/files/openct-0.6.11-ifdhandlerv2.patch b/dev-libs/openct/files/openct-0.6.11-ifdhandlerv2.patch
new file mode 100644
index 000000000000..7fb968b2a49f
--- /dev/null
+++ b/dev-libs/openct/files/openct-0.6.11-ifdhandlerv2.patch
@@ -0,0 +1,39 @@
+diff -urNp openct-0.6.11.org/configure.ac openct-0.6.11/configure.ac
+--- openct-0.6.11.org/configure.ac	2006-11-22 10:20:23.000000000 +0200
++++ openct-0.6.11/configure.ac	2007-02-26 16:36:59.000000000 +0200
+@@ -104,6 +104,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AM_PROG_LEX
++AM_GNU_GETTEXT([external])
+ AC_PATH_PROG(TEST_MINUS_S_SH, bash)
+ AC_PATH_PROG(TEST_MINUS_S_SH, ksh)
+ AC_PATH_PROG(TEST_MINUS_S_SH, sh)
+diff -urNp openct-0.6.11.org/src/pcsc/Makefile.am openct-0.6.11/src/pcsc/Makefile.am
+--- openct-0.6.11.org/src/pcsc/Makefile.am	2006-06-16 20:38:17.000000000 +0300
++++ openct-0.6.11/src/pcsc/Makefile.am	2007-02-26 16:36:59.000000000 +0200
+@@ -11,11 +11,10 @@ lib_LTLIBRARIES = openct-ifd.la
+ endif
+ 
+ openct_ifd_la_SOURCES = pcsc.c
++openct_ifd_la_CPPFLAGS = -DIFDHANDLERv2
+ openct_ifd_la_LDFLAGS = -module -avoid-version
+ openct_ifd_la_LIBADD = ../ctapi/libopenctapi.la
+ 
+-noinst_HEADERS = ifdhandler.h
+-
+ # Don't use HAVE_BUNDLES for this case, pcsc-lite loads
+ # USB drivers from MacOS X like bundles for all platforms
+ install-exec-local: install-libLTLIBRARIES
+diff -urNp openct-0.6.11.org/src/pcsc/Makefile.in openct-0.6.11/src/pcsc/Makefile.in
+--- openct-0.6.11.org/src/pcsc/Makefile.in	2006-11-22 10:22:09.000000000 +0200
++++ openct-0.6.11/src/pcsc/Makefile.in	2007-02-26 16:37:09.000000000 +0200
+@@ -222,7 +222,7 @@ INCLUDES = -I$(top_srcdir)/src/ctapi $(C
+ openct_ifd_la_SOURCES = pcsc.c
+ openct_ifd_la_LDFLAGS = -module -avoid-version
+ openct_ifd_la_LIBADD = ../ctapi/libopenctapi.la
+-noinst_HEADERS = ifdhandler.h
++noinst_HEADERS = 
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/dev-libs/openct/openct-0.6.11-r1.ebuild b/dev-libs/openct/openct-0.6.11-r1.ebuild
index 340915506ef0..12c4fcd51694 100644
--- a/dev-libs/openct/openct-0.6.11-r1.ebuild
+++ b/dev-libs/openct/openct-0.6.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.11-r1.ebuild,v 1.4 2007/03/03 23:10:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.11-r1.ebuild,v 1.5 2007/03/31 18:43:43 kaiowas Exp $
 
-inherit eutils multilib
+inherit flag-o-matic eutils multilib
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="http://www.opensc-project.org/openct/"
@@ -20,7 +20,18 @@ pkg_setup() {
 	enewgroup openct
 }
 
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.6.11-ifdhandlerv2.patch"
+	rm "src/pcsc/ifdhandler.h"
+}
+
 src_compile() {
+	# eautoreconf did not went so great...
+	# adding additions here.
+	append-flags "-DIFDHANDLERv2"
+
 	econf --localstatedir=/var || die
 	emake || die
 }