summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-03-29 01:55:22 +0000
committerMike Frysinger <vapier@gentoo.org>2013-03-29 01:55:22 +0000
commit8fc156a13b21fd8a6c6cd70056cec5745497956b (patch)
tree8e64914cb1c25e2d9efa7a8b0d4b147259d6623e /dev-cpp/gtest
parentnspr: Version bump, bmo #807883,782214,812085 includes aarch64 support (diff)
downloadgentoo-2-8fc156a13b21fd8a6c6cd70056cec5745497956b.tar.gz
gentoo-2-8fc156a13b21fd8a6c6cd70056cec5745497956b.tar.bz2
gentoo-2-8fc156a13b21fd8a6c6cd70056cec5745497956b.zip
Remove pointless die with epatch.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'dev-cpp/gtest')
-rw-r--r--dev-cpp/gtest/ChangeLog5
-rw-r--r--dev-cpp/gtest/gtest-1.6.0-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-cpp/gtest/ChangeLog b/dev-cpp/gtest/ChangeLog
index e355815c2e1a..fffda6244f8f 100644
--- a/dev-cpp/gtest/ChangeLog
+++ b/dev-cpp/gtest/ChangeLog
@@ -1,5 +1,8 @@
# ChangeLog for dev-cpp/gtest
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.29 2013/02/28 15:47:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.30 2013/03/29 01:55:22 vapier Exp $
+
+ 29 Mar 2013; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0-r1.ebuild:
+ Remove pointless die with epatch.
28 Feb 2013; Jeroen Roovers <jer@gentoo.org> gtest-1.6.0-r1.ebuild:
Stable for HPPA (bug #456476).
diff --git a/dev-cpp/gtest/gtest-1.6.0-r1.ebuild b/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
index 30ea603aef77..c60b7d2f966d 100644
--- a/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.6.0-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-cpp/gtest/gtest-1.6.0-r1.ebuild,v 1.13 2013/02/28 15:47:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r1.ebuild,v 1.14 2013/03/29 01:55:22 vapier Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -29,7 +29,7 @@ src_prepare() {
sed -i -r \
-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
Makefile.am || die
- epatch "${FILESDIR}"/configure-fix-pthread-linking.patch || die
+ epatch "${FILESDIR}"/configure-fix-pthread-linking.patch #371647
eautoreconf
python_convert_shebangs -r 2 .