summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-05-21 15:50:12 +0000
committerJeroen Roovers <jer@gentoo.org>2013-05-21 15:50:12 +0000
commitf45a4fe84ec9cec673e42220ff18b7c7b2719b94 (patch)
treed44ddb54dc05f719f1a7a315ff9844f6c5eb4982 /dev-libs/gmetadom
parentVersion bump: rename pax-mark to avoid name collision (diff)
downloadgentoo-2-f45a4fe84ec9cec673e42220ff18b7c7b2719b94.tar.gz
gentoo-2-f45a4fe84ec9cec673e42220ff18b7c7b2719b94.tar.bz2
gentoo-2-f45a4fe84ec9cec673e42220ff18b7c7b2719b94.zip
Fix building with automake-1.13.
(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-libs/gmetadom')
-rw-r--r--dev-libs/gmetadom/ChangeLog6
-rw-r--r--dev-libs/gmetadom/files/gmetadom-0.2.6-automake-1.13.patch11
-rw-r--r--dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild8
3 files changed, 22 insertions, 3 deletions
diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index c8a8a73b213e..da4235cfe1ff 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/gmetadom
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.43 2013/05/20 12:52:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.44 2013/05/21 15:50:12 jer Exp $
+
+ 21 May 2013; Jeroen Roovers <jer@gentoo.org>
+ +files/gmetadom-0.2.6-automake-1.13.patch, gmetadom-0.2.6-r1.ebuild:
+ Fix building with automake-1.13.
20 May 2013; Agostino Sarubbo <ago@gentoo.org> gmetadom-0.2.6-r1.ebuild:
Stable for ppc, wrt bug #470388
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.6-automake-1.13.patch b/dev-libs/gmetadom/files/gmetadom-0.2.6-automake-1.13.patch
new file mode 100644
index 000000000000..6be0d632e6f0
--- /dev/null
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.6-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@
+
+ # AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AH_TOP([
+ /* This file is part of GMetaDOM
diff --git a/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild b/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild
index 67899e25149a..e118ce53b671 100644
--- a/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild
+++ b/dev-libs/gmetadom/gmetadom-0.2.6-r1.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/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild,v 1.4 2013/05/20 12:52:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild,v 1.5 2013/05/21 15:50:12 jer Exp $
EAPI=5
@@ -28,7 +28,11 @@ DEPEND="${RDEPEND}
AUTOTOOLS_IN_SOURCE_BUILD="yes"
AUTOTOOLS_AUTORECONF="yes"
MAKEOPTS="${MAKEOPTS} -j1"
-PATCHES=( "${FILESDIR}"/${P}-gentoo-2.patch "${FILESDIR}"/${P}-gcc43.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo-2.patch
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+)
src_configure() {
# Unconditonal use of -fPIC (#55238).