app-crypt/gnupg: Update autotools requirements
authorKristian Fiskerstrand <kf@sumptuouscapital.com>
Sat, 24 Jan 2015 16:39:08 +0000 (17:39 +0100)
committerKristian Fiskerstrand <kf@sumptuouscapital.com>
Sat, 24 Jan 2015 16:39:08 +0000 (17:39 +0100)
GnuPG 2.1 now require an updated autotools package

app-crypt/gnupg/Manifest
app-crypt/gnupg/gnupg-9999.ebuild

index 5ba7e5e..27b76a6 100644 (file)
@@ -1,3 +1,3 @@
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0
 AUX gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch 2143 SHA256 2413ac5c9607450c7792c52754d4500249ab5e07ded649c752f89f243cf43b4e SHA512 adf90513afd9b3c7384b53e3b5b95c305567b6707ed9a60d76e49b28744e358da4b4412b0df266e9a214e3c4fbcf9ebe8523584436143b7e57aca620a0db422e WHIRLPOOL f2d2f59656caf1abfaf0066383deb1d27aab43c2b25bd3a9fa27cf3c4a0357e875058ef138b7a5237526fece6c3910604deac5fec6af01ada97e88f7b44b54bf
-EBUILD gnupg-9999.ebuild 4890 SHA256 94a65f0e3fb8179e42b5b4cf89507e6b9663e031d2e5ebc3378d055bd5911ae3 SHA512 6f1474647d6e41b0212a7ed2f29976ebc80cd5553f96b1bda4c5da9d5e28fbe627c93dda3ee609cb27ed90ff82856d00d003cb2e5267bf6967ccbebb3cbe17c4 WHIRLPOOL e3f7fb59dcd002da3a078e6549567618652e053fa7bf5e29bb21827a0131a39ca28d7587fdb8c467d13659d73d4d365de2c4569c02d7a36e46a8af0f67f85e9f
+EBUILD gnupg-9999.ebuild 4811 SHA256 6faf1b6ec2ee7bf8864967d26cfefbf1d4529040e7e0a1311c14b8301d5e7f3e SHA512 9ee8193f3c53c3c5b35418401199cf71c7076994c618506677f275acf453f4778d8a8348c2cc8a0a7c879538544f8e8ed5f14fddef0611c325cbc27046a9f509 WHIRLPOOL f04d375fa6aa293bf650a183d6cc1a6d65e0213209e6fcd81669cab857549ca9b0e6cfa3642158766205e094f040cd33031fb0393e5f4b9743c2955ca2c102ca
index 547021e..58ff5f4 100644 (file)
@@ -4,11 +4,12 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs git-2
+inherit autotools eutils flag-o-matic toolchain-funcs git-2
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 
+WANT_AUTOMAKE=1.14
 EGIT_REPO_URI="git://git.gnupg.org/${PN}.git"
 
 LICENSE="GPL-3"
@@ -37,6 +38,7 @@ COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 # Existence of executables is checked during configuration.
 DEPEND="${COMMON_DEPEND_LIBS}
        ${COMMON_DEPEND_BINS}
+       sys-devel/automake:1.14
        static? (
                >=dev-libs/libassuan-2[static-libs]
                >=dev-libs/libgcrypt-1.4[static-libs]
@@ -61,9 +63,7 @@ REQUIRED_USE="smartcard? ( !static )"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-       epatch "${FILESDIR}/gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch"
        epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
-#      epatch "${FILESDIR}/${PN}-2.1-hkps-schema.patch"
        epatch_user
        autoreconf || die "Autoreconf fail"
        ./autogen.sh || die "Autgen script failed"