Fix building with automake-1.12. Thanks to Brennan Shacklett

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 67 insertions, 4 deletions

diff --git a/app-crypt/shishi/ChangeLog b/app-crypt/shishi/ChangeLog
index 95d7f0abae8b..ff03c811cf76 100644
--- a/app-crypt/shishi/ChangeLog
+++ b/app-crypt/shishi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/shishi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/ChangeLog,v 1.3 2012/04/24 09:40:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/ChangeLog,v 1.4 2012/07/11 09:11:47 eras Exp $
+
+  11 Jul 2012; Eray Aslan <eras@gentoo.org> shishi-1.0.1.ebuild,
+  +files/shishi_automake-1.12.patch:
+  Fix building with automake-1.12. Thanks to Brennan Shacklett.
+  Bug #424095
 
   24 Apr 2012; Michał Górny <mgorny@gentoo.org> shishi-1.0.1.ebuild:
   Update to use mirror://.
diff --git a/app-crypt/shishi/Manifest b/app-crypt/shishi/Manifest
index 5da42764fb10..aac0b580c97c 100644
--- a/app-crypt/shishi/Manifest
+++ b/app-crypt/shishi/Manifest
@@ -1,7 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX shishi_automake-1.12.patch 1305 SHA256 d25d1ab8406ba56cb8a96eee056f121fcba16e966928de6d2e19b14d0ab24119 SHA512 27a642c1b69e05b438bb92934f8960c0307b4176837dacab7002f1c3dd488812943b1881888c26e4dfcfbbf56af944ef57c492b685a551db0e37a8796e9b3e6f WHIRLPOOL e26fa385496f9b2233311e2f261c7c82aeb47229dbd21b6bd7eb94bb346b6c27a26646a5f415976ab21edc4b0d4387f61fc99a83441d0c4087c826302b7805a6
 AUX shishi_resolv.patch 897 SHA256 231af9a2eddf7358551bfc48063824121e99a37c46332c70ddfd45fc0f0d887f SHA512 639c021ad98af49e04b3dcb2fcada3bdb27cbcdaec39afd84e8dc0d3e5ae4bedaaf1c4df4cba9d6fbfbef2d450235e27941239521e7c26c04c5423485d8f03ef WHIRLPOOL 7a997431f34ef1eeecad03bfa3bc92649cacd758e462631dd20d1e1cd165bae1c16adf60d09de71c728a588a4b496174966416f616b8e9bb89b945ff225459fa
 AUX shishid.confd 133 SHA256 7280cdf9d4cdcb1be8298727c29630a04e62fb4b1c1f1c0d1528e1389b81408d SHA512 83b4586a28790e5a25e4d0d5b7df079402e596cb60b12d1c560088822cba623a380f6785135b1b43b7ccaf9f33b52fae7dd2220ad29553e922d52478c2fba228 WHIRLPOOL 7a2bf16ad9a61e8938ce51e1ede4ad3b4a24e5fd4e8516e40d10188f4fb9fbf52ebb9fe9cf6a0bb4538e993e5b16c5a3258e04a30ba2762e13896208c32b5457
 AUX shishid.init 672 SHA256 c934b3a4e521e0e6609a320875da2b960250eb28ed01f690becdfdee4db5fe39 SHA512 0475c33aa350453c5ef19e21f7d6fe205222b36da6aadd57bb8cde1491a60e94cb839c2b4c650f40689b0240e4cd3ed56f70cf646b8a2acf4ab55ab4f28e9a23 WHIRLPOOL 7a14a32d82d8c9bc8cd9d27962ac7b7d9e56bd038980e8ad9fd1d2fbc9043f732815869711a1e75660214677584c1d16371c93a92c834f1535a00a552ccddb88
 DIST shishi-1.0.1.tar.gz 4999488 SHA256 9d7e4738df21116422585b347ad1c985d2bafd32c8665b4c5563617573e2868d SHA512 cb24baae75072e7ee20946d1d15a16c8a77e44f110f88e5f17e64d5e0110c0a00f18e8651b6f162a6e13c1a39b248ca03849c3d8ae4f8d7512dbc77f54f8d98c WHIRLPOOL 45b92a57b8b3a06a7a84160bacdc370883d8a9417f4f9b6feef36e5d6654d8db79695623265cfae6982a60679a3041741a3cbd4dafa4c75b91aebc7c08dd5e1c
