Add SLOT operators; drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 37 insertions, 68 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/Manifest b/app-crypt/easy-rsa/Manifest
index 0e7e33a66668..a20c92dc317e 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -7,27 +7,26 @@ AUX easy-rsa-2.0.0-pkcs11.patch 1184 SHA256 100d545927d2bc4395f96777f1e5f0e577bb
 AUX no-licenses.patch 287 SHA256 8da35dac58322549c63ff491bb787e5f44f661fdb8c57b08ecfe0ba0ea70ab78 SHA512 1b1a40b9f1164b2524bf317da2147e92cc7eb97ae33fc27f94cd0b851db958f2f0c3c5d2b56e62b08d7895c23461ac1848e0f623473eb33e6c18a1f2603aefb8 WHIRLPOOL fef2d68d6fcfb40e66cf1da0ced7ea0cd16f782bbbaf45599c9295a8bed18bb642efad82a341c899201f51fa017aae9045cd6cf2b05326cc1de9a1e5575cc968
 DIST EasyRSA-2.2.2.tgz 10492 SHA256 68da869085dde7c6a964e9c6104b86e4af91c4c592f8ec2a2f6cfc9d20808991 SHA512 b09bd1a71c1bfeb3c2ff63f10b7781badf6d2b4888d97d917565436435b85fb90eebf7727db293bdc44039f23c7f3c3c4e762a22bf7d6e9ed7642a2f07e1ffe4 WHIRLPOOL 27b7d761a317d8787526dbdc1878e62326e6ca13730ddf9b50fe918f010c23d1535dfa4f6bfb76bf26bd005942105a0e862359579faf7b6fe803ad7ca53d627e
 DIST easy-rsa-2.2.0_master.tar.gz 80460 SHA256 d23ddc3a764b40d03ada76f387c92ae4dcf4f5266da54c2bae130325b05eebe2 SHA512 81b5d6e805c5d9fcadf6425dbc311b6a151d857cb837ce9b419b653ee546e5742d13864d25e9ab8caffee95e5116d1611323288e80c65c3c88730533919e2fb4 WHIRLPOOL ff65ca8e3b47123aa3765937d508682afe51c9831e8dbc3e57cb5000088cc69ad5e086618e647e90677481c2d5e7d34733fd7ba50a067810e1a42c876d348823
-EBUILD easy-rsa-2.2.0-r1.ebuild 928 SHA256 552be58c66bfdb34d990e347f1534623e340ad7edc804b88a5d38497f362b45c SHA512 cabfe6f80f72a3200caf95de157909f88d22088e87c34967154fbd829d1eab27d64d96933b43b6a88b9bf8c523d6c7ecd417e729fbbff45a8afa729444b37c1d WHIRLPOOL 3902a71a99cd882eca37e5961ee6f182b919d85fbfbe3459f2157ee1c41a561b27c9227874e8ea75446e81ad869ad557ded580aac19e50ce983bb73662f643ea
-EBUILD easy-rsa-2.2.0.ebuild 883 SHA256 3a3a8975a5a3886ad66253334a76963bdb1c170c408a8622d8896214981f53b4 SHA512 bb7b3b47101bf8264c3692b0e61fbbc62da21fedc8f0c4d6ea1bb7600de7868c4967a0ff6ed0382853cfa5367cf48199ae2ab0262ca0e25e11169dbb78f10a30 WHIRLPOOL cab2cc8746cdf11464253ec9f09d730aa147d6dcbb2881e46cf99e5b5978c572689b1e24b42bd728ed99add7ef6387a6d551bcd48884ceaf78cc56f56bbf24e9
-EBUILD easy-rsa-2.2.2.ebuild 984 SHA256 4b42549ba2941bf30bdc740307aa24b99336581902276c9259ff76b97d5afd58 SHA512 3cc1df9482a7d00339648027f77ddfcd286f0ef4f9f416dbd4a86b939453ee47e23596cec410d6277a6c8a3c1f3b5b1525f5c9447d2618c6fd5c1f7ac86a2ba1 WHIRLPOOL 671b1ae63a40b74399feaf460ee39f5b13561821325b0f006197019752d0cf1a4e6a79e049e8d5784ca9a1cc31ba5b4b31300e332878f7a47a1e70c265fa5c2a
-MISC ChangeLog 2609 SHA256 37bb4fe7e5643497b8eaf24d59db0417f1fa28c036ba5e8fb02202c624fea6ca SHA512 dfd583fa73f1022797ff7f679403482ae0691502be64c28463dedd8b325c40bf77408d9fc5c5328be9f98c47da53b3d815e5e47bf9a8175536dd7bae67c7030c WHIRLPOOL b34fac252f9f82ad7e64f457c14ee3dc4391a9be4d4c23760190e34c0d535122d4a371125c5eb2e2e067219e8c549403c6331b6435b71a90d54d48643e3e2dba
+EBUILD easy-rsa-2.2.0-r1.ebuild 925 SHA256 065e3d265c90dc116d531a69ae5c1b345510975f50c020512d4161f239965203 SHA512 30a04c592d38e09e9c4797d54e2a41629d7ba2ca33a75a94358f5565fb7e044d6b6487f3b69e5ca1611e78bb581f4ae4335ffd6e3d64efda31d6514ca91768f9 WHIRLPOOL 672a94866ee6af674e0944b5417b45a73a81e33da0cda00a2196c51facb43ae91d1b50e087642c367fd83e9ee334d6deb76b939fdf308c0cb32c771fe5a254a5
+EBUILD easy-rsa-2.2.2.ebuild 981 SHA256 d7670a9902a9fd4749a97e4d10432bec9047e2275a6b446b141eef611254a0d8 SHA512 af1b0ab37cf4550097d7e13ffc7c8ee63f5e5d2073fc6dfff9a74789b7b3dddf51e9693ff751a95126e00af67b747f665d16b04b9a58ef6591d65ecc20ce47f6 WHIRLPOOL 866acab7b4e0aa00f54591d0eb3e6b8dde345c604735bddbe29144c7c410337d0b303fe6d981361550091a251f6dd949319f17a78cacf8c99f2a052e45ce42c9
+MISC ChangeLog 2763 SHA256 0982e7af8f2beca275c435b43460020fe07b55e25446b6fc68dcb99606a7fbfc SHA512 56ce84f4b07ad2593b3be73bff7b0a6390dc27930089cb8549864eb3d8584515003ca696985c4b610860221b300ff5cce701abd39e3bebacb4ba1a00a5e0ed96 WHIRLPOOL 4943fa54aa65e9ee151454dd2ea702776deb3b8ed68ff78105311479494c92052e676f620e66a4ce1c74d728c061db11bfa864eefd980d284fade88b0e5bcf8b
 MISC metadata.xml 322 SHA256 fbde5678eb6fb5fc9d1343708499286cc00b8377067679ae4362f40331272917 SHA512 21fb458f02073453ff27f252fafb26e8ea85a91cd5981950c9390455856d5ea1c46546b8d98042a02e6f06eb058c64d6f4f3e47cf4dddbb6e37f2aae8b2ddc89 WHIRLPOOL 56f6d8f3d07f072bd85c0a91bd46316743c0cefa43c478f5e7fe8c1387989c1dec8fbd84af9394a36519dad36df1944dd2812b9e018f393688b744acdd576e6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVc/GbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVc/Y+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHPEP/1uwgfKOcMoWWmZGZmx3P/yr
