Fix building with automake >=1.11.2, wrt bug #424892. Thanks to Dennis Freise for discovering this issue and for providing patch

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 33 insertions, 12 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index 72cae4d74515..976f879f7c89 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/capisuite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.41 2013/04/01 13:47:49 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.42 2013/04/01 16:33:23 pinkbyte Exp $
+
+  01 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> capisuite-0.4.5-r6.ebuild,
+  +files/capisuite-0.4.5-automake-1.11.patch:
+  Fix building with automake >=1.11.2, wrt bug #424892. Thanks to Dennis Freise
+  for discovering this issue and for providing patch
 
   01 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> capisuite-0.4.5-r6.ebuild:
   Fix HOMEPAGE and SRC_URI, wrt bug #327787. Thanks to René Neumann for
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
index 3255a3cf2157..6b778063075d 100644
--- a/net-dialup/capisuite/Manifest
+++ b/net-dialup/capisuite/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX capisuite-0.4.5-as-needed.patch 761 SHA256 53751ba6c6a2cbc99b250ba2e089642c73d2f6235babcee05f43cdc36eaf8001 SHA512 b105adea33cb10b590c916548cdeffec042c60e36abfa1e02354a0d022072732e464564e6c6a583d2ab5bfbc1bd1e4f4dc02e97e027e755cace8fbcf6df11eaa WHIRLPOOL c0a703dd645d6b21dc68366c56e7f39ae4ef67490bc4d380582baa019368d2dac4c0f3a223e528c7ae037c15947eeb59de6e6f0f25f1a704ea6a214af912e785
+AUX capisuite-0.4.5-automake-1.11.patch 473 SHA256 d972814a385e70aba1848cf5341e57aaf1f544077841b2a05621be8c5dc8af34 SHA512 b415f2f04d5ffa98d044e4fe3ebcc1c25df70bea4b5f8dc65426ec192030d0b61237f3639f17694ba90fe74c0c0e5e381d78ab714d3d6430d9bb1b5951e49f86 WHIRLPOOL 32eec84cadd033a2c514a5da6411071b8d04b0e7ecb7d07f97b1100871e09b5a6c546505eb54b056399b21ea9153db6cc1303f539a7d80920402676d276fde2e
 AUX capisuite-0.4.5-capi4linux_v3.diff 4395 SHA256 69d1e2ea6668bb237b0b4bbfb4058ebb9c53b4c3b4e676c7ce1cb422031b1693 SHA512 80dbbda4469197b0f0f45b0f16a3c13f0e74ffd6d8ba04d18a8970a1fbeabda47a96003a314173fb584c4104e7483c2bca0ed4efc729bdfbb96e8dc8d515e415 WHIRLPOOL 53d5e5a415edee96221cbf37def4408a0451c5c4d70715ebb0397217c62d783732578979f238ae84bea4b6984240b4007f9f9324ddc552c50fdda242bceee96e
 AUX capisuite-0.4.5-date-header.patch 821 SHA256 36d7388c9fb3700718cf2df6124d9343a0494c1b802570afa7cc95a44264cc18 SHA512 e06cc4d146f9c751034c06c90b217d468819cba643cddd6c90b7c1880ce50e5ef7ecdd96db6399bed3d38c0d396269532b1b4c9b9c1cee713c17a045488f209f WHIRLPOOL 6a3327036467eed15b74960773287b7fc4735ff16836803be7d6fde288c66c406bde6a803ec04d339284bf445a9abaa5a0763347a2715ee005b2bcdffb55afdd
 AUX capisuite-0.4.5-gcc43.patch 656 SHA256 a177c318ea08d199129f39f5fb1236cfb51d2186374451d52c58b5fdd0f20764 SHA512 c97e044bdc482215c25adf572ce5d39825d5631af0c35ea751d06c902c6c11404ac2376ccad506f4a337cb62c100ed79f8bf7339271e38f22e09f7e79b3b34b4 WHIRLPOOL ef0e16c1f9910afb90e2c34f8dc4c7c5c21bc0eb1b4d63bf8f1bbeaadf13a9bcfe1c89a52e33ba1277157a515e9448074da37df67bc28c554d03ec1f3475f5fb
