minor tweaks, remove 0.1 ebuild

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x65E309F2189DB0B8

5 files changed, 29 insertions, 63 deletions

diff --git a/app-crypt/gkeys-gen/ChangeLog b/app-crypt/gkeys-gen/ChangeLog
index 28c8b3193682..eb10459717ef 100644
--- a/app-crypt/gkeys-gen/ChangeLog
+++ b/app-crypt/gkeys-gen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gkeys-gen
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/ChangeLog,v 1.4 2015/01/08 20:58:13 dastergon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/ChangeLog,v 1.5 2015/01/09 21:44:07 dolsen Exp $
+
+  09 Jan 2015; Brian Dolbec <dolsen@gentoo.org> -gkeys-gen-0.1.ebuild,
+  gkeys-gen-0.1-r1.ebuild, gkeys-gen-9999.ebuild:
+  Adjust the gkeys dep slightly in 0.1-r1. Update the description in 9999.
+  Remove -0.1 ebuild.
 
 *gkeys-gen-0.1-r1 (08 Jan 2015)
 
diff --git a/app-crypt/gkeys-gen/Manifest b/app-crypt/gkeys-gen/Manifest
index 25295c97b33a..21a110a50010 100644
--- a/app-crypt/gkeys-gen/Manifest
+++ b/app-crypt/gkeys-gen/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA256
 
 DIST gkeys-gen-0.1.tar.bz2 18480 SHA256 c6ef23e3b1cc9f62cb094ee94067e7d01d43099c4d9941efc9ce3017698430a6 SHA512 3f9c7ba977912ce23f12a1a08421c4fd0d461444b17fa5d2d6e6980c550f19064c489921bac108fa6fe5af4064e1dd21e88426251008c5c019ee2a117dc4725a WHIRLPOOL 586e31d071ac5ba9edf159d472657eebe82f442fefa35ed5af08cfcfa477818b06f80cfbb67be9c472841ee97293bbff6bfff8ec6c30e6385e1db02391bc7f6d
