summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2015-01-15 19:57:26 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2015-01-15 19:57:26 +0000
commit77d155443b3fb1aa8ad7e3182d010c1a787eb480 (patch)
treeefb538a4e9877c27b68ede26345b05c67e713531 /dev-vcs
parentStable for HPPA (bug #534902). (diff)
downloadgentoo-2-77d155443b3fb1aa8ad7e3182d010c1a787eb480.tar.gz
gentoo-2-77d155443b3fb1aa8ad7e3182d010c1a787eb480.tar.bz2
gentoo-2-77d155443b3fb1aa8ad7e3182d010c1a787eb480.zip
Don't clobber MAKEOPTS on paludis (bug #536680 by cmuelle8).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/cvsps/ChangeLog7
-rw-r--r--dev-vcs/cvsps/cvsps-3.13-r1.ebuild6
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-vcs/cvsps/ChangeLog b/dev-vcs/cvsps/ChangeLog
index fc7673701909..9640123e9943 100644
--- a/dev-vcs/cvsps/ChangeLog
+++ b/dev-vcs/cvsps/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/cvsps
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/ChangeLog,v 1.25 2014/10/06 18:38:36 grobian Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/ChangeLog,v 1.26 2015/01/15 19:57:26 slyfox Exp $
+
+ 15 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> cvsps-3.13-r1.ebuild:
+ Don't clobber MAKEOPTS on paludis (bug #536680 by cmuelle8).
06 Oct 2014; Fabian Groffen <grobian@gentoo.org> cvsps-3.13-r1.ebuild:
Fix out of Prefix, bug #521708
diff --git a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
index 05f90871d4c0..a8a295dc48ee 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/cvsps-3.13-r1.ebuild,v 1.2 2014/10/06 18:38:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/cvsps-3.13-r1.ebuild,v 1.3 2015/01/15 19:57:26 slyfox Exp $
EAPI=5
@@ -27,7 +27,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-make.patch
mv ${PN}.asc ${gentoo_name}.asc || die
sed -i "s/${PN}/${gentoo_name}/g" ${gentoo_name}.asc || die
- MAKEOPTS+=" PROG=${gentoo_name}"
+ sed -i "s/PROG = cvsps/PROG = ${gentoo_name}/" Makefile || die
tc-export CC
export prefix="${EPREFIX}"/usr