summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-07-25 12:41:37 +0000
committerJustin Lecher <jlec@gentoo.org>2012-07-25 12:41:37 +0000
commitacaaa3fe54ae9d2438bda791c7b4a3b28791ff42 (patch)
tree9660f7dcae7741b1ac3cc06bbd2296e24c95c102 /app-admin/abrt
parentDrop sys-freebsd/boot0 from system set (diff)
downloadgentoo-2-acaaa3fe54ae9d2438bda791c7b4a3b28791ff42.tar.gz
gentoo-2-acaaa3fe54ae9d2438bda791c7b4a3b28791ff42.tar.bz2
gentoo-2-acaaa3fe54ae9d2438bda791c7b4a3b28791ff42.zip
app-admin/abrt: Fix for automake-1.12, #427926
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/abrt')
-rw-r--r--app-admin/abrt/ChangeLog5
-rw-r--r--app-admin/abrt/abrt-2.0.8.ebuild13
-rw-r--r--app-admin/abrt/metadata.xml2
3 files changed, 17 insertions, 3 deletions
diff --git a/app-admin/abrt/ChangeLog b/app-admin/abrt/ChangeLog
index f1687103e449..692a7dbe0fdc 100644
--- a/app-admin/abrt/ChangeLog
+++ b/app-admin/abrt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/abrt
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/ChangeLog,v 1.12 2012/05/31 02:21:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/ChangeLog,v 1.13 2012/07/25 12:41:37 jlec Exp $
+
+ 25 Jul 2012; Justin Lecher <jlec@gentoo.org> abrt-2.0.8.ebuild, metadata.xml:
+ Fix for automake-1.12, #427926
31 May 2012; Zac Medico <zmedico@gentoo.org> abrt-2.0.6.ebuild,
abrt-2.0.8.ebuild:
diff --git a/app-admin/abrt/abrt-2.0.8.ebuild b/app-admin/abrt/abrt-2.0.8.ebuild
index 541f81a4ee9e..cdeca5e59d8f 100644
--- a/app-admin/abrt/abrt-2.0.8.ebuild
+++ b/app-admin/abrt/abrt-2.0.8.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-admin/abrt/abrt-2.0.8.ebuild,v 1.7 2012/05/31 02:21:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.8.ebuild,v 1.8 2012/07/25 12:41:37 jlec Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -65,6 +65,17 @@ src_prepare() {
sed -e '/pyhook.at/ d' \
-i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
+ # automake-1.12, #427926
+ sed \
+ -e "/AC_PROG_LIBTOOL/s:^:AM_PROG_AR\n:g" \
+ -e "/AC_PROG_CC/s:$:\nAM_PROG_CC_C_O\n:g" \
+ -e 's:-Werror::g' \
+ -i configure.ac || die
+
+ sed \
+ -e 's:AM_PROG_MKDIR_P:AC_PROG_MKDIR_P:g' \
+ -i m4/* aclocal.m4 || die
+
eautoreconf
python_clean_py-compile_files
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
index da6fd63d0085..dad9001338dc 100644
--- a/app-admin/abrt/metadata.xml
+++ b/app-admin/abrt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+ <herd>gnome</herd>
</pkgmetadata>