Fix configFix configure for automake-1.13 wrt bug #467542 by axs

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

5 files changed, 42 insertions, 25 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index 6e7dea0580fd..a714bdc9a967 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.48 2013/04/25 19:40:49 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.49 2013/05/01 12:51:17 nimiux Exp $
+
+  01 May 2013; Chema Alonso <nimiux@gentoo.org> tripwire-2.4.2.2.ebuild,
+  tripwire-2.4.2.2-r1.ebuild, +files/tripwire-2.4.2.2-fix-configure.patch:
+  Fix configure for automake-1.13 wrt bug #467542 by axs
 
   25 Apr 2013; Chema Alonso <nimiux@gentoo.org> -tripwire-2.4.2.ebuild,
   -tripwire-2.4.2-r1.ebuild, -files/tripwire-2.4.2-version.patch:
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 9ca9eeb0e2e3..8c6175c06ff9 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX tripwire-2.4.2.2-buildnum.patch 230 SHA256 820535353f2b0b4003929b7db4478412a4552fb69d11c46260d6d373faa98d53 SHA512 2b88c9366d2e922f8c18d128d92c2c8cdab2f8b5871d1666e27afabd0c5fc58bc218d662d9c71b64f93ce3ef238eee0a3ffb7b9bba227f2914ba72e680dbb360 WHIRLPOOL a8c7a65771840975c1bdcbe5355ef1c0200850ce6cf5189d02f2bcf2500c3ba08b5283bf17766a878f972b2d0047a0d82b3a3fca2ae386eb1c4ea57bbfca39ff
+AUX tripwire-2.4.2.2-fix-configure.patch 400 SHA256 424f2806f1dcdfdae945248127b9d699d59aed73c232a21abcde797e26337121 SHA512 d4e4964e6d61efe7181a71eef3447d1ce50cec9377c11bde52ce9a2926624e9a82821fc9426c9dbf5e6ccafb402b9494ec99a7172f75cfdf374a277b46f4a79b WHIRLPOOL 0eb027efa7029ba8dfd23afab852ee871411ad5a370e6257c2e2fbaa4192e21fff6691431e9f04d9560ccf9f8f00ed456bc74acbe017ed5244dfdbebf5de706a
 AUX tripwire-2.4.2.2-gcc-4.7.patch 790 SHA256 4d86f4db8361bec19cffef6986af68f61c4062e273ebd13f0f082bd513a2cacc SHA512 e05bbe96371e1c21a14ec72c6d2ced7a9f39da43cf8ac59c8ee6a8da58b86727d42e0311a8a924c39816cfdb8334f405543c77b423e7be47488e6a47a75c2ceb WHIRLPOOL 704099d31c20254da591dcca93591ddc262b6185a21c4945af6853cd510fb630c053379b123a713d6c550ab284f551c58553e1b1b846d34a5cde83c03dad8379
 AUX tripwire.cron 315 SHA256 be7a322661616b558124d7c1124f742a20d9c83119648a1e1f83156015f634d0 SHA512 a4c0046135681d4cbb899d7bc40b7747d1e903f64d6c683aa6d7205a49deacdd5ee2da572ef4d99269dbf8a60a64be2d0b8ecd7385305ac9bc4d89bdae9c7977 WHIRLPOOL 3212d1d6240ef99f1b6046804979035ea5659d9329bb2c89e3a705c06658d7b3e67e4b517aa918d39fb2e9ae1c3e8b14087e01f772de125d24b4f5b973658aec
 AUX tripwire.txt 8401 SHA256 6fdb25e5f862eb1d68d3d30fda73613f57ad572a97e2914b3054c3422f9c263f SHA512 2b905a9bb446fa41bfd41ce240e4f956f42f408b8247ad7c7d62f9f7a4e407e77e6fb467432930f7c227f9b8e1d560ffb1902385946206e341f9e39fd62d6c5b WHIRLPOOL 026092664fe6ce0f1edcba4263f55926f483d5f028c5c1dc8bb28a927de0aff1f2ef54c8bb0f793ab1aa418a09e7c638df05f80f3e42ee5ab7ae0481eb333d3e