@@ -11,18 +12,18 @@ AUX capisuite-0.4.5-syntax.patch 6589 SHA256 a8d9a678051c155769edfd6d3d6bebf6d6e
 AUX capisuite-fax-compatibility.patch 423 SHA256 a64a3cb28aea777f19a84027fda3594cc4e632ebeab4f8f6c448ab386dfb105a SHA512 a9435db3135be4f057c5e3fa45c4a04a887117a4253e8218f3a46471ae434db9b7e91847afc146fa9e45f3b30be7de81bf785958164785c4fdf0b575b868edd4 WHIRLPOOL e0761d7f091c8370c55ba4c058d9502b1916c870c9872f08e1ee0f0f1c0e543400965ccbfe03420fbaadd90c533c375df66e7e0d1d955e4a251211e1f5f24560
 AUX capisuite.initd 1417 SHA256 35ad8798dd863cc5f6f2d9c429274a19b04dcab1f96b26c02f8e00f268f5df58 SHA512 2f2b492a025fed620d80774ce82ee9cced49905712b64a9704df60cb36c83a2bb44f210fe7cbd80ab34f3908d6157623a63b9166bf5f9e19f3123cf9f5de72fd WHIRLPOOL 81a49ae085930f92b73358f02c045265f4964e41871b1b251c59a54b1dbe8f4f784f65959d3ceb6db8b8d7346267e1a25b21457fd7097b0b2b5df269bf3a23e9
 AUX capisuite.logrotated 1003 SHA256 d8e3135693c5040f1b817c2776235fd35fa926a98e378a9ce6f2733d0095cc53 SHA512 b6c4491cfdeb4e03420e44cccb3c9ad8a0eb440e55cad246c9f40c6e27f865238a16d27736d759eef6c583c171fae32b7ecf4122f77ff0805c4d0b78d33957ce WHIRLPOOL c40406f25c52c41943462f106a5d791fd33ff74b03b7c3314e8fa0e52c70a1888588cda056d5344ef37ec904084cd0ef8e7fce353c365b4b25e283140949f3d9
-DIST capisuite-0.4.5.tar.gz 1184603 SHA256 3e94e42eae6477a222c608c2cd040568fd9fcfa4e8eb0b06a538175d44cbae96
-EBUILD capisuite-0.4.5-r6.ebuild 2331 SHA256 088295110914c77d7c2ce1de55c985b4af3344ade02d06e43f7cd93273a0322d SHA512 1a36bf424f0346e23231bb8431d5e462867060b2723299c0c30ed42bf71c355559643383f5683e76ef36c12e44357770a02fae2536261eaba1cfbda98e4ba527 WHIRLPOOL d3305c2779303336a697f27f82c0e1ec5f8967a55fdb13ad30fb954321d0bba8a95122e0edc1668f3a465e2d882d4e766ab9ef397846f02b6f9e9a7a5cdbd6ee
-MISC ChangeLog 7255 SHA256 9b2cc7d4bf921dc823b3118c0f02eb9aa8249ad289fb0bc45cc696ee8a60af16 SHA512 83e9f027b5e263ba1c7d2fc8cfde7378972cf953a3f462e13b08e779c018e45e9b08f77358d1562eb42bf9ffffe9b4ae766581ae08e3d5c746536bdcf82cc0f2 WHIRLPOOL 77c02fde384659258573bc16d790ad0e39197639ff00ed9c545b9946761ad9a56cfca1350f609a002e9fb72526e75939b03bfafa46c7d8c76060549c2acdb0f2
+DIST capisuite-0.4.5.tar.gz 1184603 SHA256 3e94e42eae6477a222c608c2cd040568fd9fcfa4e8eb0b06a538175d44cbae96 SHA512 f52a0a687443562d514f2d485724208b4a0d856b87c202190fdbf520f5c11929c3c7ddf9fed73ed64b02fdfab19631973c5a54d7301d290d339bcb12274fceaa WHIRLPOOL 163c9d6cedf9966fd3ada091e42534f16d2dccfbdd1cfa383c74543af422ec66697db110c1be76eb124669e19fc19bb7f751c77b06f1428bf1392bf54a629c40
+EBUILD capisuite-0.4.5-r6.ebuild 2434 SHA256 b6cac97e66ee65a2f231c0a8ed422abc05f83f6cb7cf18758b16780f9feadcf8 SHA512 f8235c4c631bb0d1c6d645f9424084bef76be78c824f679673e8182fc1c06b9a06485c32ddec751b999acda70f2bf508a09037b4aa236908abe52943d6c98962 WHIRLPOOL 1b5be89ccd325249c3840f47ae8b518e7cdc6918d17fd2fc3cfe15d9ce464d7d3c0e3d5344680b41dc3adcddda1c175a0e9e4a8e75e310e9c1bae8ae46aec8f4
+MISC ChangeLog 7512 SHA256 e57d2e1a9c3717d483540dc8f586ec20775be212148a3f2f6e1c8a5800f3cd7b SHA512 057daf481efa27aa8b91162d6d17db2be07c67b037ce62c5092c2ba48b7845f14b8cbb1f2f39465eccfc305c016bfed8b85219981bb14328be079b096201f4c4 WHIRLPOOL cdaa6bf1d5f5638bf16313fc0e4578bb415f671e36f35640ceb40cb318299a06cdbeb674faedf5aac88a032938bccb919baa7908a8ada320dda0458dc3324dc7
 MISC metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 SHA512 275566c067e365604d523694db8e2417e0ccf91227d1204a104912d46841d193d1cb0a39e31663f30bfb92bda09523277b61661093bfb80ca9a9e70b20ea91f0 WHIRLPOOL f02b3040d2c474daa9d38e7d17ee7d138245e06be8c26403efd656d03f54495e344157c23245bc925a0f5319f507d30a68924997ac9880e32593855d0ac0fad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRWZABAAoJECo/aRed9267qVUH/0NOsnb2wfojzK74TXUVqcsK
