summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-02-16 09:33:52 +0000
committerPacho Ramos <pacho@gentoo.org>2012-02-16 09:33:52 +0000
commit2c02dfb7293e226d568a16b7199ea2f0dc1ea1e9 (patch)
tree8cdfbd19d9fdfcf44559f385ee65fd7f1a6dbea1 /dev-db/metakit
parentpavuk was fixed and updated, media-libs/libdlna and media-video/ushare will b... (diff)
downloadgentoo-2-2c02dfb7293e226d568a16b7199ea2f0dc1ea1e9.tar.gz
gentoo-2-2c02dfb7293e226d568a16b7199ea2f0dc1ea1e9.tar.bz2
gentoo-2-2c02dfb7293e226d568a16b7199ea2f0dc1ea1e9.zip
Restrict pypy, bug #403797 by Patrick Lauer.
(Portage version: 2.1.10.46/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/metakit')
-rw-r--r--dev-db/metakit/ChangeLog7
-rw-r--r--dev-db/metakit/metakit-2.4.9.7.ebuild16
2 files changed, 13 insertions, 10 deletions
diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index 21c333620635..2a509eb1c688 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/metakit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.54 2010/10/15 20:44:07 arfrever Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.55 2012/02/16 09:33:52 pacho Exp $
+
+ 16 Feb 2012; Pacho Ramos <pacho@gentoo.org> metakit-2.4.9.7.ebuild:
+ Restrict pypy, bug #403797 by Patrick Lauer.
15 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-metakit-2.4.9.6.ebuild:
diff --git a/dev-db/metakit/metakit-2.4.9.7.ebuild b/dev-db/metakit/metakit-2.4.9.7.ebuild
index c8ce4b745c2a..4c4e525143a5 100644
--- a/dev-db/metakit/metakit-2.4.9.7.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.12 2010/10/14 19:07:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.13 2012/02/16 09:33:52 pacho Exp $
-EAPI="3"
+EAPI="4"
PYTHON_DEPEND="python? 2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
inherit eutils multilib python toolchain-funcs
@@ -39,7 +39,7 @@ src_configure() {
use static && myconf+=" --disable-shared"
use static || mycxxflags="-fPIC"
- sed -i -e "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS} ${mycxxflags} -I\$(srcdir)/../include:" unix/Makefile.in
+ sed -i -e "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS} ${mycxxflags} -I\$(srcdir)/../include:" unix/Makefile.in || die
CXXFLAGS="${CXXFLAGS} ${mycxxflags}" unix/configure \
${myconf} \
@@ -47,11 +47,11 @@ src_configure() {
--prefix=/usr \
--libdir=/usr/$(get_libdir) \
--infodir=/usr/share/info \
- --mandir=/usr/share/man || die "configure failed"
+ --mandir=/usr/share/man
}
src_compile() {
- emake SHLIB_LD="$(tc-getCXX) -shared" || die "emake failed"
+ emake SHLIB_LD="$(tc-getCXX) -shared"
if use python; then
python_copy_sources
@@ -67,7 +67,7 @@ src_compile() {
}
src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
if use python; then
installation() {