Version bump.

Package-Manager: portage-14708-svn/cvs/Linux x86_64

4 files changed, 35 insertions, 51 deletions

diff --git a/dev-libs/engine_pkcs11/ChangeLog b/dev-libs/engine_pkcs11/ChangeLog
index 0fe7b7fe0337..cbfe75a492a0 100644
--- a/dev-libs/engine_pkcs11/ChangeLog
+++ b/dev-libs/engine_pkcs11/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/engine_pkcs11
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/engine_pkcs11/ChangeLog,v 1.27 2009/08/31 00:51:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/engine_pkcs11/ChangeLog,v 1.28 2009/10/24 01:15:13 arfrever Exp $
+
+*engine_pkcs11-0.1.7 (24 Oct 2009)
+
+  24 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -engine_pkcs11-0.1.4.ebuild, -engine_pkcs11-0.1.5.ebuild,
+  +engine_pkcs11-0.1.7.ebuild:
+  Version bump.
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> engine_pkcs11-0.1.6.ebuild:
   Marking engine_pkcs11-0.1.6 ppc64 for bug 279370
diff --git a/dev-libs/engine_pkcs11/Manifest b/dev-libs/engine_pkcs11/Manifest
index 8d87472e83ad..5e7090f98b0e 100644
--- a/dev-libs/engine_pkcs11/Manifest
+++ b/dev-libs/engine_pkcs11/Manifest
@@ -1,9 +1,7 @@
 AUX engine_pkcs11-0.1.6-fix_implicit_declaration.patch 219 RMD160 f53c4bcd6b7e7b4b7b1cf0e8485124885bc34b80 SHA1 50b49a887233ad05f8709af3ef1d38e1429f3c3d SHA256 f50096a295b07bd68fd4544213ceeb283aa7ce6d62da9cafcff4feca04212878
-DIST engine_pkcs11-0.1.4.tar.gz 332993 RMD160 972e0280d22dd00ffcb4d125e8e2cea60113a04f SHA1 6078a6f2a11a32fceb52e13afc233deafabfab6d SHA256 3a361968c608abc6079bd6a55ac6152ff71828e35dede33aa438314fbd377198
-DIST engine_pkcs11-0.1.5.tar.gz 355324 RMD160 e1edcab5008cc0d524c904808de3344b9520700e SHA1 189da9a9156c86df99d16567acbf141869f87729 SHA256 528514d935ec0063df9adb36b3545cfc27fe71554fa30365a821df6b839707e0
 DIST engine_pkcs11-0.1.6.tar.gz 316595 RMD160 5b211ee7b02acffc2c3e5e47a02acad75196eaef SHA1 5256971d24d2c5470ecdd26ca62ceb2aec8d9c7a SHA256 2676ef403b820b416d1a57a9f2cd8b56f9b5eebf4014962c1dd22c15d6339f9e
-EBUILD engine_pkcs11-0.1.4.ebuild 655 RMD160 245e26e0b33506e038cd7b4b12de1d4bf5801036 SHA1 9f40a44ccf51c2d4eba68077cb8942d6785cfac5 SHA256 a4215cf5570d57ac4f665c5e386b98a27509483042dfdbe169fc5d606a91eb21
-EBUILD engine_pkcs11-0.1.5.ebuild 1192 RMD160 033d6b8ef51eac84e7a3425d3ae5b5ca9e5ad758 SHA1 cad59f18307fc18c093745b229301cbcec4bd71f SHA256 0b6c4365ec83273c2a7bd972f256299a132c0f854e93620db0f904b57e6e3626
+DIST engine_pkcs11-0.1.7.tar.gz 316910 RMD160 ec99db1146426d1b061ee7873428442335bf7faf SHA1 922c90c601610fa75e948875525015f9bf2067aa SHA256 c54c59aaf1e65ef8acccdb8c3d33cdfe87c46d1598c2c9675e6023a6d94c00ee
 EBUILD engine_pkcs11-0.1.6.ebuild 1188 RMD160 5c009991886b7f5eb362641a7c44e3a737c961dd SHA1 208973b679e14eea2ccac1b859294abacd554bdc SHA256 bceb3b5fb877d817cfea80fa7257ef8021b2c313739f7943b284041f2b30795a