@@ -9,18 +10,18 @@ AUX twcfg.txt 604 SHA256 31d7d51cf90ee95627e27732524a3ba2b90f074ceda23d0035c52d2
 AUX twinstall.sh 10100 SHA256 edc9c96dee54c1564de52ca5e755bfdac42a35d5b821a97d4342d6121ffe433d SHA512 6cc728e87f45cec8459f948d9ac00a7c8b8520d8c4b77b3c65fce20818899c663763f8eb13da66bef56f047d58334a2c44ba8abb528ca8dbddf768dfc101725d WHIRLPOOL 9435b7eb226c14423387cd1e4b1f426f68a77fe5323046e7e8db86b47ad902a6192cf794e7b5c7a19bb8e81b38050546c30bcde54008afbfe44b5365c82cebc1
 DIST tripwire-2.4.2.2-src.tar.bz2 716616 SHA256 e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad SHA512 be39757aac7b74d4deac6c5048d0964d839a32f8f2a0d1878c4246888c4d59e35a503413595178c7af3a0da80725d0b36c21026dc734e1f760c9affda017bbbb WHIRLPOOL beb99e1ae055947a4b94a45f51492bcc453def5a41188f853ff3285a85ef8e2921274b86b095b77dbcdc8f549358f6216996a75ba391247e17bf7a29c78849c5
 DIST twpol.txt.gz 7586 SHA256 22a815584d8586dc5fd737749ca53435088d5867355bb6b73ec152b2ef53b5fe SHA512 70fd91a5b32d0a8f8272a0462e6e2af9090f8917de2f2c4357cc71e175d49bba5a64e40ab94ba12986ddeec6132f7cb3a034fb665fa43b8377b548ba877e478e WHIRLPOOL de7ad93c1927c2cd4d7be35668bdfcce6055e8cfadf1e76425b8e62b7847c6c139aaff54b0c5b874d506cb0ef3a8c5e125adf7391bcc6b0aebd84ea9c93713ab
-EBUILD tripwire-2.4.2.2-r1.ebuild 2360 SHA256 0d24e6b3a8c73da84793549c01d01c6d4d18a13a0a756939dfeedee86fcbb564 SHA512 63a428159cf011c0242c549cff8f128261181ceef92c9c363ec5ff00a24ed7c3181de761fef60a6cb896b21e469dd583f2c52289979699236829c2094438a3ae WHIRLPOOL 96e3e1dabecb8e71268305157ecf6fa955f9806a3c26e359fc97e0c202d383714a7687a4cc723ef8c7c6300b6d3dd980748a3e6882ce99ffcb39c45d553a3571
-EBUILD tripwire-2.4.2.2.ebuild 2312 SHA256 417837902efc74ca7b354c071a4c5325fdb1da422482a99e9c5f30a2435899f3 SHA512 4b0f099eb9961c5da0ffd514984a8a80d43e4690295a6a40603da23e68aee70bbdcdc1cd9662e50e532912c94b7cf1ad26cecffc7a2d6adfff6ba1ec4756b013 WHIRLPOOL 47f538384d2fc2719099850c2d3be156870eb2856cc18888d8f18a6bd511f9afa4b1f94c7678f79406de661c9fda0c41c39ec19f49676cb7b538d54645dac324
-MISC ChangeLog 8199 SHA256 7967df4f31c1b87e6249928799db97b13e48586cb88ebefc61fc9aa44b1f55a7 SHA512 3e21ab8a73cb338d7ccaee86196a9d3b053f98a75be2e0e1648f4df6c60498cd5b69b2390946c2e8c56cf009f0c51b6b235587afcf673b25dfc0b08d09ddfd04 WHIRLPOOL df614f28d07a4d6c576a8e4ee7a1e2a3ae2c50d304c32faabd85343037b894d24dfa641a65da945415f5b54c687d368e253b10144a8b526d533ad6a2d7400119
+EBUILD tripwire-2.4.2.2-r1.ebuild 2402 SHA256 81035913708192c02fca7037ee97292cf110d6249e79beb15dc691296bb7b97f SHA512 4009e757f59cf424d51c05634dfe84f745e36268c63a43c65930f794bc4e8210230da6845f8380b2ac0c1b7b601d604462a956f3d499f6c33f269505bb90ce81 WHIRLPOOL 927b0f13b0586694dca4c9344223bccfa931c5ae1d11de06a634e237e9c3bc848d3c943022b78727f9d9be180215f0adc8d95e8c1c2185d99aa033c1d6dde45e
+EBUILD tripwire-2.4.2.2.ebuild 2356 SHA256 92f6fbba0dddd31a73d8a7d9040d671bfc896e3d9c30369cbd871403da3555c6 SHA512 877f991808a95149f3411da30d4bb0bc5ad12ecbafb3d452a4397a84b051ad5a027d44e00d729d63471ead6fa7b1e31e34a4162994b03c93c97081ad87475fe2 WHIRLPOOL 5f70b3034422a604c1c7621e8f79adf7b198f99d90fccbf8943ab5a3fc14bada1c717fb74e14768a0c0c28837babb28ec2a4e9a22adeb523525bdaaa4f4c8c9c
+MISC ChangeLog 8405 SHA256 a2db7dd92354eefce7fd8455015db60b0b81b5aa942210430fce32d2bac0e62d SHA512 8f781f813871af54e6f0c47a16f3f12b0dd4c60580515b4be157a93b4f26f31e03e24419b2527c7cc38a7e0486d01db30d9565e71535992cd25a4ace055878b3 WHIRLPOOL cbe98f7b82d71985b8537e966e2e71f83e89217e249b1c8f7bbf037cc53d5b38db633235a5e9d08cb0fed00da9f48fab46e82aea70d482acc165f560b8ef0e96
 MISC metadata.xml 1250 SHA256 4a0e4a9254102c42ae05fec94121f540b5714e9439fe43bd82edc943546ebe4c SHA512 1741cb088f6ebc42aa362b0ae8d540f82d64f714d4f5629318e4cdd5e7a0227367fbfd839379dc5de546e825fc87cbc5c64190587755d2e82dea139347e1270a WHIRLPOOL 0f5402f608a4b22a6f7f7092ea796227617ebfe61954bc9d43a58726541c9e6c3ae1eb6376b74494af2773cb3ba10d7316705308bee54a07b38f58e6f0ddfee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJReYbFAAoJEA2sAkrWKOU2aewH/AzwnW3PSMdYtuVepxyx3FSF
