gentoo resync : 13.10.2017

3 files changed, 2 insertions, 125 deletions

diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index eb47c1e26405..623c8272aedc 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,7 +1,5 @@
-DIST signing-party_2.5.orig.tar.gz 198105 SHA256 62db91ccbde650ffbb332beab9cba0676b0d42fc46034fa3c28a471cc0ec4bf8 SHA512 a04875bfaef791a6505134dd2530148d5e6baaa8aa5610e75d42fbf59e884fafffb5de2486425bb53e6464ff3fd35b974684d8bc85291750e4a7bd8bb82b0da3 WHIRLPOOL 7c070f194a67de7fe4ac2f479c6e15a96bf3f182a9065f293b60f5fb979f035c160860ec25ffe0fcc64b30561af94db40b3d8cb113dc8e8cf17cfe2f9bec5248
 DIST signing-party_2.6.orig.tar.gz 201210 SHA256 d9458db6c5a01298838af99655c0edbebd0c955f50866c6e0f6f277a1dbbabd8 SHA512 094af9b354d958d382bf99a1f10a9f12585f85769686e3bc9b9b813016f68232775e4002c0a7accbc894c946f7532b32ee7f9b3e23d467b973041c092ba4efb9 WHIRLPOOL 4e8c873d0b7aa36442e82cfa204aa900bddd037b00d6bfdf12b18fe6a47acaff6c621956576d0371ed00b0b3985e0a40d6cc2e124f2649367d407ffe8433e0fe