-MISC ChangeLog 3555 RMD160 969acadde681a0de5a938fb011d324b3744c485f SHA1 34beb78ff795d4595bc21c0a74f514b02d02066c SHA256 9509f1b9a04b7adcea5bd3e194e32872c6847afa189de6acf1450684242c6c26
+EBUILD engine_pkcs11-0.1.7.ebuild 1204 RMD160 9e240619942ad4c7358bd70c4abad4b551bbf062 SHA1 6f27c94d0bd56cf7ce1a52e7778818c2f5455daa SHA256 fa48d60f514e403be0ed8a7d33302bde70606fee713ad2bc4973552b0f3b9be1
+MISC ChangeLog 3774 RMD160 6e6d7c6b45bcd3bf561b5cc26bcd7ea54d7e5b82 SHA1 7092eef7a3ac84b20b420642ea8eb9eec86f03bc SHA256 f7dc5c5f2ee162c1b6bb166334ddaa5f85b25bda6486dfcb3b3f3684deb327d1
 MISC metadata.xml 262 RMD160 15f941871ce0d72284039fdb45b91633f88726f3 SHA1 b1682b27539486cbd4e068669b0aec8a2b3d3734 SHA256 fd8372c0bef508b23fa4b1c192b29931df7de65872b78b1e2bb470c33542b7b5
diff --git a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.4.ebuild b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.4.ebuild
deleted file mode 100644
index 08df7f79b581..000000000000
--- a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/engine_pkcs11/engine_pkcs11-0.1.4.ebuild,v 1.9 2008/10/31 21:58:05 gmsoft Exp $
-
-DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
-HOMEPAGE="http://www.opensc-project.org/"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/libp11"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dohtml doc/*.html doc/*.css
-}
diff --git a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.5.ebuild b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.7.ebuild
index 29df3e6a0c17..455f48f2b348 100644
--- a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.5.ebuild
+++ b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.7.ebuild
@@ -1,51 +1,50 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/engine_pkcs11/engine_pkcs11-0.1.5.ebuild,v 1.1 2008/08/30 05:12:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/engine_pkcs11/engine_pkcs11-0.1.7.ebuild,v 1.1 2009/10/24 01:15:13 arfrever Exp $
 
-DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
-HOMEPAGE="http://www.opensc-project.org/engine_pkcs11"
+EAPI="2"
 
 if [[ "${PV}" = "9999" ]]; then
-	inherit subversion autotools
+	inherit autotools subversion
 	ESVN_REPO_URI="http://www.opensc-project.org/svn/${PN}/trunk"
-	KEYWORDS=""
 else
+	inherit eutils
 	SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
+DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
+HOMEPAGE="http://www.opensc-project.org/engine_pkcs11"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-DEPEND=">=dev-libs/libp11-0.2.4
+DEPEND=">=dev-libs/libp11-0.2.5
 	dev-libs/openssl"
 RDEPEND="${DEPEND}"
 
-[[ "${PV}" = "9999" ]] && DEPEND="${DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
+if [[ "${PV}" = "9999" ]]; then
+	DEPEND="${DEPEND}
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt"
 
-src_unpack() {
-	if [ "${PV}" = "9999" ]; then
-		subversion_src_unpack
-		cd "${S}"
+	src_prepare() {
 		eautoreconf
-	else
-		unpack ${A}
-		cd "${S}"
-	fi
-}
+	}
+else
+	src_prepare() {
+		epatch "${FILESDIR}/${PN}-0.1.6-fix_implicit_declaration.patch"
+	}
+fi
 
-src_compile() {
+src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
-		$(use_enable doc) \
-		|| die
-	emake || die
+		$(use_enable doc)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}" || die "emake install failed"
 }