Fix linking to -ldl when USE=-libtool.

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

4 files changed, 137 insertions, 9 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 1552e7c34ca6..7c76971bfe18 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.120 2012/05/13 22:13:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.121 2012/05/22 18:27:34 vapier Exp $
+
+*opensc-0.12.2-r1 (22 May 2012)
+
+  22 May 2012; Mike Frysinger <vapier@gentoo.org> +files/opensc-0.12.2-dl.patch,
+  +opensc-0.12.2-r1.ebuild:
+  Fix linking to -ldl when USE=-libtool.
 
   13 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/opensc-0.12.2-parallelinstall.patch,
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index fc4fe69c3943..ec8ab887f942 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -4,21 +4,29 @@ Hash: SHA1
 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.1-crossbuild.patch 1839 RMD160 21c3ce0de0c293ed76c003bf8327908329e43f9f SHA1 d5e730f5c7f64f1e6aa137edef726901059fb183 SHA256 dd1f76f60d6223fc86ee80f500b89ffc3dfebffac04ef999f58df17d90b1bedb
+AUX opensc-0.12.2-dl.patch 1264 RMD160 48acbd83c22bf5f4fcd199ea3b292f84fd798886 SHA1 68434844b65452963d597dfdc82a62a7a8275cb6 SHA256 6d081c0c598b0999fad501ba97f293156d5a64928d769891c18cb6783e01da71
 AUX opensc-0.12.2-parallelinstall.patch 2132 RMD160 4b5401fa9840dca5fc4f78df3e3a6444c39de1f2 SHA1 2f0bc80cf8c5b8d3524f119a65d2e23be3bdcdcd SHA256 bb7b632fe4ef164f09cdff1e02598711bf14207a0e3e428a1b9d2e46715b0495
 DIST opensc-0.11.13.tar.gz 1513327 RMD160 cd900866e51cd64fa7c5a3287cd58193dec26528 SHA1 408b374286004c3df15ec17856f69fd4c2a1aceb SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890
 DIST opensc-0.12.2.tar.gz 1738553 RMD160 45504135db05fd404a357ebd8bea047c5c8604dc SHA1 8c34be52eb94025eb181c02b466223901bef744c SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675
 EBUILD opensc-0.11.13-r2.ebuild 1487 RMD160 161e2629d3c04fb30949d1c798ae985430bcd134 SHA1 3f4bd510e302354ce02c90a4f62e149d3296ed6b SHA256 f95cfe682685f53c1735b322f787daf45caf6f3adfd0c093b0ebeea40ac3a548
+EBUILD opensc-0.12.2-r1.ebuild 1932 RMD160 347f75e8376c819acf5872d7ef63061339b4d41e SHA1 790b73f32deb0a1e1f0f49b2b1539d91257abaef SHA256 57210f8782bd2000b6cb311bab6382474c8732f249bd3c84e495d40223d60aac
 EBUILD opensc-0.12.2.ebuild 1941 RMD160 b81b8df8cffd129fb1ed941516c64a944f904131 SHA1 f3171bd9c964695a98b219c41c41429533d1cc42 SHA256 9e519d03de9d2e7c4982b0f8495123874c11b20dc21eb6bab1ba405de73fe81f
-MISC ChangeLog 18144 RMD160 45a1efe19e157816f69ce4656712a188cf58ab00 SHA1 cf089ea513a4fb60c4225bb806c565a27238cb03 SHA256 bd8f1613110cf280b0b0599502cdcbe4a9330ae7ca92ba0b531ee7d5e8630546
+MISC ChangeLog 18325 RMD160 bb72edb5ea3b3abdc70ca5d9c4b11a8116bbfdb9 SHA1 d3014d77a52217152a5a605f963a94740324e0e0 SHA256 648a6e4e8bb414251c53b98a7e12bf4400939752964cb6ec1fef43b05e9c83ce
 MISC metadata.xml 1322 RMD160 c7e8d6ae1d7474f49a0a5167c046e26deefc67e1 SHA1 4834a5d29302898026b878aca75c51ccad4bde07 SHA256 4bc1d4fac5acdfea7a9ffd78a107b1a4cb2d1b0e62930367b7ded696604dc94e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsDITAAoJEBzRPIrUMBNCNPcH/RVNkgZKxU+pO5pb/VN6gNK4
