Update urls, cleanup

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

5 files changed, 27 insertions, 77 deletions

diff --git a/dev-libs/libp11/ChangeLog b/dev-libs/libp11/ChangeLog
index 2d2595ff60e3..ea868eea8499 100644
--- a/dev-libs/libp11/ChangeLog
+++ b/dev-libs/libp11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libp11
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/ChangeLog,v 1.64 2012/05/04 18:35:48 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/ChangeLog,v 1.65 2014/08/08 08:07:29 alonbl Exp $
+
+  08 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org> -libp11-0.2.7.ebuild,
+  libp11-0.2.8-r1.ebuild, libp11-0.2.8.ebuild:
+  Update urls, cleanup
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> libp11-0.2.7.ebuild,
   libp11-0.2.8.ebuild, libp11-0.2.8-r1.ebuild:
@@ -226,4 +230,3 @@
   03 Jun 2006; Petre Rodan <kaiowas@gentoo.org> +metadata.xml,
   +libp11-0.2.1.ebuild:
   initial commit. contributed by Mark Raddatz in bug #115276
-
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index d5c7bc57ab57..29f8de740676 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libp11-0.2.8-no-ltdl.patch 5184 SHA256 9be90655cfa80a0e3695605a7b7c05cdcc81a8c39c2d347eef6715017cc2b199 SHA512 d8edbf0d615ee787e10391babd71c0d560ef4f71aa31934eed7165dd9ee5fb5214b9894b673843bf17ff2ffc9071daf375072738b82aafacec1f0495ce30957d WHIRLPOOL b51679b4b15e6685a41328042675b17725a39ffddcf1ddcdb003bef55128d993cbd643e1af31b9a866d5ddc475a3dce00640a923cb1857eb19ec26fd8110afe4
-DIST libp11-0.2.7.tar.gz 376422 SHA256 b741e2fea57d692c070111ad843e4bd025c18c0954aaca3df3a076e5142e5f4d SHA512 bec7624592a89b7281430d703655e8e1f934b963f1cee1cdc7dba47f03f226b2d6fab12550a94f534a99055553a6111c795913c4563c872bdd79806dd069ff79 WHIRLPOOL 5609680c1efe492fc477a6ab7c56c6ad65f64184a0c8b7de1df94b1adb990e27cb751cff418910c7f4d04f08c878d851d120904ffc3448e01f2e0003a8df2b20
 DIST libp11-0.2.8.tar.gz 377508 SHA256 a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691 SHA512 917c6623942c83e7657c9b9c4ce0482ffc4539fc29edec9ace412dcece640be3785bf82e09e344c0866b55619ea011ab829ef3d4f8205f2019121d837b1d6c17 WHIRLPOOL fe4f8c6ce952e8a0985bf90af1413c0ba2c2ac84309b1cad55c12f65aa77655e4b9154e1af53d55ba968f9c88a960efd44a4033bcbaa309958f35327eeeac0d9
