dev-libs/opensc: Version bump wrt 374309.

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

4 files changed, 138 insertions, 2 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index e2c54d82beaa..1a1a3f446334 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.114 2011/07/03 17:13:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.115 2011/07/07 14:27:49 c1pher Exp $
+
+*opensc-0.12.1 (07 Jul 2011)
+
+  07 Jul 2011; Dane Smith <c1pher@gentoo.org> +opensc-0.12.1.ebuild,
+  +files/opensc-0.12.1-crossbuild.patch:
+  Version bump wrt bug 374309. Adjusted the existing crossbuild patch
+  for the new version. Removed no longer needed || die.
 
   03 Jul 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   opensc-0.12.0-r2.ebuild, +files/opensc-0.12.0-crossbuild.patch:
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 054618657062..bdbdc40d09eb 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,10 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX opensc-0.11.13+pcsc-lite-1.6.2.patch 2581 RMD160 ecff368edb374c1f5965b34f0e342fc5ac7e1e45 SHA1 969d4e9312b9056288d4699c4275a9d118d50443 SHA256 de08b3a968068ed600aa172891be59f0bb0b8a432bc6eea8fcc99a405ee309f5
 AUX opensc-0.11.13-overflows.patch 2463 RMD160 d5879f4f5acde30828904c78df5f8973d071d49b SHA1 701383d7df0ccf4e154361a43f23c552eee1b498 SHA256 fd2071a803ed34ec961ab7a4dcddedaf00180e2fc54a1b53f9af945f2960c921
 AUX opensc-0.12.0-crossbuild.patch 1976 RMD160 e5d4a702f3cebef3ba24fca175aac3752a83a0be SHA1 ed3e6d1e2c6e248e6eaa9e53fde50fa6c75b6b97 SHA256 daa295cbdee3b27d9e0c9d5bc86361f272f5b36613f7f07657e7de2b4b3d628f
+AUX opensc-0.12.1-crossbuild.patch 1839 RMD160 21c3ce0de0c293ed76c003bf8327908329e43f9f SHA1 d5e730f5c7f64f1e6aa137edef726901059fb183 SHA256 dd1f76f60d6223fc86ee80f500b89ffc3dfebffac04ef999f58df17d90b1bedb
 DIST opensc-0.11.13.tar.gz 1513327 RMD160 cd900866e51cd64fa7c5a3287cd58193dec26528 SHA1 408b374286004c3df15ec17856f69fd4c2a1aceb SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890
 DIST opensc-0.12.0.tar.gz 1409151 RMD160 ff377d21daaf2777b8518ed166237f831692f36d SHA1 1400da0732a4cbf9ff7f8296bf59c6e153207247 SHA256 84f8a8e1825e487d321390f0650c590334c76f81291d2eb5a315ad73459d2f6f
+DIST opensc-0.12.1.tar.gz 1579129 RMD160 ab1f1a27fce1e2769d21d15c79fd7eef386ba4cd SHA1 656524f2aef61cfeea60b7795ef5a942bcca6f30 SHA256 e9b5812dd8024484c6bb7400fb3e638aca2e9b112a7ffb161c300fe2260b28c8
 EBUILD opensc-0.11.13-r2.ebuild 1489 RMD160 7c6e0575e7fc039e46f2e6ebe26cdfbd1cc5829c SHA1 5976153f2bfebaf86a9f005b4b476e157b613574 SHA256 1653ee4eabb0e6e628a7b837dbeed8bb2e66b1c08b5016ec7f89ca8aa8ebd932
 EBUILD opensc-0.11.13.ebuild 1288 RMD160 e5266eda5f28fdbf5e089819b535e95a963de651 SHA1 88c390b973d87168b2c225ec06202f66ff56b057 SHA256 feda7102d4b9446ee2de8bd20e8d588ec078d07863fbb3080c4fe5bce9f7172e
 EBUILD opensc-0.12.0-r2.ebuild 1663 RMD160 2300666e6134e6346367ef7c2f1fba56aeeae156 SHA1 7ed57247ce30cb80e71156498497401b6e184452 SHA256 98e750199b69c59a6cadc2e55610e4ae993bb2d0621dde70497aa5260921c78c
-MISC ChangeLog 16790 RMD160 dbd830c4272cdd8c8d8f248b228d5bf341f5beec SHA1 28c65934d57038cf723b6dacd0f44bff6d5cdeac SHA256 730f0e7b9adc4e882f1e687c529455cc949c7a9aabdc39ac0360bc3271bd9121
+EBUILD opensc-0.12.1.ebuild 1650 RMD160 9539b40ef815a1f209b1007e9d0ff20170d594d7 SHA1 1d4d4d4593f3a333115ca2cac6e1ba307ad704ee SHA256 67b72cb7ce428d533c0df98a8076d1453ae1c45bc03f2d47ee74134cc113fbe8
+MISC ChangeLog 17054 RMD160 5cfd812f0c400d0270284790523b53a1b9e71af2 SHA1 47a24328bf525634d52a5860bb850bb6d2539684 SHA256 628de2f0325a4c02074c245f08fb57de7b862571048c2d02555881c79e4d1f81
 MISC metadata.xml 1161 RMD160 a4ab8cb7e93834292b97390869bff0d1b43b6a1b SHA1 d3b39e7342bdae1b0411566db527680411212109 SHA256 d0a32ae880a24b767b8bd284c3545f39e8af70adbcbd6ce87685c6d21de5fcc8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOFcJjAAoJEEsurZwMLhUxZRYP/3gOyFlsSA9ujNSNTc2a46R1
