Fix dynamic running autotools, bug#533916

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

4 files changed, 30 insertions, 115 deletions

diff --git a/app-crypt/signing-party/ChangeLog b/app-crypt/signing-party/ChangeLog
index 4142651422a2..3538781ad751 100644
--- a/app-crypt/signing-party/ChangeLog
+++ b/app-crypt/signing-party/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/signing-party
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/ChangeLog,v 1.48 2014/12/21 16:32:02 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/ChangeLog,v 1.49 2014/12/29 16:00:36 alonbl Exp $
+
+*signing-party-1.1.11-r1 (29 Dec 2014)
+
+  29 Dec 2014; Alon Bar-Lev <alonbl@gentoo.org> +signing-party-1.1.11-r1.ebuild,
+  -signing-party-1.1.11.ebuild, -signing-party-1.1.9.ebuild:
+  Fix dynamic running autotools, bug#533916
 
 *signing-party-1.1.11 (21 Dec 2014)
 
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 0d742861685d..40bcf0b04c73 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -4,16 +4,14 @@ Hash: SHA256
 AUX signing-party-makefile.diff 469 SHA256 c9930db5439f522af8f492f1fd5eabfbcb490e9bb50ec36a07f908badc65db9a SHA512 b2acd11419bc4d14b4845d75edc10e85770afafb0cb86ca718db506d7537c7a873a5f661e37ca051a4903169acf9cf1699a0b6efc343618739e5b59ac782e6f8 WHIRLPOOL 984a5fe9d1c57933b7411676a1f4c3c86bf8db09800c52958e04cd41c0374e91e6521d08091df69ef37c70173ce619a63a4f315ad670a560d52a6c95ddb399c1
 DIST signing-party_1.1.11.orig.tar.gz 233965 SHA256 90073c2c05a36c0fdbf4ffc8b06269a3245121f0c408762ff03ffcb65a3e457a SHA512 788ee08e23b7ba45a5891638204452490be29ab9fd75e848ff3990bf1c1a052885eb41f0cca09bd299065c03d86ded07d7949e696587212b694c0ec2a2faf573 WHIRLPOOL 5af071c650c67febd6e1b7014694fcd4a2cd0408b614340da54ba575913bd96385385a6f57e609ccffd3e519f59b3eeb07a83b46fb039b938c5958d1eb35c88b
 DIST signing-party_1.1.4.orig.tar.gz 230259 SHA256 3d135437540ad1e5b3bb209ee90896a6b9153170eb0e4c93d018c1952fb80fa1 SHA512 935a192d8ce0057731b3422d217a90890dd97d9c84a3a46e3e4a2536f41e6752a44a86ba13db9b9a3e24a629dd6e78cb599a7999eeffea0a2b3b83b775dea36c WHIRLPOOL b5efdbd37d3277fd4fedc0938abcedada2c9a603bfdb1e93882e60abd698e4d4ef9535fde8d6c0c57818603e12507d911a150022fea5690b72eac66eecda803f
-DIST signing-party_1.1.9.orig.tar.gz 228269 SHA256 a479008de9cdd5c06dd352dc63b766716c31de0cafbd04504c861a270d771eb5 SHA512 1604847b3bcf4f4663145b16265731d6c2d3356e8f2a0b578e7b2d1541ae43590ff3282beedbb03cd4d7bbbdab1826c73f433d18a9ef871ef005bf67f6a3bac5 WHIRLPOOL b241c63769b84351afc773170e9e15e2c1c0080116c2149f3f670aa1703027c65ebe1c88cb9899f91d60f00f9762e2a039cc51e2067b1afac0f8fc2e733f603d
-EBUILD signing-party-1.1.11.ebuild 2776 SHA256 aa82251d97d53d70226d8f83fd61453bcec4bf165a5598da2788d34d9d46444c SHA512 390df99ba5f1e61a112d184311cdff6d2cb7003eb05a8dff5cb2ba1e199b94259dfcbf9de50ede014f7d94484ce8853763ba95153ee8fc619eaa737658094404 WHIRLPOOL 7ea64513777e4b0669c8a30b4aa2e05b41a6429e16c30bf5720ddaebd2fdcee16cf1a3309a6579ecb3d27453100622f09d2622790436545cf07cd8fd4e5e5916
+EBUILD signing-party-1.1.11-r1.ebuild 3184 SHA256 f3921e908e274d463a561182b5b020fbd12dd9a63bb7a29016371dccab3f5441 SHA512 4fef495a88d8877163a612fc9310bbd9e40bf31bea50e747d6f86863b473a5e4613ff586c912a56679d0c0d166fe057bb19676226c63a8ba3a2dd3a6380b5251 WHIRLPOOL 84080305687cce0b9115cbb9ba377879833873022e8c3545f665da6f61e28414be910f7d04c53fc8ade456bb636ca151d41e96f4f59452ba1a731201498e083c
 EBUILD signing-party-1.1.4.ebuild 2851 SHA256 98a2fabb85432867d970b87ceb9adb23a9088e5e8822e19e2be9d5c195988136 SHA512 47d2d9f697bec2e76133ea3ce798654d8140a9cc4568dfac3c4f148a07413884e8b240216c2c9e536883c4c62ba8086894e078dd66498c19a1100dace922023c WHIRLPOOL 24b00e7f5d3f025ce1457ecfbbbe44354f70b43ffa24ad7e428471c4ab4e8ad871dc07b76b23bb893186a976259d3062d5589bc4ab985fa76bb1775d325fb64b