-EBUILD libp11-0.2.7.ebuild 1229 SHA256 ec7062779d34e62b9f359868c6ddb40508eec13cd70837bd3535c12968034cb5 SHA512 4f7fd6f14129f11ad8761b738071cbff9ceaeaf91a9fa3422516314069e27acab262def8494e2d6e998d894dae29dba3aa6b3c471890b461dbcc4c75d324f807 WHIRLPOOL 882a594960ba050e76d1c2d2dd98f0130d85e493404aa704d2de2942a2f60f7d3bebf3ab35764e3800934640169d552a8ee7f85723f6f1c30924bbd4f4a6136d
-EBUILD libp11-0.2.8-r1.ebuild 1312 SHA256 182a65261910f13cd37c619e71e6abd5148ca2a97b6f93659cc5accf5b96bad4 SHA512 2a8bb745674cece629809f4ec26d2fe1c367278bc66c23f7b3eb7529053ae139d0bc786f79d74818ce2732d06d008bacfaee1c45c6ca1304f0c49e1db02c32be WHIRLPOOL c4616866617369f7b71aaf8535e59b004a3f6b719a957720451d8b6e21b003e44f8207906375ab16f1790902574021fb9d1c5cfcbfdfabac6a4760cb155e6c1d
-EBUILD libp11-0.2.8.ebuild 1361 SHA256 4231c305805e93f7dbe202a43ae2d0536bf481012b53a2d38f6046c149116bed SHA512 6f4764beb3d4295439676734316dbaf9ec7e5af5567ef2e00071e86aef9e8d07c8079cffd86cd089064ae4d06b695b70f60250de770472b3ad6cdebf355b9676 WHIRLPOOL 9fbd95181b08410d96c81f8620237cf1e9f5348c2772706d180ecd183e171e585e12d82f21ea7676d36b7ad8ab6bcc9092908e24d881b28283d55f169455cada
-MISC ChangeLog 7692 SHA256 195ec4b416b494df816fcbd7dc1c28a08a57519295fe348cd90aef6161f8cdd0 SHA512 bf94938c2dcd6764d8f1fb83e41b24fb885ed3294477f345285560e70d5621d4099eb38f806239c3b58fff8e75f25b1b10c19adb5a10147cf7058b0108b4ac7b WHIRLPOOL 740acebb4d557aad4e67c91675309f81e739a3559bd7b47f44b794878aa3f5cb31ff97c983aa8f12b9f113a1258eec542bf444a80534fbd0599598ee52e25131
+EBUILD libp11-0.2.8-r1.ebuild 1162 SHA256 d9fb51e0c4429928225eb0478f8833e44ca8051072ea808fde23516055dfc803 SHA512 7fbb43ee8c65029a7d5937ba6739ba8517efb5128d59d43176ca3dc092cc1e859886f8d14a515929795effb2c8869559226007f9c5223dbc832db8659ab25223 WHIRLPOOL 0052cd51c4fa5f1dec847fac68dacaf0a3e9e5631619c5eeeb5aa243d2fe70f93c30cd9a7b0f35023be8f8f5e938abe6e210c584667e2dcb4395239ad74b3389
+EBUILD libp11-0.2.8.ebuild 1211 SHA256 b11f263ef6b4d6aa6f252eee0a4f52b8fe99707d072460c4c331a3de5226ac1c SHA512 01ccebce8a4b0447e55cbdc4d45ba71c25ac88f181ec315748dbf740688665370da3e786a389694b4b4b8a0cd8b5cd7a129199ac7ed6f22c94feaf44a97bd5e3 WHIRLPOOL e11e3224079d1f681d9b16d8228876d9c7621aeceff7c8caea9e9b26d19d8399fe29f45f5e31bfe73e795502b3d5cdbdc013ec9494e8ce4f99832d12081fd862
+MISC ChangeLog 7832 SHA256 fa1a651c553547df772da2069024d7915666ae76ccb8be06c4814a17fe910a17 SHA512 1c9408d2f0f0cb6b42e02d758ab77b90395d780faf3dc61be32b0080f619705328c75d2813892c587341385eabcbbe6da4c1077925aa6c16af162b8779e4a53d WHIRLPOOL ec608e0993c52658ea7baaec81b79692ce6aa20afb929fce236ec17e9ae0369b6536a62b71858670347ae56b0ede67245ef415f2c0feb3ae6e2475cfb57516d2
 MISC metadata.xml 427 SHA256 702a9485ff50ace3adf3a39c6862d82666d9d1b0aa98dc9b9cb33ca084637de7 SHA512 9a0876cc89a869609d72d8cea686ba52458eb93b11205851853c4327334a73a1065d2413b2f8f5de6f0af42149de3ed1629c8a7608f0a9b350b35f17fcd73a4c WHIRLPOOL 9cb636eb1780b7f206fc955f059ae4702ef32b12ad12010635e50a8682572c0fca6043f803bf7c3d94764e055092baf3536d650a7587d37d431be8a9a6d5b785
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlPkhUUACgkQXYk9GL8g3FHAXAD9ER8e7wGXP48Uov8dUzSg+wzf
+Q3V5IH0VljlymTeL3xoA/RsLq0p2/v7s962B73RBkzzCcCGBShMn9O4+9wAAObG2
+=Z0/w
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libp11/libp11-0.2.7.ebuild b/dev-libs/libp11/libp11-0.2.7.ebuild
deleted file mode 100644
index f71867f25ea0..000000000000
--- a/dev-libs/libp11/libp11-0.2.7.ebuild
+++ /dev/null
@@ -1,49 +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/libp11/libp11-0.2.7.ebuild,v 1.9 2012/05/04 18:35:48 jdhore Exp $
-
-EAPI="2"
-
-DESCRIPTION="A library implementing a layer on top of PKCS#11 API to make using PKCS#11 implementations easier."
-HOMEPAGE="http://www.opensc-project.org/libp11/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit autotools subversion
-	ESVN_REPO_URI="http://www.opensc-project.org/svn/${PN}/trunk"
-else
-	SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-# libtool is required at runtime as it uses libltdl.
-RDEPEND="dev-libs/openssl
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-if [[ "${PV}" = "9999" ]]; then
-	DEPEND="${DEPEND}
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt"
-
-	src_prepare() {
-		eautoreconf
-	}
-fi
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
-		$(use_enable doc) \
-		$(use_enable doc api-doc)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-}
diff --git a/dev-libs/libp11/libp11-0.2.8-r1.ebuild b/dev-libs/libp11/libp11-0.2.8-r1.ebuild
index 10e0f4cfd377..6f873a1cab16 100644
--- a/dev-libs/libp11/libp11-0.2.8-r1.ebuild
+++ b/dev-libs/libp11/libp11-0.2.8-r1.ebuild
@@ -1,19 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8-r1.ebuild,v 1.3 2012/05/04 18:35:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8-r1.ebuild,v 1.4 2014/08/08 08:07:29 alonbl Exp $
 
 EAPI="4"
 inherit eutils autotools
 
 DESCRIPTION="A library implementing a layer on top of PKCS#11 API to make using PKCS#11 implementations easier."
-HOMEPAGE="http://www.opensc-project.org/libp11/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit autotools subversion
-	ESVN_REPO_URI="http://www.opensc-project.org/svn/${PN}/trunk"
-else
-	SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-fi
+HOMEPAGE="https://github.com/opensc/libp11/wiki"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/libp11/libp11-0.2.8.ebuild b/dev-libs/libp11/libp11-0.2.8.ebuild
index 4110befb3228..df794462a32d 100644
--- a/dev-libs/libp11/libp11-0.2.8.ebuild
+++ b/dev-libs/libp11/libp11-0.2.8.ebuild
@@ -1,19 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8.ebuild,v 1.10 2012/05/04 18:35:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8.ebuild,v 1.11 2014/08/08 08:07:29 alonbl Exp $
 
 EAPI="4"
 inherit libtool
 
 DESCRIPTION="A library implementing a layer on top of PKCS#11 API to make using PKCS#11 implementations easier."
-HOMEPAGE="http://www.opensc-project.org/libp11/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit autotools subversion
-	ESVN_REPO_URI="http://www.opensc-project.org/svn/${PN}/trunk"
-else
-	SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-fi
+HOMEPAGE="https://github.com/opensc/libp11/wiki"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"