-BhDOFOB9Dv79IRE/+zsW0Xos8s1WgeF6890SmALJYireZnTATArCSR2rA2KeVieq
-8uxq7YcivRi5Xlm3/RrS8VI642270cd8Ji8jISeBWTlM/jdUo3EboOguOMf1Ceu9
-LMKlYn7rltICyrV1QZjXkKszDqXhjfVQCSb5b1CeXKiewXZBGCKcJxEL3ax9FuLn
-Fb7RN+JJncvZuOuSRuqUq+LN3KfOV+k3G9y66mZLS8+tUXFFLG/RuXVQWOC5tfgL
-qYUwALFLy9rXH8HgpkEmBxJDP3klf0AKn2d4ljjMAQPxP36fC594o5sXSLg9mBs=
-=bhd0
+iQEcBAEBCAAGBQJRgQ/PAAoJEA2sAkrWKOU2SWIIAIkP4TWhE98u2UITY/otrPr9
+Hm+T3w7d24VVujQygpjwkLCsHweXnffDf0S0m+OENm9bHBhAjGsyV1kBUYdnQl1Y
+5OhA3u9u7TDGkrJh02z5EZXBp+CwW/iBS426MIEPPE5ct0/KcriGY4pFcyJ6m2Kc
+eOuFGWGctR87T8RtSVWsunun4bFoHi8L+7qaHqnz2QX6pUtpfCmgKzQuYRsRvIJT
++A33/z9t4Ecr5yJGQ2o2lmizl/8krN40840tXNgJVQl6CctI9eVueBKTL7YntGvg
+KRz9cfcfJzjh31YadaBo5jzomVydXa0iYej/KTP7SzdrSxBhCd1u5ASvl4CLQhs=
+=aWnL
 -----END PGP SIGNATURE-----
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch
new file mode 100644
index 000000000000..b72aaef681af
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch
@@ -0,0 +1,12 @@
+diff -Nur a/configure.in b/configure.in
+--- a/configure.in	2011-11-21 17:06:56.000000000 +0100
++++ b/configure.in	2013-05-01 13:48:30.599978971 +0200
+@@ -6,7 +6,7 @@
+ AC_CONFIG_SRCDIR([src/tw/tw.cpp])
+ AC_CANONICAL_TARGET([])
+ AM_INIT_AUTOMAKE(tripwire, 2.4.2.2)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl #################################
+ dnl Cleanup Cruft Leftover From Patch
diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild b/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild
index d3e466b6a821..aaad4acc1f02 100644
--- a/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild,v 1.4 2012/08/15 14:12:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild,v 1.5 2013/05/01 12:51:17 nimiux Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils flag-o-matic autotools
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Open Source File Integrity Checker and IDS"
 HOMEPAGE="http://www.tripwire.org/"
@@ -27,6 +27,7 @@ RDEPEND="virtual/cron
 S="${WORKDIR}"/tripwire-"${PV}"-src
 
 src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-fix-configure.patch
 	epatch "${FILESDIR}"/"${P}"-buildnum.patch
 	epatch "${FILESDIR}"/"${P}"-gcc-4.7.patch
 
@@ -38,9 +39,8 @@ src_configure() {
 	# see #32613, #45823, and others.
 	# 	-taviso@gentoo.org
 	strip-flags
-	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
-	einfo "Done."
-	chmod +x configure
+	append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+	chmod +x configure || die
 	econf $(use_enable ssl openssl) $(use_enable static)
 }
 
diff --git a/app-admin/tripwire/tripwire-2.4.2.2.ebuild b/app-admin/tripwire/tripwire-2.4.2.2.ebuild
index b6750c30006a..97101df07ee5 100644
--- a/app-admin/tripwire/tripwire-2.4.2.2.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2.ebuild,v 1.5 2012/05/18 09:02:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2.ebuild,v 1.6 2013/05/01 12:51:17 nimiux Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils flag-o-matic autotools
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Open Source File Integrity Checker and IDS"
 HOMEPAGE="http://www.tripwire.org/"
@@ -27,6 +27,7 @@ RDEPEND="virtual/cron
 S="${WORKDIR}"/tripwire-"${PV}"-src
 
 src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-fix-configure.patch
 	epatch "${FILESDIR}"/"${P}"-buildnum.patch
 
 	eautoreconf
@@ -37,9 +38,8 @@ src_configure() {
 	# see #32613, #45823, and others.
 	# 	-taviso@gentoo.org
 	strip-flags
-	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
-	einfo "Done."
-	chmod +x configure
+	append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+	chmod +x configure || die
 	econf $(use_enable ssl openssl) $(use_enable static)
 }