-EBUILD gkeys-gen-0.1-r1.ebuild 1187 SHA256 b4b9d8cfe5cbb974f149084f54a11a84a910091cfeb6f63c54bed58657728d83 SHA512 7a5a4260780ab50fbe3fcbcd279c7f58dedb6dbf6e74e5d86b60e183793147c404eba52b6e76257ce024e4327e28ca55fa572f69fa4a78713b80423af0749848 WHIRLPOOL 07962987f4c988cbdcbbffd5cdd18f0a88671b1358fd250c619171be4dc66bd5615fd9f4e3074d7a6e12d6d975ed0a8ba14f4b0b3368dda3ce7d5d03367f08eb
-EBUILD gkeys-gen-0.1.ebuild 1184 SHA256 c626efc435b2efda3dc5c57351eace39a5bd65c38c1f8e21af11315806821ae8 SHA512 7225b3a578d99ef302a81c8a3496bd3a744f140a67d7bac270728775cfd3645d3d23f45d95111a33f9c3eae13ac81a25c90a4254552ee6693451064ab244f1b3 WHIRLPOOL b012515718390710addf25ea091c6f7580f1d78e77600adcd11495ea140ad21505b35fa83bdf587adbc49e0b9da26858709dc0fe09ddb9319dcd726366d5f6fe
-EBUILD gkeys-gen-9999.ebuild 1533 SHA256 d2397103ac98968d91587d8767d6524c1084bf9cf20f767f18ff934bcb1f8dde SHA512 6844b14d53de2aa7dc97520a6dd71ddb04f06c79ef61c89cfc9c0a708cf4a70e7eda22117cd6e38726c20a11049206d4f973a36249ce941aa988eae8b6a762df WHIRLPOOL 9b515b4e3caee73ac5470d3c47d415211e89e69524d08e2800f6fa06df140d8129045b5a3d8ed0b9bc9fca70c51e479133fb433487e11a24020d2a2afb7cfd87
-MISC ChangeLog 739 SHA256 ce502f10857729de684789049feffeeca25707f22e5116aaf6437942e0d9f9a7 SHA512 fbdfdddebf2c2eab274da121e841e8a73092dcbd3cd6b9ba93ab44b9f7e27d110effdef45be5ae4f4ebe05cf4b4df29cfa91fb5ee09b3912bf0f1a392fed811c WHIRLPOOL 74318b8027d212d2aa6cf771680db3eff3689dc1eea726558445313d8c1b24f30a8822befbf5f5a6288683cb21ce1c8c192de71e6aa663b46bb1acbcff3c77b1
+EBUILD gkeys-gen-0.1-r1.ebuild 1185 SHA256 e515cef2909a99cec8a5e41fbc94f32f898fc03ff743150bccc627f5db5a4d0b SHA512 ad348d0622b656ee40c0e0b749d5e88a17da1345f108feca6ba972bde434858dcdf91d5800bd9155f2e0c05b6614c679a64b63bf2e51cb34562032382f179350 WHIRLPOOL a2ccdb571b2807b36de734edad36eb3ee7546ab29eb0443e0ccf1fa38907d9f38780ca93416e1fb9ab8fe5374490e8ee938f8bb0443ef1608de815b9e5d5472b
+EBUILD gkeys-gen-9999.ebuild 1550 SHA256 0f6b9d2c23caf21181e58d61839a6669dc62c8785009f238113b7290b94d8f87 SHA512 1c1d5d4e559ce4adb6ff326f0d2b99aeb67344e87d8812fd2e9febee74fd6181e478b5f62882044cba3dbbf11372a1c85cf5e56062c3822583045b6d3e6da5b2 WHIRLPOOL 4eb2ce614156380b6cb4926e43ef984e51c26e9cc8c87b258d18cd1691dbc8be198a3261bf4a763cda8d99fa31c37b705ea089bba7306adf0d53c29b4da547d0
+MISC ChangeLog 955 SHA256 44ea1b307bf857da215c76e463e741b06c5489dab6997b92074b24f44c546399 SHA512 f262f94b15e482044fa1dc88caa78d5856d565d8743599fec3988f56faf419683f2ca31c48151be69714ebd6a37530e90d2557c66e6d16d19e017918de67acf5 WHIRLPOOL 01fc03041818721f046bf8208160ee97b511b60fcc2fc7fbf715e471bc42885c4e2ddf445ce9ed820cb371da8eb44a4f5f8d44701c2059f73bdedc3a1aa17f91
 MISC metadata.xml 262 SHA256 e8fd79799254078cadd057ca73b1c00f98289d7e4f97b7565ae9372502ecfbb7 SHA512 3ab630ac11ee2b3c1a3465e213597cfea943dc8f1c24dfe807db7ad636e9ca3e576775af991eacd10c4a97aa86fec85331a18371dbd7a0543793e2a876dad9eb WHIRLPOOL aa5faebaf940f08222780c5321bc939ecaa9f96a50b54008d582229f28c04713028889e9b47d1449f5523134e7f84c8005fb3c1c1b5c28a6b26af011171d90f1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUru8GAAoJEKMbvrI6BRdG0G8P/iDG13tyhe6EHord2fZrEUYn
