Add SLOT operators; drop old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

4 files changed, 20 insertions, 50 deletions

diff --git a/app-crypt/easy-rsa/ChangeLog b/app-crypt/easy-rsa/ChangeLog
index 64ab1c0cf9bd..107ae3bcd0ae 100644
--- a/app-crypt/easy-rsa/ChangeLog
+++ b/app-crypt/easy-rsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/easy-rsa
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/ChangeLog,v 1.19 2015/06/07 07:24:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/ChangeLog,v 1.20 2015/06/07 07:43:53 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> -easy-rsa-2.2.0.ebuild,
+  easy-rsa-2.2.0-r1.ebuild, easy-rsa-2.2.2.ebuild:
+  Add SLOT operators; drop old
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild
index 8b112a9731db..5396a82f2649 100644
--- a/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild,v 1.10 2014/10/04 14:11:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild,v 1.11 2015/06/07 07:43:53 jlec Exp $
 
 EAPI=4
 
@@ -8,22 +8,23 @@ inherit eutils
 
 DESCRIPTION="Small RSA key management package, based on OpenSSL"
 HOMEPAGE="http://openvpn.net/"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 SRC_URI="http://swupdate.openvpn.net/community/releases/${P}_master.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
-DEPEND=">=dev-libs/openssl-0.9.6"
+DEPEND=">=dev-libs/openssl-0.9.6:0"
 RDEPEND="${DEPEND}
-		!<net-misc/openvpn-2.3"
+	!<net-misc/openvpn-2.3"
 
 S="${WORKDIR}/${P}_master"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.0-pkcs11.patch"
-	epatch "${FILESDIR}/no-licenses.patch"
+	epatch \
+		"${FILESDIR}"/${PN}-2.0.0-pkcs11.patch \
+		"${FILESDIR}"/no-licenses.patch
 }
 
 src_configure() {
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.0.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.0.ebuild
deleted file mode 100644
index 05bc9aed7c0f..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-2.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.0.ebuild,v 1.10 2014/10/04 14:11:22 blueness Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="http://openvpn.net/"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}_master.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}
-		!<net-misc/openvpn-2.3"
-
-S="${WORKDIR}/${P}_master"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.0-pkcs11.patch"
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
index a3be6318ecd4..2ff3e79440f0 100644
--- a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild,v 1.1 2015/04/04 08:58:32 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild,v 1.2 2015/06/07 07:43:53 jlec Exp $
 
 EAPI=5
 
@@ -8,18 +8,18 @@ inherit eutils
 
 MY_P="EasyRSA-${PV}"
 
-DESCRIPTION="Small RSA key management package, based on OpenSSL."
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
 HOMEPAGE="http://openvpn.net/"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/openssl-0.9.6"
+DEPEND=">=dev-libs/openssl-0.9.6:0"
 RDEPEND="${DEPEND}
-		!<net-misc/openvpn-2.3"
+	!<net-misc/openvpn-2.3"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -28,9 +28,9 @@ src_prepare() {
 }
 
 src_install() {
-	exeinto "/usr/share/easy-rsa"
+	exeinto /usr/share/easy-rsa
 	doexe build-* clean-all inherit-inter list-crl pkitool revoke-full sign-req whichopensslcnf
-	insinto "/usr/share/easy-rsa"
+	insinto /usr/share/easy-rsa
 	doins vars openssl-*.cnf
 	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
 }