-B530rvV69T11fFhB4ZgrhUCWG8GgDuxCy0uybhQZ87mODjq8OBWQuhIfw+M+fFiX
-X0ycFpGRDrjmE4i71i8arT1RGlOM6hnpYNS9H4Y7VHcx0zUenEhNP6KajFBQ+Wfs
-/lWdKiSA/ATkgefs8H6wwWTcroUhjeZKiGRxzkMMv8iXKes88fKoqQhM2V2di2eW
-bsXomiSuikwRMkNwhfkGq8HNPAGQ8iu0Uflk6O/ruBlLdqb+juVBzyf30Uc3/8IG
-L/WrQ7Zlw2TfXaQzwxOmp1Y7e5xyGwB+pXtH6a1h2+UaLmfkQw8mdF+F8ay30EI=
-=TPJf
+iQIcBAEBAgAGBQJPu9rlAAoJELEHsLL7fEFWHWEP/2oHiGDwbv04pzHnkozh8llI
+RNyIj/USrXkK88eipEdUUwFTf8MKf+85Jgxb8kS5aKPndtg1gui+T9gilsCXqthI
+KX82VvzVm4R3136iZuD+rTIVd2YgHZJtHiyPUGKRddxCbz581vnQnAkVAqLdDe5s
+pX+6AvTfDRq+8Yg4ppTOMZ8zmkw2G512QtMN51yezIQwKQ9Ir4OY488K45Ux80mI
+P1IdgzTQx5tgvLsE0VnOQqkoXx40w+cIPBEjn69wyUPB21kXQRV+rFP8Bqg9O0/f
+lk5eyxgStMaxX8u5TZFudtxOFQppqEqslpteg7gsbDJGpTmkLuUCYNKw0bg0aCs3
+z7BO69mAwAIOabdohJEIIUQrDg67/Uad2sO/qzm1/vLnBpBG7PqOPtzxgANRSvTy
+pWmH4Rl/o+MXret7K9zJkspX5g9+JbdTwzXLbW1TRIp2rcYBI2uWBIpqj4kk1ist
+pvx6igjsasMZhi2CtUTg4+cVQiPmfRFHQKbAUtiZ1IWV+oPFqjHaBOUTxpXwh33I
+vIoW3sxRHvzc69wVj+UJNMl/Bi11QNSApAWb3W+CviD9jhM5x65AR0CNSJmkEQwq
+i3HHVVYFdViSEsqPDVFUra58iPk10DbXBUIzOrswmCAfsI5vDv/r+/dcu9kSu3KD
+esY8lRTcK5fTOAvd5CC+
+=mqB7
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/opensc-0.12.2-dl.patch b/dev-libs/opensc/files/opensc-0.12.2-dl.patch
new file mode 100644
index 000000000000..526ef8161a89
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.12.2-dl.patch
@@ -0,0 +1,42 @@
+From 1b896582a0cd74854f99e08854554807a8f1f764 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 22 May 2012 14:12:23 -0400
+Subject: [PATCH] link against -ldl when -lltdl is not available
+
+If ltdl isn't found, the code will use dlopen if it's available.
+But it won't link to -ldl which can cause link errors like so:
+
+  CCLD   opensc-tool
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlopen'
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlsym'
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlerror'
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlclose'
+collect2: ld returned 1 exit status
+make[3]: *** [opensc-tool] Error 1
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2751f0f..123aeb1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,6 +277,13 @@ if test -z "${LTLIB_LIBS}"; then
+ 		[LTLIB_LIBS="-lltdl"]
+ 	)
+ fi
++if test -z "${LTLIB_LIBS}"; then
++	AC_CHECK_LIB(
++		[dl],
++		[dlopen],
++		[LTLIB_LIBS="-ldl"]
++	)
++fi
+ 
+ saved_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
+-- 
+1.7.8.6
+
diff --git a/dev-libs/opensc/opensc-0.12.2-r1.ebuild b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
new file mode 100644
index 000000000000..b33e2101a9a2
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/05/22 18:27:34 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 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}
+	virtual/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
+	epatch "${FILESDIR}"/${P}-parallelinstall.patch
+	epatch "${FILESDIR}"/${P}-dl.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
+
+	# 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='$(docdir)/html' \
+		--disable-static \
+		$(use_enable doc) \
+		$(use_enable openct) \
+		$(use_enable readline) \
+		$(use_enable zlib) \
+		${myconf}
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete
+}