summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-01-07 03:02:01 +0000
committerMike Gilbert <floppym@gentoo.org>2013-01-07 03:02:01 +0000
commitd5157ded6a60acae8c57ce07344e179ed33cadb1 (patch)
treeefb0fa72b403ff30a08e0a092548debc5ceaa0ce /app-arch
parentRemove old. (diff)
downloadgentoo-2-d5157ded6a60acae8c57ce07344e179ed33cadb1.tar.gz
gentoo-2-d5157ded6a60acae8c57ce07344e179ed33cadb1.tar.bz2
gentoo-2-d5157ded6a60acae8c57ce07344e179ed33cadb1.zip
Prevent automake mainainer mode from happening, bugs 365993 and 450448.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/rpm/ChangeLog6
-rw-r--r--app-arch/rpm/rpm-4.10.0.ebuild7
-rw-r--r--app-arch/rpm/rpm-4.10.2.ebuild5
3 files changed, 14 insertions, 4 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index b57f69fdf9ac..c2a98a68f80d 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/rpm
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.164 2013/01/05 09:47:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.165 2013/01/07 03:02:01 floppym Exp $
+
+ 07 Jan 2013; Mike Gilbert <floppym@gentoo.org> rpm-4.10.0.ebuild,
+ rpm-4.10.2.ebuild:
+ Prevent automake mainainer mode from happening, bugs 365993 and 450448.
05 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> rpm-4.10.2.ebuild:
Stabilise on amd64 x86 ppc and ppc64 wrt bug#450286.
diff --git a/app-arch/rpm/rpm-4.10.0.ebuild b/app-arch/rpm/rpm-4.10.0.ebuild
index bf8816d3c093..2c5c5599abe0 100644
--- a/app-arch/rpm/rpm-4.10.0.ebuild
+++ b/app-arch/rpm/rpm-4.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.0.ebuild,v 1.9 2012/10/14 17:40:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.0.ebuild,v 1.10 2013/01/07 03:02:00 floppym Exp $
EAPI=4
@@ -54,6 +54,9 @@ src_prepare() {
sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
eautoreconf
+
+ # Prevent automake maintainer mode from kicking in (#450448).
+ touch -r Makefile.am preinstall.am
}
src_configure() {
diff --git a/app-arch/rpm/rpm-4.10.2.ebuild b/app-arch/rpm/rpm-4.10.2.ebuild
index 8d7c24d3acd0..76099d4cde4b 100644
--- a/app-arch/rpm/rpm-4.10.2.ebuild
+++ b/app-arch/rpm/rpm-4.10.2.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-arch/rpm/rpm-4.10.2.ebuild,v 1.2 2013/01/05 09:47:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.2.ebuild,v 1.3 2013/01/07 03:02:00 floppym Exp $
EAPI=4
@@ -54,6 +54,9 @@ src_prepare() {
sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
eautoreconf
+
+ # Prevent automake maintainer mode from kicking in (#450448).
+ touch -r Makefile.am preinstall.am
}
src_configure() {