summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-07-08 17:19:34 +0000
committerJustin Lecher <jlec@gentoo.org>2012-07-08 17:19:34 +0000
commitadd090f0f298cc4d534aad596c3d5b14cf8af970 (patch)
tree07b41328705351445d7cb0ebfce1bf9afba481f0
parentversion bump (diff)
downloadgentoo-2-add090f0f298cc4d534aad596c3d5b14cf8af970.tar.gz
gentoo-2-add090f0f298cc4d534aad596c3d5b14cf8af970.tar.bz2
gentoo-2-add090f0f298cc4d534aad596c3d5b14cf8af970.zip
Add fix for automake-1.12, #425268
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
-rw-r--r--dev-libs/libreport/ChangeLog5
-rw-r--r--dev-libs/libreport/libreport-2.0.10.ebuild15
2 files changed, 17 insertions, 3 deletions
diff --git a/dev-libs/libreport/ChangeLog b/dev-libs/libreport/ChangeLog
index c8808ba87e92..f63a7857b73a 100644
--- a/dev-libs/libreport/ChangeLog
+++ b/dev-libs/libreport/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libreport
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.11 2012/07/08 11:13:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.12 2012/07/08 17:19:34 jlec Exp $
+
+ 08 Jul 2012; Justin Lecher <jlec@gentoo.org> libreport-2.0.10.ebuild:
+ Add fix for automake-1.12, #425268
*libreport-2.0.10 (08 Jul 2012)
diff --git a/dev-libs/libreport/libreport-2.0.10.ebuild b/dev-libs/libreport/libreport-2.0.10.ebuild
index 4d1483f3cba8..c627d16921be 100644
--- a/dev-libs/libreport/libreport-2.0.10.ebuild
+++ b/dev-libs/libreport/libreport-2.0.10.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/dev-libs/libreport/libreport-2.0.10.ebuild,v 1.1 2012/07/08 11:13:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/libreport-2.0.10.ebuild,v 1.2 2012/07/08 17:19:34 jlec Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -55,12 +55,23 @@ src_prepare() {
# Modify uploader_event so that the gui recognizes it
epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch"
+ # automake-1.12
+ sed \
+ -e 's:AM_PROG_MKDIR_P:AC_PROG_MKDIR_P:g' \
+ -i aclocal.m4 || die
+ sed \
+ -e 's:mkdir_p:MKDIR_P:g' \
+ -i src/plugins/Makefile.am src/lib/Makefile.am || die
+ sed \
+ -e "/AC_PROG_LIBTOOL/s:^:AM_PROG_AR\n:g" \
+ -i configure.ac || die
+
# -Werror should not be used by default
sed -e "s/-Werror\( \|$\)//" \
-i src/client-python/Makefile.* src/cli/Makefile.* \
src/gtk-helpers/Makefile.* src/gui-wizard-gtk/Makefile.* \
src/lib/Makefile.* src/plugins/Makefile.* \
- src/report-python/Makefile.* || die "sed failed"
+ src/report-python/Makefile.* configure.ac || die "sed failed"
python_clean_py-compile_files