Revision bump, thanks to Alon Bar-Lev in bug #351634: re-enable openct backend as an alternative to pcsc-lite (which otherwise would require some KEYWORDS to be dropped); use EAPI=4 and REQUIRED_USE to specify that exactly one between pcsc-lite and openct can be enabled; enable pcsc-lite by default; (these last two also fix bug #363119 by William Keaney); depend on libxslt and docbook stylesheets as it's required to produce the man pages; general cleanups.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

2 files changed, 28 insertions, 16 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 21791318e1b0..d0f51ffadeb9 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,18 @@
 # 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.110 2011/03/14 00:33:33 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.111 2011/04/12 07:13:18 flameeyes Exp $
+
+*opensc-0.12.0-r1 (12 Apr 2011)
+
+  12 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> -opensc-0.12.0.ebuild,
+  +opensc-0.12.0-r1.ebuild:
+  Revision bump, thanks to Alon Bar-Lev in bug #351634: re-enable openct
+  backend as an alternative to pcsc-lite (which otherwise would require some
+  KEYWORDS to be dropped); use EAPI=4 and REQUIRED_USE to specify that exactly
+  one between pcsc-lite and openct can be enabled; enable pcsc-lite by default;
+  (these last two also fix bug #363119 by William Keaney); depend on libxslt
+  and docbook stylesheets as it's required to produce the man pages; general
+  cleanups.
 
 *opensc-0.12.0 (14 Mar 2011)
 
diff --git a/dev-libs/opensc/opensc-0.12.0.ebuild b/dev-libs/opensc/opensc-0.12.0-r1.ebuild
index 9737ead9ca0b..9894e69d59d3 100644
--- a/dev-libs/opensc/opensc-0.12.0.ebuild
+++ b/dev-libs/opensc/opensc-0.12.0-r1.ebuild
@@ -1,12 +1,10 @@
 # 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.0.ebuild,v 1.1 2011/03/14 00:33:33 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.0-r1.ebuild,v 1.1 2011/04/12 07:13:18 flameeyes Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit eutils autotools
-
-DESCRIPTION="SmartCard library and applications"
+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"
@@ -14,34 +12,36 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc pcsc-lite readline ssl zlib"
+IUSE="doc +pcsc-lite openct readline ssl zlib"
 
 # libtool is required at runtime for libltdl
-RDEPEND="
-	sys-devel/libtool
+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"
+	dev-util/pkgconfig
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
 
-src_prepare() {
-	eautoreconf
-}
+REQUIRED_USE="^^ ( pcsc-lite openct )"
 
 src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
 		$(use_enable doc) \
+		$(use_enable openct) \
 		$(use_enable pcsc-lite pcsc) \
 		$(use_enable readline) \
 		$(use_enable ssl openssl) \
-		$(use_enable zlib) \
-		--with-pinentry="/usr/bin/pinentry"
+		$(use_enable zlib)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
+
+	dodoc ChangeLog
 }