From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 13 Sep 2011 22:29:44 +0000 (+0000)
Subject: Version bump.  Add USE=libtool to control the libltdl dep (and prefer libdl/dlopen... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6894c447d80fab9e353cc14261fe0724aeba0b2f;p=gentoo.git

Version bump.  Add USE=libtool to control the libltdl dep (and prefer libdl/dlopen), and add USE=static-libs.

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

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 1a1a3f446334..f8def37bfac5 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.115 2011/07/07 14:27:49 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.116 2011/09/13 22:29:44 vapier Exp $
+
+*opensc-0.12.2 (13 Sep 2011)
+
+  13 Sep 2011; Mike Frysinger <vapier@gentoo.org> +opensc-0.12.2.ebuild,
+  metadata.xml:
+  Version bump. Add USE=libtool to control the libltdl dep (and prefer
+  libdl/dlopen), and add USE=static-libs.
 
 *opensc-0.12.1 (07 Jul 2011)
 
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index bdbdc40d09eb..21697446dcae 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -8,26 +8,18 @@ AUX opensc-0.12.1-crossbuild.patch 1839 RMD160 21c3ce0de0c293ed76c003bf832790832
 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
+DIST opensc-0.12.2.tar.gz 1738553 RMD160 45504135db05fd404a357ebd8bea047c5c8604dc SHA1 8c34be52eb94025eb181c02b466223901bef744c SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675
 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
 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
+EBUILD opensc-0.12.2.ebuild 1995 RMD160 b05a0d3ed7fb0b3130de17a200d3921377eb7a62 SHA1 b171832c59f34331472a812bae518bf0af8a886d SHA256 ada230a84d2f2ddc12ff7c1d1243dda9b76a06e74421833c8857ee9bb0d52be0
+MISC ChangeLog 17287 RMD160 1227cb506562a063b0dcbb0fc0ff2ac5b05110d9 SHA1 da5622c3ff0d5d1771b0a054492001c9e96e6cd6 SHA256 cd6340903a22ce3b3f703448f7c90b570d08281341599dc74e646ed237c9e62b
+MISC metadata.xml 1322 RMD160 c7e8d6ae1d7474f49a0a5167c046e26deefc67e1 SHA1 4834a5d29302898026b878aca75c51ccad4bde07 SHA256 4bc1d4fac5acdfea7a9ffd78a107b1a4cb2d1b0e62930367b7ded696604dc94e
 -----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
+iF4EAREIAAYFAk5v2V8ACgkQaC/OocHi7JZeVQD/R7J/sneqKe+o1THxnkQmXq11
+M6XBYcLb+w7Y3FGJWSYA/iJdGKpAVnjlnqufUzlU9Gw7v9+4LgMCVQ0N9NNcRxPQ
+=peJ/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 195b2cb7eeda..c007e49dd1ab 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -17,6 +17,11 @@
     card.
   </longdescription>
   <use>
+    <flag name='libtool'>
+      Use <pkg>sys-devel/libtool</pkg> for dynamically loading libraries
+      rather than the host libdl/dlopen helpers.
+    </flag>
+
     <flag name='openct'>
       Use <pkg>dev-libs/openct</pkg> (and CT-API) for accessing
       Smartcard hardware. If neither openct nor pcsc-lite are enabled,
diff --git a/dev-libs/opensc/opensc-0.12.2.ebuild b/dev-libs/opensc/opensc-0.12.2.ebuild
new file mode 100644
index 000000000000..9e888ae46e33
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.12.2.ebuild
@@ -0,0 +1,72 @@
+# 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.2.ebuild,v 1.1 2011/09/13 22:29:44 vapier 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc libtool +pcsc-lite openct readline ssl static-libs zlib"
+
+RDEPEND="libtool? ( 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}"/${PN}-0.12.1-crossbuild.patch
+	eautoreconf
+}
+
+usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
+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
+
+	# the configure script prefers libtool's libltdl over
+	# the native system's dlopen ... so we have to manually
+	# control the behavior to something a bit more sane
+	export ac_cv_header_ltdl_h=$(usex libtool) \
+	       ac_cv_lib_ltdl_lt_dlopen=$(usex libtool)
+
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--htmldir="/usr/share/doc/${PF}/html" \
+		$(use_enable doc) \
+		$(use_enable openct) \
+		$(use_enable readline) \
+		$(use_enable static-libs static) \
+		$(use_enable zlib) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use static-libs || find "${D}" -name '*.la' -delete
+	dodoc ChangeLog
+}