diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-01-03 12:26:50 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-01-03 12:26:50 +0000 |
| commit | 448af876c37e58e61afe8e5d4d8623ff671641a4 (patch) | |
| tree | 80085fe4f1b8c4323d372a3f93816165b8ab6c6c /sci-mathematics | |
| parent | Add selinux? dep to selinux-salt (bug #533118) for live ebuild (diff) | |
| download | gentoo-2-448af876c37e58e61afe8e5d4d8623ff671641a4.tar.gz gentoo-2-448af876c37e58e61afe8e5d4d8623ff671641a4.tar.bz2 gentoo-2-448af876c37e58e61afe8e5d4d8623ff671641a4.zip | |
Use python-any-r1 for waf.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/kodkod/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-mathematics/kodkod/kodkod-1.5.2.ebuild | 13 |
2 files changed, 15 insertions, 5 deletions
diff --git a/sci-mathematics/kodkod/ChangeLog b/sci-mathematics/kodkod/ChangeLog index 22e62ed70041..9b88a7606d6d 100644 --- a/sci-mathematics/kodkod/ChangeLog +++ b/sci-mathematics/kodkod/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-mathematics/kodkod -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.5 2014/06/22 13:52:20 gienah Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.6 2015/01/03 12:26:50 mgorny Exp $ + + 03 Jan 2015; Michał Górny <mgorny@gentoo.org> kodkod-1.5.2.ebuild: + Use python-any-r1 for waf. 22 Jun 2014; Mark Wright <gienah@gentoo.org> kodkod-1.5.2.ebuild: Use waf 1.7.16 instead of 1.7.6 in kodkod to try to fix Bug 513978. Specify diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild index ac96d56cbd5f..403a155deddc 100644 --- a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild +++ b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild @@ -1,12 +1,14 @@ -# 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/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.4 2014/06/22 13:52:20 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.5 2015/01/03 12:26:50 mgorny Exp $ EAPI="5" JAVA_PKG_IUSE="doc source" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE='threads(+)' -inherit java-pkg-2 waf-utils +inherit java-pkg-2 python-any-r1 waf-utils DESCRIPTION="a constraint solver for relational logic" HOMEPAGE="http://alloy.mit.edu/kodkod/index.html" @@ -29,6 +31,11 @@ S="${WORKDIR}/kodkod-1.5" JAVA_SRC_DIR="src" LIBDIR="/usr/"$(get_libdir)"/${PN}" +pkg_setup() { + python-any-r1_pkg_setup + java-pkg-2_pkg_setup +} + src_unpack() { unpack "${A% *}" cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf" |