-C/49915YVmbWLIWsDhsKhsOlCVBaiMSPrOvhercGfGMEjvPdhQa67/OPyrcM0NHX
-hqIjFwT8Qs1co2TK6IDsaKQpLWmap6SCtLuTGvcX0wAWxitftd4cs90aW56HPnLF
-maOaDRIb8b9OD27PO71CUsfWildnCSfskVmKXyMpU3y3mPZNmb8QxU1U4L5g8/r8
-Vr9ieCt2ZF6Q52EJrYYUv5Mk2YsDmsGGJOrFoiJYag6nfFJudFZrmIheGR1eseuh
-YKszEC7bHa4IlX9vrYP1mc2kJkvZxbrYPMKuND4d1tdspR7uGrDpgQfkhw5++uXp
-4KByqsi20c5cYlZd4NV7S8+84u1R5s8GrIBDOzuLrnxf26ABEy2rMV3K6GkS5rVa
-D0lzd6ayuXGV1qmnvFnmk8v4lL39VuyR/BhPtx4E/2X6IXjVyoEJ8spRTCN7knYz
-5mMOFfczkECqa8UC4D7tJbeU8+05Dnck3MOu737ekf888F3HDP57eUkG5ziPnX+a
-ate8V8n2ug5uRecPJ05+D3mYdIMbkSdZmcXE764aGcTBzvHBBtoiD+JZ/7b5rKwt
-ZVO8ZzmnYiLntOf7CC3bLsojW7s2B0UkSfC3F4MQL49XllJXTfSZYLjQlK8ZVhap
-mGHdAfWUi8wYBA5k0zIW
-=3fbN
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixwEP/3wDHi5gV3HqHvtH8E4EvUlb
+Lg0C51iI5hmus3E1gFjV+5EPI8ouzWBKMU7KuIir7gOTL7Ic3YcDoqOeQdJAKjfF
+xXw8PfqIIV9SMSufyl2OC6nZl2JHGdiL5xDt/wuictcNRdOduvFLrFb5bWlC2lzH
+Ff1JqordUkVT34dQBG49gokozdNoThQcjgdX99Uq0AKxy3ZMDI/KIaIncuaASg1h
+PX/H8XiXIerZoDX6UbjRONeU8zbChUZud8O/j9JzjvdPhLlGPMcIBF+adniHGu/V
+OwQACmlc2KU2021sHMpqJAsov4nZN3EPvN/nu+/mbFIgQQif1uzVG/eVpP6im1DN
+wBkZ8+/FDkpaBmIQrPA63SknfZBZbdFGfgpsgOEotKx5R66xKx70aZlIyweajjwk
+zR54656dngcUIfdOQpYLXgW5FLQiJKz4XkejURWFwu1YTcpKTqwRQ3hA8QJUROpr
+Y4dbjgGI7q3A/uNGyJi8uVRt3OPtjk9Babz2fd5vv8YLlVtF/rDGVEMNzLsj5oGz
+T1hGgBZTGdXUATSFipXT2c8zXhqzyobTkxQePyGHNv48gtGLsBsuefBv8RbEVbax
+4+EAP7A/JYyg5MW50dMgSlwFM+/7Ko2KOMiy+ojw0F/7xxIeeZZNYfgs2nD0fAWW
+ljiJBKnKntDMrJaifPV1
+=qR1e
 -----END PGP SIGNATURE-----
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
 }