-EBUILD shishi-1.0.1.ebuild 2027 SHA256 916ed95f5ec1903455d939dd65d637ece4f8d0cc31e757204ca0872691baa306 SHA512 21558fd5676170a1c960bee960836176a0a5686e691160cb90bb11d002bbb1b7f7824fd6906155317a4d1f593791e6b9c7cce16597530cd8e02a251a6a3b06e1 WHIRLPOOL c4ce29b7a626a3c10d32aa25f411e00378806a77a1cac6c84e74d181aac061877d64473166125cd5c36095c7172d8d77c36e9fe9a4c7cb32800ddbd514fc8cc8
-MISC ChangeLog 658 SHA256 aed82f21b9c0a1ecb5ef77f00c60bfe5e3d1f6ad36ed08a25294c1b5d54cc07c SHA512 3283981e8d72bc6e117c27ed1abe219c04887e859700648c6ec16c4f13783cb1ca1f5ad03e5be316a6870931b7e7fbe97863394188a871f7b91719568c6ad540 WHIRLPOOL 6c796d74e49f47aa033c765a631b94b6808356d71f2156e3c346c851bae5b30dc91cbbef18e13990bbd3143b53c2a5733e21d982e59e91ef1efaecfa9315e52a
+EBUILD shishi-1.0.1.ebuild 2120 SHA256 188b431302a19ec68a08f7e3c2f78790de33815a7581df267c22818ed8d48f6b SHA512 21889afaee45db1ce05c1ea6e00a291e43af67fa14d6ff6c60848cd23f47d7e7f35f81b4b3cf12ce5162d63591f51c13d40afc25a443438944dec2293b4c5dbd WHIRLPOOL a1c28f86ef06256248365e975a3f4ae151771b7f2ed4559fdba8adcd843092d11cf0fef6b473778fdf7187b2695b1e3d8b7e43e05f1eeb288f8fc8b279793ff1
+MISC ChangeLog 837 SHA256 1050c6135778e8bca9f9dddbcc8a328b6b27c6dd3d46e325ca534feb985e6322 SHA512 80f02cb6f112d59500a0d9ab5a2802cffd3bbbb7a0f527c428e329e64e4eb3af1bfd4fcfedc57802e57630a2404f6a012c9876c47dcfee38ea33f3cd926cdcd5 WHIRLPOOL 6cc21d3eed609eacc01bbcda4af8cc3aedebf6fb6df7686ab8551e21d7b615bb803561c465ef582504ed0871acdfa8aa803caca1eb0c56ee8fe16a7bea99c44c
 MISC metadata.xml 703 SHA256 94e7555ed79d1dcd1263c42f96b3396d96bee92486044c50d6104c646366c1f0 SHA512 1ef213d1c2b353c68f82a36da2ae08ab7159d6a83dff80ecfe1f3a4670a97c891fe2d066626d6e897a2a8bd8ab0404f9643c24e875ccd449b2cf282aadda6fc7 WHIRLPOOL 430b52ba7a92a073c92c048938e4b747ae6cc13d4a099869caf06595549fe5614b007d00407e041e28a6f2b4f59cf2a1ad1fb02ac7b2b437b743253434c3d2eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP/UNiAAoJEHfx8XVYajsfF/0P/0zWdfvWLRrde/UzMBKXeaQG