+cSeKOTMlLPKdZrB1AQwXIW8Ndy0ofPZtwGyMXvcP5VTTw3/Gav/Q9WIzLAMeclgH
++AnfEkUc6yL3yklmSRGGolktT3qfRDWJ3EfwE03az4XsbS5Vxqvj3JBfTJOuE982
+5Ada+tGYaDgrm9WN21EURR3JPylvIvyNig/RU/S6VB8qIeL0EHs1M7DDREiNysYf
+smqreB2dGuK0jCO4crK8c4tlY4G3KA0TpemHDcqakEyQxhSLE3iuG91TJnrWykU0
+5uE9z+qgPBHtIej09lRulCRRwmXWMAtK7fEt3Z7jxR9KxIpTiWS/wnq1VoHoTEjq
+7sJDzEncuRXza8tXPNwqquoIOt3EnLWgrTsJZJfS2EHJHXmEBnBHI55w9HRDU9J3
+bZ+BgpoAjSvq7mTZBE280IVJWKHcaeevAktEEqls0Rgae7z7Cen2SuZLT9aLp6PQ
+9Il9VNyaFLNbWOOAMVPtg4cBNLK36vhvfD+tBor1l2Y7Cjmtog5EiJkf4rQN0Ir6
+zRnrKlBycA9yQtbIRO6TvTQYVeFUMGqxeJhH9EYqT/tkZdwy+1JlWAKGc+iBU1BQ
+HFR8/BBGam4QQc12hPqv4c1YMiRPjjeBcHjYLRXWb+HS/082Dkm7QsQS5HDQ1xTe
+oFwr+lsXT6BXXkOoaiVU
+=PDgO
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
new file mode 100644
index 000000000000..008fd3c35700
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
@@ -0,0 +1,38 @@
+--- src/pkcs11/Makefile.am	2011-05-17 13:07:00.000000000 -0400
++++ Makefile.am.new	2011-07-07 10:03:28.399185928 -0400
+@@ -14,9 +14,10 @@
+ 	mechanism.c openssl.c framework-pkcs15.c \
+ 	framework-pkcs15init.c debug.c opensc-pkcs11.exports \
+ 	pkcs11-display.c pkcs11-display.h
+-OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS) \
++OPENSC_PKCS11_LIBS = \
+ 	$(top_builddir)/src/common/libcompat.la \
+-	$(top_builddir)/src/libopensc/libopensc.la
++	$(top_builddir)/src/libopensc/libopensc.la \
++	$(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS)
+ 
+ opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-disabled.c
+ opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
+@@ -31,7 +32,7 @@
+ 	-module -shared -avoid-version -no-undefined
+ 
+ pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports
+-pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) $(top_builddir)/src/common/libpkcs11.la
++pkcs11_spy_la_LIBADD = $(top_builddir)/src/common/libpkcs11.la $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
+ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
+ 	-export-symbols "$(srcdir)/pkcs11-spy.exports" \
+ 	-module -shared -avoid-version -no-undefined
+--- src/tools/Makefile.am	2011-05-17 13:07:00.000000000 -0400
++++ Makefile.am.new	2011-07-07 10:06:08.710185925 -0400
+@@ -24,8 +24,9 @@
+ pkcs15_tool_SOURCES = pkcs15-tool.c util.c
+ pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
+ pkcs11_tool_SOURCES = pkcs11-tool.c util.c
+-pkcs11_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
+-	$(top_builddir)/src/common/libpkcs11.la
++pkcs11_tool_LDADD = \
++	$(top_builddir)/src/common/libpkcs11.la \
++	$(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
+ pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c
+ pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS)
+ cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c
diff --git a/dev-libs/opensc/opensc-0.12.1.ebuild b/dev-libs/opensc/opensc-0.12.1.ebuild
new file mode 100644
index 000000000000..9e732fde159e
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.12.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.1.ebuild,v 1.1 2011/07/07 14:27:49 c1pher Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="Libraries and applications to access smartcards."
+HOMEPAGE="http://www.opensc-project.org/opensc/"
+
+SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc +pcsc-lite openct readline ssl zlib"
+
+# libtool is required at runtime for libltdl
+RDEPEND="sys-devel/libtool
+	zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline )
+	ssl? ( dev-libs/openssl )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct )
+	openct? ( !pcsc-lite )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-crossbuild.patch
+	eautoreconf
+}
+
+src_configure() {
+	# disable everything, enable selectively
+	local myconf="--disable-pcsc --disable-openct --disable-ctapi"
+
+	if use pcsc-lite; then
+		myconf+=" --enable-pcsc"
+	elif use openct; then
+		myconf+=" --enable-openct"
+	else
+		myconf+=" --enable-ctapi"
+	fi
+
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--htmldir="/usr/share/doc/${PF}/html" \
+		--disable-static \
+		$(use_enable doc) \
+		$(use_enable openct) \
+		$(use_enable readline) \
+		$(use_enable zlib) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete
+
+	dodoc ChangeLog
+}