summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2010-03-02 07:33:16 +0000
committerTiziano Müller <dev-zero@gentoo.org>2010-03-02 07:33:16 +0000
commitd8062ab260f784dd9e8701329299019909cf1ac2 (patch)
tree285798dcc9b97fabc6c888935bb27c8f8cc71c79
parentx86 stable wrt bug #303471 (diff)
downloadgentoo-2-d8062ab260f784dd9e8701329299019909cf1ac2.tar.gz
gentoo-2-d8062ab260f784dd9e8701329299019909cf1ac2.tar.bz2
gentoo-2-d8062ab260f784dd9e8701329299019909cf1ac2.zip
Fixed sandbox violation in src_test, install examples on demand, added static-libs use flag, added upstream doc link to metadata.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
-rw-r--r--dev-util/gtest/ChangeLog7
-rw-r--r--dev-util/gtest/gtest-1.4.0.ebuild26
-rw-r--r--dev-util/gtest/metadata.xml11
3 files changed, 33 insertions, 11 deletions
diff --git a/dev-util/gtest/ChangeLog b/dev-util/gtest/ChangeLog
index 55842c0ccd3b..3a6cb07e81ed 100644
--- a/dev-util/gtest/ChangeLog
+++ b/dev-util/gtest/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/gtest
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtest/ChangeLog,v 1.1 2010/03/01 23:54:29 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtest/ChangeLog,v 1.2 2010/03/02 07:33:16 dev-zero Exp $
+
+ 02 Mar 2010; Tiziano Müller <dev-zero@gentoo.org> gtest-1.4.0.ebuild,
+ metadata.xml:
+ Fixed sandbox violation in src_test, install examples on demand, added
+ static-libs use flag, added upstream doc link to metadata.
*gtest-1.4.0 (01 Mar 2010)
diff --git a/dev-util/gtest/gtest-1.4.0.ebuild b/dev-util/gtest/gtest-1.4.0.ebuild
index 388ac87cd4b9..8c64796afc36 100644
--- a/dev-util/gtest/gtest-1.4.0.ebuild
+++ b/dev-util/gtest/gtest-1.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtest/gtest-1.4.0.ebuild,v 1.1 2010/03/01 23:54:29 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtest/gtest-1.4.0.ebuild,v 1.2 2010/03/02 07:33:16 dev-zero Exp $
EAPI="2"
inherit autotools eutils
@@ -12,18 +12,32 @@ SRC_URI="http://googletest.googlecode.com/files/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="examples static-libs"
-DEPEND=">=dev-lang/python-2.3"
-RDEPEND="${DEPEND}"
+DEPEND="dev-lang/python"
+RDEPEND=""
src_prepare() {
+ sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die "sed failed"
+
epatch "${FILESDIR}/${P}-asneeded.patch"
eautoreconf
}
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc CHANGES CONTRIBUTORS README
+
+ use static-libs || rm "${D}"/usr/lib*/*.la
- dodoc CHANGES CONTRIBUTORS README || die
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins samples/*.{cc,h}
+ fi
}
diff --git a/dev-util/gtest/metadata.xml b/dev-util/gtest/metadata.xml
index 5b14597b8ad0..dc69d918ea94 100644
--- a/dev-util/gtest/metadata.xml
+++ b/dev-util/gtest/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>matsuu@gentoo.org</email>
-</maintainer>
+ <herd>no-herd</herd>
+ <maintainer>
+ <email>matsuu@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <doc lang="en">http://code.google.com/p/googletest/w/list</doc>
+ </upstream>
</pkgmetadata>