-K4puUyQadtaV8xLl/AgMzX8ze+K857axV6bEzNr5CTXgZ4JTOyzTozNbUET/J3rx
-vO2kTqMlt41Upq4QySDLoO5j/icblvs7uJtQIlfSqnGS8kb+PgfQSFEtn4raqfGE
-zTUelOh6c35O0EybuKexPMvL6ZFlsM48CTOx9NcU3IGKuu/rpPPylx4ypOfx8TS7
-Its3o2Chsd6+3MD/5wPpYP8IRpYN8wZ6ZMY3yy/iiY5gpZ54o1gnxJKD/MzRouho
-9g8J/bRvUC3QvSpOSfbyPi8QxY1llJ9LYTA3rX0FlG261XmKLwSslR66ngNbKr4=
-=m0sa
+iQEcBAEBCAAGBQJRWbbUAAoJECo/aRed9267jQMH/3n8b+L6ctbQJC6zR6pHfIpn
+CeR4stGFkv6xA0FY18Lr81RF1+GXwC2pxOsV9Y9mEfg8W0QONCHOwGhbOnkYK+Wm
+eoAnMEz5zc1pCNHniwiJHCTiKREseMveFxd6Xg7WdKYr67C2TLXnoyL2GMVwJkko
+asA6hK8JQjGkyFhF4qwZR2K+ErQc2uz0qPj72/ajBeOfsbUgk/1aJ+H5u1pVkI/Q
+EySAAwMpBT165xSqd3X/GTXCq3ilbpwsA4H7iDLGFt/DHL3HKGXC0IHQKXgMidr/
+L5dlisXPjBGv78dW8EVqCxmq1Xem7J22RQY1yIkEMzLsbKO7JOqp7GLAtZjMHww=
+=WzAV
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
index f7503c5364b5..334c02677c2a 100644
--- a/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
+++ b/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild,v 1.6 2013/04/01 13:47:49 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild,v 1.7 2013/04/01 16:33:23 pinkbyte Exp $
 
 inherit eutils autotools flag-o-matic multilib python
 
@@ -50,6 +50,9 @@ src_unpack() {
 	# Compability with current SOX (bug #250320)
 	epatch "${FILESDIR}/${P}-sox.patch"
 
+	# Compatibility with automake >= 1.11.2 (bug #424892)
+	epatch "${FILESDIR}/${P}-automake-1.11.patch"
+
 	# run autotools
 	eautoreconf
 }
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch b/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch
new file mode 100644
index 000000000000..4abd3265194b
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch
@@ -0,0 +1,12 @@
+--- scripts/Makefile.am.orig	2012-07-05 14:10:56.725746439 +0200
++++ scripts/Makefile.am	2012-07-05 14:12:00.840861325 +0200
+@@ -1,7 +1,8 @@
+ spooldir = @localstatedir@/spool/capisuite
+ pkgsysconfdir = @sysconfdir@/capisuite
+ 
+-dist_pkglib_DATA = idle.py incoming.py README
++scriptdatadir=$(pkglibdir)
++dist_scriptdata_DATA = idle.py incoming.py README
+ python_module_DATA = cs_helpers.py
+ EXTRA_DIST = cs_helpers.pyin fax.confin answering_machine.confin capisuitefax.in
+