respect AR variable, bug 457610

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

4 files changed, 33 insertions, 3 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 6295a2117412..70dc1d9fbf06 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.45 2013/04/30 20:35:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.46 2013/05/01 21:58:23 dilfridge Exp $
+
+  01 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> xournal-0.4.7.ebuild,
+  +files/xournal-0.4.7-ar.patch, xournal-9999.ebuild:
+  respect AR variable, bug 457610
 
   30 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> xournal-0.4.7.ebuild,
   +files/xournal-0.4.7-am113.patch, xournal-9999.ebuild:
diff --git a/app-text/xournal/files/xournal-0.4.7-ar.patch b/app-text/xournal/files/xournal-0.4.7-ar.patch
new file mode 100644
index 000000000000..9f7531f40126
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.7-ar.patch
@@ -0,0 +1,24 @@
+From 0a1f22f433addb3317b225c8e26c4268ce6df856 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Wed, 1 May 2013 23:55:18 +0200
+Subject: [PATCH] Let automake define AR, since it is used for libttsubset.a
+
+---
+ configure.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.in b/configure.in
+index ba827c7..a74f7ef 100644
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,7 @@ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_HEADER_STDC
+ 
+ LDFLAGS="$LDFLAGS -lz -lm"
+-- 
+1.8.2.1
+
diff --git a/app-text/xournal/xournal-0.4.7.ebuild b/app-text/xournal/xournal-0.4.7.ebuild
index 41c9385c964e..3338e8c30593 100644
--- a/app-text/xournal/xournal-0.4.7.ebuild
+++ b/app-text/xournal/xournal-0.4.7.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/app-text/xournal/xournal-0.4.7.ebuild,v 1.6 2013/04/30 20:35:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.7.ebuild,v 1.7 2013/05/01 21:58:23 dilfridge Exp $
 
 EAPI=5
 
@@ -59,6 +59,7 @@ src_prepare() {
 		sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	fi
 	epatch "${FILESDIR}/${PN}-0.4.7-am113.patch"
+	epatch "${FILESDIR}/${PN}-0.4.7-ar.patch"
 	eautoreconf
 }
 
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 81824d9da2e6..cd0f829b3c89 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.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/app-text/xournal/xournal-9999.ebuild,v 1.5 2013/04/30 20:35:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v 1.6 2013/05/01 21:58:23 dilfridge Exp $
 
 EAPI=5
 
@@ -59,6 +59,7 @@ src_prepare() {
 		sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	fi
 	epatch "${FILESDIR}/${PN}-0.4.7-am113.patch"
+	epatch "${FILESDIR}/${PN}-0.4.7-ar.patch"
 	eautoreconf
 }