Version bump.

(Portage version: 13851-svn/cvs/Linux x86_64)

3 files changed, 13 insertions, 56 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 0c51ebcfb4a4..46843b6eab42 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.72 2009/05/22 22:45:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.73 2009/07/29 14:00:10 arfrever Exp $
+
+*opensc-0.11.9 (29 Jul 2009)
+
+  29 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -opensc-0.11.6.ebuild, -opensc-0.11.7.ebuild, +opensc-0.11.9.ebuild:
+  Version bump.
 
   22 May 2009; Markus Meier <maekke@gentoo.org> opensc-0.11.8.ebuild:
   amd64 stable, bug #269920
diff --git a/dev-libs/opensc/opensc-0.11.7.ebuild b/dev-libs/opensc/opensc-0.11.7.ebuild
deleted file mode 100644
index a15355f45ca3..000000000000
--- a/dev-libs/opensc/opensc-0.11.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.7.ebuild,v 1.10 2009/04/10 21:51:20 arfrever Exp $
-
-inherit multilib
-
-DESCRIPTION="SmartCard library and applications"
-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="pcsc-lite openct nsplugin doc"
-
-RDEPEND="dev-libs/openssl
-	sys-libs/zlib
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	nsplugin? (
-		app-crypt/pinentry
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nsplugin? ( dev-libs/libassuan )"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
-		$(use_enable openct) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable nsplugin) \
-		$(use_enable doc) \
-		--with-pinentry="/usr/bin/pinentry"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-}
-
-pkg_postinst() {
-	elog "This package is a security fix to CVE-2009-0368. If you have private keys on your"
-	elog "smart card intialised by this package they may be stored with improper access restrictions."
-	elog "See advisory http://thread.gmane.org/gmane.comp.encryption.opensc.announce/22 for"
-	elog "full details and mitigation advice"
-}
diff --git a/dev-libs/opensc/opensc-0.11.6.ebuild b/dev-libs/opensc/opensc-0.11.9.ebuild
index c474eb184005..e1e0572dffd0 100644
--- a/dev-libs/opensc/opensc-0.11.6.ebuild
+++ b/dev-libs/opensc/opensc-0.11.9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.6.ebuild,v 1.7 2009/02/28 22:22:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.9.ebuild,v 1.1 2009/07/29 14:00:10 arfrever Exp $
+
+EAPI="2"
 
 inherit multilib
 
@@ -8,7 +10,7 @@ DESCRIPTION="SmartCard library and applications"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -26,7 +28,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nsplugin? ( dev-libs/libassuan )"
 
-src_compile() {
+src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
@@ -35,9 +37,8 @@ src_compile() {
 		$(use_enable nsplugin) \
 		$(use_enable doc) \
 		--with-pinentry="/usr/bin/pinentry"
-	emake || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 }