summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-05-11 18:37:22 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-05-11 18:37:22 +0000
commit43a7c02ea8293085f1d9137d0ba53d69d6ab3160 (patch)
tree9d1b781a6a37b56e2c0bffa97660ffcf50448e81 /dev-lang/yasm/yasm-1.2.0-r1.ebuild
parentAdd changelog that repoman failed to commit for me (diff)
downloadhistorical-43a7c02ea8293085f1d9137d0ba53d69d6ab3160.tar.gz
historical-43a7c02ea8293085f1d9137d0ba53d69d6ab3160.tar.bz2
historical-43a7c02ea8293085f1d9137d0ba53d69d6ab3160.zip
Disable automagic app-text/xmlto usage to prevent manpages from getting rebuilt unnecessarily wrt #459940 by Anton Kochkov. Use python-r1 instead of python eclass
Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'dev-lang/yasm/yasm-1.2.0-r1.ebuild')
-rw-r--r--dev-lang/yasm/yasm-1.2.0-r1.ebuild23
1 files changed, 11 insertions, 12 deletions
diff --git a/dev-lang/yasm/yasm-1.2.0-r1.ebuild b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
index 75de13347ceb..55e0026d9dc5 100644
--- a/dev-lang/yasm/yasm-1.2.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0-r1.ebuild,v 1.1 2013/01/15 17:31:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0-r1.ebuild,v 1.2 2013/05/11 18:37:07 ssuominen Exp $
-EAPI=4
-PYTHON_DEPEND="python? 2:2.7"
-inherit autotools eutils python
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit autotools eutils python-r1
DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
HOMEPAGE="http://yasm.tortall.net/"
@@ -18,18 +18,15 @@ IUSE="nls python"
RDEPEND="nls? ( virtual/libintl )"
DEPEND="nls? ( sys-devel/gettext )
- python? ( >=dev-python/cython-0.14 )"
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/cython-0.14[${PYTHON_USEDEP}]
+ )"
DOCS=( AUTHORS )
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
src_prepare() {
+ sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940
epatch "${WORKDIR}"/${P}-x32.patch #435838
chmod a+rx modules/objfmts/elf/tests/{gas,}x32/*_test.sh
epatch "${FILESDIR}/${P}-fix_cython_check.patch"
@@ -39,6 +36,8 @@ src_prepare() {
}
src_configure() {
+ use python && python_export_best
+
econf \
$(use_enable python) \
$(use_enable python python-bindings) \