-pZ9rKg9FJ1C5MEywDzw3aQEZL/3aYRjD3fDTgsLFcmizTd9Fqh+ya9FIgd6WwwAu
-M6t1rUHTZR5iFhRSvry3PhiiuFqfh1s39Z3wRl3LBZnKVmmK1z4S24yDFeiMEUT1
-EKZYI1pzROXGkr9gAKp9V1Hnh68T0exG4rSQvo7Vfs8TQtRHJfEFH1j5QIoDA79p
-8tGvYGecwOJE3Ns+MGZFeIId/ejHcChO+5ZVbeIiV+iykv+GpmmGtY0+8iHao/Qw
-WKgR6e74PuIYbN5Fud0QeSFQ/lbEYPjYwRZCHnP7vyCNFBEggqCE5lr1ExGrOhR0
-ajU0tPGZ/It8nt2A7DtYWc1LP2kywtIUIg8GguEcG1objsmdptileaaIlQmD0Y8o
-I98IDe872RCPCnOtMT0L19okdVvHikIOyW8jAXQ+Qbm23mHE20S31KEARdoXpLJt
-mPLhw8p3ROqDgkVXmkMNryJUd7TpGootIs3IJlhEnhy7a3urtMKNAeW4TjKQUJvk
-/74my74P+5ZeNEaZ5jKFhIgmjDYmELKjPOOIBLtb3JsN6dCnZUs5QVq6U0nRY52X
-hYvMRGIlYeFmSl7AMuHU5vKStk1yluJg7NzxpR5TsuMpfqdRaPOwGWd2s8kP21CY
-FYXeCvMjy+GzlOGmNC9K
-=2E0a
+iQJ8BAEBCABmBQJUsEutXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2OUZEQTI0MjY5QzhCNUE3RTlFMjMxRTkw
+MTg2ODIyMzFCOTI2RTRGAAoJEAGGgiMbkm5Ph0UQAKsGcwLFIIqqc1iwe5tGW/TV
+bykas3KuoZ9Tow73A30HClW0VKPLF8alFSHggE73pfGtaEt1jHXVCa4PCNdGzoHS
+1YO8CMYW1tX5z+D2m36r4k7NHgrm4mhZER9bcPCCVIFXgocLn8kQYvHkHhUeuaUh
+Sa7mgF0/S80Us3efpA4ex4a/Y01HWabBr/S42q5bZBAp0bHXoC22+Kh2t9dikNc5
+iATjCnIOlhv2ytrNe1NPnETFvqOTJcy4C+nSN2g0yy7OH6bRHJzUce5N/mI1BuKW
+aBuwSF5o4AvRE9an91/VJDMvWvqnjXcOZ/DibX4WLs+0SSVbR+/CC+FWoGP1qC4q
+Q9wG1/rO2LjHJW55GQ0OF6yWvMZkUWCkq+bJcs24VYDoANg3Y+wgifoUcp14MIrv
+rUl1nWDyvsb2RKS4ZcnFohWJfcGETlM15UKj64D4Fy2Gbv7AnNuYicqmOIys1a4P
+aKIV1rBrw06EpR5RhmyxTXXILI+ZtLGJA94xmr/o0geoan+XiCEsIEuayRbg8l/L
+tL+a2qioYYwyY3XUYe6bgpW4bZOtVCfsGDhdPpL0c0OaiGWPCXgciSVgCQMTIaMW
+jByotNk62qP+J84vZYxvtSprDn6n2XBi2Q386nanW9kM/QMfT5BmFUacvSDvAQjS
+EdMg1KPmK2Kzv98iZqud
+=wg3H
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild b/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild
index 50073b2ad064..37aefad8b145 100644
--- a/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild
+++ b/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.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/gkeys-gen/gkeys-gen-0.1-r1.ebuild,v 1.1 2015/01/08 20:58:13 dastergon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild,v 1.2 2015/01/09 21:44:07 dolsen Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	app-crypt/gnupg
 	dev-python/snakeoil[${PYTHON_USEDEP}]
 	dev-python/pygpgme[${PYTHON_USEDEP}]
-	=app-crypt/gkeys-0.1[${PYTHON_USEDEP}]
+	=app-crypt/gkeys-0.1*[${PYTHON_USEDEP}]
 	"
 
 pkg_postinst() {
diff --git a/app-crypt/gkeys-gen/gkeys-gen-0.1.ebuild b/app-crypt/gkeys-gen/gkeys-gen-0.1.ebuild
deleted file mode 100644
index 2ffed915e62e..000000000000
--- a/app-crypt/gkeys-gen/gkeys-gen-0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/gkeys-gen-0.1.ebuild,v 1.1 2015/01/08 20:24:31 dastergon Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-
-inherit distutils-r1
-
-DESCRIPTION="Tool for generating OpenPGP/GPG keys using a specifications file"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
-SRC_URI="http://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	dev-python/snakeoil[${PYTHON_USEDEP}]
-	dev-python/pygpgme[${PYTHON_USEDEP}]
-	=app-crypt/gkeys-0.1[${PYTHON_USEDEP}]
-	"
-
-pkg_postinst() {
-	einfo "This is experimental software."
-	einfo "The API's it installs should be considered unstable"
-	einfo "and are subject to change."
-	einfo
-	einfo "Please file any enhancement requests, or bugs"
-	einfo "at https://bugs.gentoo.org"
-	einfo "We are also on IRC @ #gentoo-keys of the Freenode network"
-	einfo
-	ewarn "There may be some Python 3 compatibility issues still."
-	ewarn "Please help us debug, fix and report them in Bugzilla."
-}
diff --git a/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild
index e2c1e15c934e..07fccf496eb0 100644
--- a/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild
+++ b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2014-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild,v 1.2 2015/01/01 20:28:44 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild,v 1.3 2015/01/09 21:44:07 dolsen Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ inherit distutils-r1 git-r3
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/gentoo-keys.git"
 #EGIT_REPO_URI="https://github.com/gentoo/gentoo-keys.git"
 
-DESCRIPTION="An OpenPGP/GPG tool for generating keys to spec"
+DESCRIPTION="Tool for generating OpenPGP/GPG keys using a specifications file"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
 SRC_URI=""