Version bump, fix SRC_URI to new locations, cleanup old

(Portage version: 2.2.0_alpha156/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 19 insertions, 49 deletions

diff --git a/dev-libs/pkcs11-helper/ChangeLog b/dev-libs/pkcs11-helper/ChangeLog
index 33bdebe607cd..5a2516c85f07 100644
--- a/dev-libs/pkcs11-helper/ChangeLog
+++ b/dev-libs/pkcs11-helper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/pkcs11-helper
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/ChangeLog,v 1.53 2012/05/04 18:35:49 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/ChangeLog,v 1.54 2013/01/21 11:32:18 alonbl Exp $
+
+*pkcs11-helper-1.10 (21 Jan 2013)
+
+  21 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> +pkcs11-helper-1.10.ebuild,
+  -pkcs11-helper-1.07.ebuild, -pkcs11-helper-1.08.ebuild,
+  pkcs11-helper-1.09.ebuild:
+  Version bump, fix SRC_URI to new locations, cleanup old
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> pkcs11-helper-1.07.ebuild,
   pkcs11-helper-1.08.ebuild, pkcs11-helper-1.09.ebuild:
@@ -194,4 +201,3 @@
   05 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> +metadata.xml,
   +pkcs11-helper-1.02.ebuild:
   Initial import
-
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild
deleted file mode 100644
index f83f7007ce80..000000000000
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild,v 1.8 2012/05/04 18:35:49 jdhore Exp $
-
-DESCRIPTION="PKCS#11 helper library"
-HOMEPAGE="http://www.opensc-project.org/pkcs11-helper"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc gnutls nss"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/openssl-0.9.7
-	gnutls? ( >=net-libs/gnutls-1.4.4 )
-	nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.4.7 )"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable doc) \
-		$(use_enable gnutls crypto-engine-gnutls) \
-		$(use_enable nss crypto-engine-nss)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mv "${D}/usr/share/doc/${PF}/api" "${T}"
-	prepalldocs
-	mv "${T}/api" "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.09.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.09.ebuild
index bd98db2ab9a8..c73f6efec62d 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.09.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.09.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.09.ebuild,v 1.9 2012/05/04 18:35:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.09.ebuild,v 1.10 2013/01/21 11:32:18 alonbl Exp $
 
 EAPI="4"
 
 DESCRIPTION="PKCS#11 helper library"
 HOMEPAGE="http://www.opensc-project.org/opensc/wiki/pkcs11-helper"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.08.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild
index e0d9e9618a1e..8b78364d8095 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.08.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.08.ebuild,v 1.10 2012/05/04 18:35:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild,v 1.1 2013/01/21 11:32:18 alonbl Exp $
 
-EAPI="3"
+EAPI="4"
 
 DESCRIPTION="PKCS#11 helper library"
 HOMEPAGE="http://www.opensc-project.org/opensc/wiki/pkcs11-helper"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc gnutls nss static-libs"
 
 RDEPEND=">=dev-libs/openssl-0.9.7
@@ -30,6 +30,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${ED}" -name "*.la" -print0 | xargs -0 rm -f
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }