Fix building with automake-1.12. Thanks to Brennan Shacklett

(Portage version: 2.1.11.5/cvs/Linux x86_64)

3 files changed, 44 insertions, 2 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/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