commit: 1266680a192f79847de24d775c8c7d8056760521 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> AuthorDate: Tue Mar 14 23:32:19 2017 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Wed Mar 15 06:26:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1266680a
dev-libs/opensc: cleanup Bug: 611512 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/opensc/Manifest | 1 - .../opensc/files/opensc-0.12.1-crossbuild.patch | 38 ----------- dev-libs/opensc/files/opensc-0.12.2-dl.patch | 42 ------------- .../files/opensc-0.12.2-parallelinstall.patch | 67 -------------------- dev-libs/opensc/metadata.xml | 4 -- dev-libs/opensc/opensc-0.12.2-r2.ebuild | 73 ---------------------- 6 files changed, 225 deletions(-) diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index a1601c2cc3f..c55f52e15fd 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,2 +1 @@ -DIST opensc-0.12.2.tar.gz 1738553 SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675 SHA512 544971f2c79723f618806c7043f0f1ffc25332752cbcaec97ffb1c99f9a2dff2237a6e5f5e020a4b9878921fec3a5234ca7e4fe9c8175c3f6142b169fcc65334 WHIRLPOOL 4969811d68d72e82c3a2b0297d5ff9aaca083b6ef8e66223d4385dce35cd9560cdda7cca8ccd38b52eb55465dbd6f8704485778b21d2a88bb548a5bbd87071e2 DIST opensc-0.16.0.tar.gz 1760418 SHA256 3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139 WHIRLPOOL 8207606e4994d7744fc93cc6aef1b0cde8a2073e791aebf71e82669013d261f82abc6e41ddf971fb136d4580c21ea475bb2e36bbdec600b354f5e1decec4b02a diff --git a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch deleted file mode 100644 index 008fd3c3570..00000000000 --- a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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/files/opensc-0.12.2-dl.patch b/dev-libs/opensc/files/opensc-0.12.2-dl.patch deleted file mode 100644 index 526ef8161a8..00000000000 --- a/dev-libs/opensc/files/opensc-0.12.2-dl.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1b896582a0cd74854f99e08854554807a8f1f764 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -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 <[email protected]> ---- - 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/files/opensc-0.12.2-parallelinstall.patch b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch deleted file mode 100644 index 3ef24ec3d25..00000000000 --- a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4ede74dd803ddbc4d0686bec0749459f54854495 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <[email protected]> -Date: Sun, 13 May 2012 14:55:35 -0700 -Subject: [PATCH] build: fix parallel install by creating directory in the - rule -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Relying on the rule that creates the directory is a bad idea to be -parallel safe. - -(Patch modified to use autoconf's MKDIR_P instead of automake's -deprecated mkdir_p, allowing use of automake 1.12). - -Signed-off-by: Diego Elio Pettenò <[email protected]> ---- - etc/Makefile.am | 4 ++-- - src/pkcs11/Makefile.am | 7 ++++--- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/etc/Makefile.am b/etc/Makefile.am -index 0ef546f..3b75995 100644 ---- a/etc/Makefile.am -+++ b/etc/Makefile.am -@@ -18,8 +18,8 @@ opensc.conf: opensc.conf.in force - -e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \ - < $< > $@ - --sysconf_DATA=#required in order to create dir --install-exec-hook: install-sysconfDATA opensc.conf -+install-exec-hook: opensc.conf -+ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" - if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ - $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ - else \ -diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am -index 8ff9abc..211055b 100644 ---- a/src/pkcs11/Makefile.am -+++ b/src/pkcs11/Makefile.am -@@ -53,19 +53,20 @@ pkcs11-jar: jar-dir - -k"testcert" jar-dir - - if WIN32 --install-exec-hook: install-pkcs11DATA -+install-exec-hook: -+ $(MKDIR_P) "$(DESTDIR)$(libdir)" - for l in opensc-pkcs11.dll onepin-opensc-pkcs11.dll pkcs11-spy.dll; do \ - mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \ - done - else - # see http://wiki.cacert.org/wiki/Pkcs11TaskForce --pkcs11_DATA = #This will create the directory - if CYGWIN - PKCS11_SUFFIX=.dll - else - PKCS11_SUFFIX=.so - endif --install-exec-hook: install-pkcs11DATA -+install-exec-hook: -+ $(MKDIR_P) "$(DESTDIR)$(pkcs11dir)" - for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \ - rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \ - $(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \ --- -1.7.8.6 - diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml index ddf27490bc2..709cad6d774 100644 --- a/dev-libs/opensc/metadata.xml +++ b/dev-libs/opensc/metadata.xml @@ -16,10 +16,6 @@ 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. diff --git a/dev-libs/opensc/opensc-0.12.2-r2.ebuild b/dev-libs/opensc/opensc-0.12.2-r2.ebuild deleted file mode 100644 index cf0270b74fd..00000000000 --- a/dev-libs/opensc/opensc-0.12.2-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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" - -# Drop the libtool dep once libltdl goes stable. -RDEPEND="libtool? ( || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) ) - zlib? ( sys-libs/zlib ) - readline? ( sys-libs/readline:0 ) - ssl? ( dev-libs/openssl:0 ) - 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) \ - $(use_enable ssl openssl) \ - ${myconf} -} - -src_install() { - default - find "${ED}"/usr -name '*.la' -delete -}