-EBUILD signing-party-2.5.ebuild 2998 SHA256 4693cc57274b951e130c3c56a5cfeb7be8fa013d2ff41227d376977645a97aeb SHA512 12f7429286f57c949a404ac689d1c6374af4161fa5da9e220b53b84bc6d6fe9768e3089c7b0a1b07892cca85903649237854b8fd2f4314ddccf30c54213f0a10 WHIRLPOOL 171375aec57760c299c6fcaeb8be5f5e66e76d1a86d851ae8324ff5f71fdc47d72b4e3a9309f60d23b6a7fafa4e4b6ceec923322d94e57397292e64b9af46a57
-EBUILD signing-party-2.6.ebuild 3001 SHA256 56a5cabdc8b8df1e35b203875697886ac7abae1f4361804f0bd72075ff06b439 SHA512 9dcb583ca1af94ce4a22b23498db8525ac00d279a51af9912033c2afa3e882d230482529a74731b76d089f84dbd0a9d02e6375249c6f76d9a5164c29100014aa WHIRLPOOL 10e9e4204b2c3d115367faa9edc94dcac3f53b6da0f37893605b78df5947b9c44945dceeaf72886542e78e0c1c99db89560d681d7b7308f2ad6eae369579999f
+EBUILD signing-party-2.6.ebuild 2998 SHA256 4693cc57274b951e130c3c56a5cfeb7be8fa013d2ff41227d376977645a97aeb SHA512 12f7429286f57c949a404ac689d1c6374af4161fa5da9e220b53b84bc6d6fe9768e3089c7b0a1b07892cca85903649237854b8fd2f4314ddccf30c54213f0a10 WHIRLPOOL 171375aec57760c299c6fcaeb8be5f5e66e76d1a86d851ae8324ff5f71fdc47d72b4e3a9309f60d23b6a7fafa4e4b6ceec923322d94e57397292e64b9af46a57
 MISC ChangeLog 4150 SHA256 4cdc9c32e23e9eac4f4b1a24302731e20080df446ba31d4aa543200d1aff76ca SHA512 9f5217f623dbdf33c0dccabc4f3369418699ad8fdcd6be21f28944519035fcf91392d7c17e716249183a417ff379eefac80b2b8929cb76fc21b02ee02d862a45 WHIRLPOOL cb418cc3b5673f66bc678e97b00e3b4a7fc7195e4110d3d6be44763f7befcd7c9bae05e3b7b5cb5719d00566eaccb6cf85007af1f3c9c406fcad67be03de4b13
 MISC ChangeLog-2015 7223 SHA256 b16c9754f3004f13b2c22593ca483e969c57387faa2d104031d55336749cbfcc SHA512 894db23caf599c99be320c8485056aa6dc11f7830ce92e97d8b51bf5f9f122c042fa7227cedcc0bcbe8ff9806fc05099b1ff69a3351bbe588bb20b3557f6f9df WHIRLPOOL 58929b500277fb055701f900bdf07e3eb912f4d6663d9691faa4baf07d9c4e36705f0ced0be0ab7319c6869914eea90aed07b88c13098d44df37d8120a307e94
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
diff --git a/app-crypt/signing-party/signing-party-2.5.ebuild b/app-crypt/signing-party/signing-party-2.5.ebuild
deleted file mode 100644
index a279544c0304..000000000000
--- a/app-crypt/signing-party/signing-party-2.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="http://pgp-tools.alioth.debian.org/"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/perl
-	app-crypt/libmd
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.3.92
-	dev-perl/GnuPG-Interface
-	dev-perl/Text-Template
-	dev-perl/MIME-tools
-	net-mail/qprint
-	>=dev-perl/MailTools-1.62
-	dev-perl/Net-IDN-Encode
-	app-crypt/libmd
-	virtual/mailx
-	virtual/mta
-	|| (
-		dev-perl/libintl-perl
-		dev-perl/Text-Iconv
-		app-text/recode
-	)"
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# app-crypt/keylookup
-	rm -r keylookup || die
-	# media-gfx/springgraph
-	rm -r springgraph || die
-
-	cd keyanalyze/pgpring || die
-	sed -i 's/AM_C_PROTOTYPES//' configure.ac || die
-	eautoreconf
-	cd "${WORKDIR}" || die
-
-	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
-
-	sed -i "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
-		caff/caff || die
-	sed -i -e 's/automake[^ ]*/true/g' -e 's/autoconf[^ ]*/true/g' keyanalyze/Makefile || die
-	sed -i 's/make /\$(MAKE) /' keyanalyze/Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		STRIP=true
-}
-
-src_install() {
-	einstalldocs
-
-	# Check Makefile when a new tool is introduced to this package.
-	# caff
-	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
-	docinto caff
-	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
-	# gpgdir
-	dobin gpgdir/gpgdir
-	docinto gpgdir
-	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
-	# gpg-key2ps
-	dobin gpg-key2ps/gpg-key2ps
-	docinto gpg-key2ps
-	dodoc gpg-key2ps/README
-	# gpglist
-	dobin gpglist/gpglist
-	# gpg-mailkeys
-	dobin gpg-mailkeys/gpg-mailkeys
-	docinto gpg-mailkeys
-	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
-	# gpgparticipants
-	dobin gpgparticipants/gpgparticipants
-	# gpgwrap
-	dobin gpgwrap/bin/gpgwrap
-	docinto gpgwrap
-	dodoc gpgwrap/{LICENSE,NEWS,README}
-	doman gpgwrap/doc/gpgwrap.1
-	# gpgsigs
-	dobin gpgsigs/gpgsigs
-	insinto /usr/share/signing-party
-	# keyanalyze
-	# TODO: some of the scripts are intended for webpages, and not really
-	# packaging, so they are NOT installed yet.
-	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
-	dobin keyanalyze/{keyanalyze,process_keys}
-	docinto keyanalyze
-	dodoc keyanalyze/{README,Changelog}
-	# See app-crypt/keylookup instead
-	#dobin keylookup/keylookup
-	#docinto keylookup
-	#dodoc keylookup/NEWS
-	# sig2dot
-	dobin sig2dot/sig2dot
-	dodoc sig2dot/README.sig2dot
-	# See media-gfx/springgraph instead
-	#dobin springgraph/springgraph
-	#dodoc springgraph/README.springgraph
-	# all other manpages, and the root doc
-	doman */*.1
-	dodoc README
-}
diff --git a/app-crypt/signing-party/signing-party-2.6.ebuild b/app-crypt/signing-party/signing-party-2.6.ebuild
index 675acb0adac9..a279544c0304 100644
--- a/app-crypt/signing-party/signing-party-2.6.ebuild
+++ b/app-crypt/signing-party/signing-party-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="