+Ta8ccvTFg5l87H9xTrDdgDASmaS2W2fEIWi32y+gz5Sf1GYRYA8kDOUzlnye6UqH
+hfgY5jsP12qR4TY6oSnT5LPTjkUtclywdN6ZUPsCVJ2U0iS0wzxtqrFysUOpBq8O
+n153zoFla8Lr2FKjVxIp++dc8OWtuWlb6BvaWuFIigLKOLi+9RRDK6OgmeUJg661
+Hksw3sfZu5Tyr0w2b1xR2UZSLDYiiKviGBtVWUUCCF+4RfB29sx50NZZqSwYABrZ
+LnMdDwEAEn+bppeLJ9w8wos/OX1J5CFH54P3IxTG7d3kT9Io7jU4ZdlCIrxbDdTZ
+dhnnL3pSUK+fo2c/ijm7DMJS0Csm4p2BomCgeD6QabXSUEziHnCPn5F/0Gj3z/g/
+GEiKlTohB2fb7wm/vm7ptPhIpyC7RukZlgD8cLk4Dr0YLsD1L0IZLtFqCtadcY5c
+VDzPrls1RbYJw1vtjbTHHjZ/O2h5ZBS5RLwLmxjxnH4Ptk78wBfXJICqoFDzkyy3
+EWBTzmmQgP7OWLBzWnH82FGce29UU6rFixL6SvY6qe5ZQCgdW+tbPfhl4ojbagmX
+56X9AvhRQtCv8YeEZeDHojFZwR40GPpLS9loQJ9SSh3SGDbJMd7XQEDP/T0kO/p/
+SKMVGla9SmWvor17k46v
+=s6vS
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/shishi/files/shishi_automake-1.12.patch b/app-crypt/shishi/files/shishi_automake-1.12.patch
new file mode 100644
index 000000000000..484906d3c865
--- /dev/null
+++ b/app-crypt/shishi/files/shishi_automake-1.12.patch
@@ -0,0 +1,35 @@
+bug #424095
+diff -urN shishi-1.0.1-orig/configure.ac shishi-1.0.1/configure.ac
+--- shishi-1.0.1-orig/configure.ac	2012-03-12 11:18:21.000000000 -0700
++++ shishi-1.0.1/configure.ac	2012-07-08 15:43:18.597050382 -0700
+@@ -24,7 +24,7 @@
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS(config.h)
+-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ AM_SILENT_RULES([yes])
+ 
+ # Library code modified:                              REVISION++
+@@ -43,6 +43,9 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(termios.h pwd.h syslog.h resolv.h arpa/nameser.h netinet/in6.h)
+ 
++# Defined for >= automake 1.12
++m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
++
+ # Used when creating libshishi-XX.def.
+ SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
+ AC_SUBST(SOVERSION)
+diff -urN shishi-1.0.1-orig/m4/po.m4 shishi-1.0.1/m4/po.m4
+--- shishi-1.0.1-orig/m4/po.m4	2012-03-12 11:18:53.000000000 -0700
++++ shishi-1.0.1/m4/po.m4	2012-07-08 14:59:00.247043443 -0700
+@@ -24,7 +24,7 @@
+ [
+   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_INSTALL])dnl
+-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+   AC_REQUIRE([AM_NLS])dnl
+ 
+   dnl Release version of the gettext macros. This is used to ensure that
diff --git a/app-crypt/shishi/shishi-1.0.1.ebuild b/app-crypt/shishi/shishi-1.0.1.ebuild
index f4d19289c1f8..2d771f7091b2 100644
--- a/app-crypt/shishi/shishi-1.0.1.ebuild
+++ b/app-crypt/shishi/shishi-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/shishi-1.0.1.ebuild,v 1.3 2012/04/24 09:40:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/shishi-1.0.1.ebuild,v 1.4 2012/07/11 09:11:47 eras Exp $
 
 EAPI=4
 inherit multilib autotools eutils
@@ -26,6 +26,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	# fix finding libresolv.so
 	epatch "${FILESDIR}/${PN}_resolv.patch"
+	# fix building with automake-1.12 bug #424095
+	epatch "${FILESDIR}/${PN}_automake-1.12.patch"
 
 	# don't create a new database
 	sed -i -e '/install-data-hook/s/^/#/' Makefile.am || die