-EBUILD signing-party-1.1.9.ebuild 2778 SHA256 c559844d82035e4a6b5308b11f7adcf7b7be63f78172fe8ba8ef03b5826b8b14 SHA512 cec54970d0551da773c0d0b3a8bd7cdd52d1f247006bb7fe54725d3626d0a852213c81f31f4486a43db7d18b26456e2ae1b03d430903c4a10c7ddfc0ac2a325c WHIRLPOOL 7180bacc2d4e3e35e71c7593e8feee132e03a1d2f3f4516c6660ae6e019efaea821c2d3f47eb402a41759ebb00c3c2ba97b020ae1216b30de1d09b93aa78d463
-MISC ChangeLog 6859 SHA256 40b3d7c4240687c09f4c1005b7fc9812451b9fac3f1cc6eed776409fdb608270 SHA512 012b3e60e14f69909d9520c9151f9ee4d37268d4ef7582b47a9bdec22d31b8a551dfff568b4af74a23afafcbce410fdd6c3b348b3cfdc2b09a02dc18b2340275 WHIRLPOOL deeaf9f8a733ffeafc87accc92cc9755ef887e19103c7a11b1d311a99049a56573faf05484abefeb90b27ce97f06ec94e6a42f69c1531c083c7dba38a0aec4be
+MISC ChangeLog 7086 SHA256 973ce9d382f20e23d9f0972175aa94045cc883bc30f0c855403b50bf12d9885e SHA512 31efa262588ca5351ac10a920aa0eab3ac1215c4cf79c7a252a2600645a189e966c6dd33af039d42c510f901f9640a66e734b318159bbc84b215597295eaee92 WHIRLPOOL 85e97bcd356c7430ee0bc4577e77d66ffc2b2e2b78dbd39eb6bc2ead6a01b0ccdca1a376a6c5800ea6a617b82ed8c667ce3924feddead2c8f7cca5f7283e6d00
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSW9ggACgkQXYk9GL8g3FG7KgD+KhVf7m6XZVecepfOEmWJP/s0
-RdDzA+JJsfJpjmmjUT8BAIp9NloXA+ubgmnwQD1tc1x25eMi7fb3dhfr7jVDGACB
-=l9+L
+iF4EAREIAAYFAlSheqcACgkQXYk9GL8g3FE8VgEAjw8azjV+BOyAnRPXYnm/1/42
+egMZJF2kCOCvQ+i9IpEA/i/kkNcJEmDVuu3u0plGR+A3qKKefAyftbD6jW/RZbyT
+=61Oq
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/signing-party/signing-party-1.1.11.ebuild b/app-crypt/signing-party/signing-party-1.1.11-r1.ebuild
index 32663e263b98..4c0b1cad26b3 100644
--- a/app-crypt/signing-party/signing-party-1.1.11.ebuild
+++ b/app-crypt/signing-party/signing-party-1.1.11-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/signing-party-1.1.11.ebuild,v 1.1 2014/12/21 16:32:02 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/signing-party-1.1.11-r1.ebuild,v 1.1 2014/12/29 16:00:36 alonbl Exp $
 
 EAPI="5"
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs autotools
 
 DESCRIPTION="A collection of several tools related to OpenPGP"
 HOMEPAGE="http://pgp-tools.alioth.debian.org/"
@@ -39,15 +39,29 @@ src_prepare() {
 	# media-gfx/springgraph
 	rm -r springgraph || die
 
+	cd keyanalyze/pgpring
+	mv configure.in configure.ac
+	sed -i 's/AM_C_PROTOTYPES//' configure.ac || die
+	eautoreconf
+	cd "${WORKDIR}"
+
+	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 "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile || die
+	sed -i -e 's/automake[^ ]*/true/g' -e 's/autoconf[^ ]*/true/g' keyanalyze/Makefile || die
+	sed -i 's/make /\$(MAKE) /' keyanalyze/Makefile || die
 	sed -i "s|:/usr/share/signing-party|:${EPREFIX}/usr/share/signing-party|" \
 		gpgsigs/gpgsigs || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" STRIP=true
+	emake \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP=true
 }
 
 src_install() {
diff --git a/app-crypt/signing-party/signing-party-1.1.9.ebuild b/app-crypt/signing-party/signing-party-1.1.9.ebuild
deleted file mode 100644
index 316922a2f12b..000000000000
--- a/app-crypt/signing-party/signing-party-1.1.9.ebuild
+++ /dev/null
@@ -1,103 +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/signing-party/signing-party-1.1.9.ebuild,v 1.2 2014/10/11 08:15:14 dilfridge Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-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 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-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
-	virtual/mailx
-	virtual/mta
-	|| (
-		dev-perl/libintl-perl
-		dev-perl/Text-Iconv
-		app-text/recode
-	)"
-S=$WORKDIR
-
-src_prepare() {
-	# app-crypt/keylookup
-	rm -r keylookup || die
-	# media-gfx/springgraph
-	rm -r springgraph || die
-
-	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 "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile || die
-	sed -i "s|:/usr/share/signing-party|:${EPREFIX}/usr/share/signing-party|" \
-		gpgsigs/gpgsigs || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" STRIP=true
-}
-
-src_install() {
-	# 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
-}