4 files changed, 46 insertions, 45 deletions
diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog
index 3089693b0fed..1d0ea29fe8d6 100644
--- a/dev-lang/yasm/ChangeLog
+++ b/dev-lang/yasm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/yasm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.59 2013/01/15 17:31:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.60 2013/05/11 18:37:07 ssuominen Exp $
+
+  11 May 2013; Samuli Suominen <ssuominen@gentoo.org> yasm-1.2.0-r1.ebuild,
+  yasm-9999.ebuild:
+  Disable automagic app-text/xmlto usage to prevent manpages from getting
+  rebuilt unnecessarily wrt #459940 by Anton Kochkov
+  Use python-r1.eclass instead of the obsolete python.eclass
 
 *yasm-1.2.0-r1 (15 Jan 2013)
 
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index 7c42af29773b..b4a1990c5660 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -4,25 +4,19 @@ Hash: SHA256
 AUX yasm-1.2.0-fix_cython_check.patch 790 SHA256 1d44a5ea34426c84556e93d3f5774912ca8530c582ad6f1bf738850b515d977c SHA512 5055949c13c5b4e24863f302f379831fcb26edbcfef48b3f3ee4fe742a95c0db85487a82d72a7e9fc96ad4c9fbeee0423d79032269900aeaf380cc9848ccb07b WHIRLPOOL 8810880f15c5c44cbf457ede3e0d19ef64ba68ae2cb3f595b04be1614b39f36d7803c617d29e3a2fe7248ac76285056f1ea4f1870a28b75c1da8c851827b9e22
 DIST yasm-1.2.0-x32.patch.xz 9656 SHA256 d5a623243b1b2a73b4b25d9395a5be1483adca38cec8f50a7f1e4e9107cd9d83 SHA512 93961d0690c0018a3645bc3d610b1f12172f5311609716fec0efcf8af5d70578a1fc74ab42fcc75f2b75ed8837fa03cbc66ddd6386baeb56a519e7639ff64874 WHIRLPOOL 410c940995fc31b2e12f9eec67b6873f1f4629fcdf8a58c2165ab3d9721f21e295901e8917cfd613b30ea319594aeaff21d38ec4e9bd2b693e6e3230e9d637d9
 DIST yasm-1.2.0.tar.gz 1436502 SHA256 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 SHA512 e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bffc9725d9f9742ae5f3a0bb23ee5b2a61153332fb3e286b77 WHIRLPOOL 2a1fd73beeea8128c67e0172684e3dac9d0c16b9e35e905a5e313948d685da9ace15a2b18001c02c0aff9113fec9059af5984aeacf8e4ae5e8bbe91dd00d9d9e
-EBUILD yasm-1.2.0-r1.ebuild 1313 SHA256 cb373c7e0763735170a33c81da9557f555c948321c07478185a6789f1559bcb6 SHA512 78fd2ece5e6cfd71f9d1f496be8a0ee0385570792cfc9c04e276fe047fc4c1c893b469579ac089d8b1432ab7bca6ac605a74e34dbd590934dbfd174b2db75f3c WHIRLPOOL 184043a583309f6f962e660b42c49bbfc41711e55faaf74657cd774c7a2c6a407cdb218f1b19466bf4c1ebb41a7b85a967dd08785bca256f7d58063a97b21437
+EBUILD yasm-1.2.0-r1.ebuild 1365 SHA256 c57119e62627d1f469aded02fcfce34c1e0c95fdef79b2c486feb79b5afae07a SHA512 20e104c963a8a5749f67cd7872110f11d1e921c94cec9594f82a1b4365ff1c3bfdc4d7d8fe44042d06635d8b35c87ce6d66bb57583b1f8b655ec355032ac94f3 WHIRLPOOL 784e3a6c6bc37e962182d10489d795af23b4b89a87ed80f9adcaf71c40b0bb683c666fcd5c8b181dcd642e3f2b975672596838a524517850a7d66f899b7bac54
 EBUILD yasm-1.2.0.ebuild 1171 SHA256 d881b284ddabf55d8915e0bcdf48e95c2cc43a80a20f49ad43778265c538b15e SHA512 c198a3b1d8506f8cadb14880cc265d4977b18f8884a9fafd7ce01a262e70269da8cedc981ba0582bc20631ce982e42487d4d8940dce695ebac0e6069380753f0 WHIRLPOOL b5718cb617dd4997ca4fcfa02cc047cef3884a02d2ab35eb3a00f0fbb2b785897b16a069253d7a19a86c3df067bcd9cfd45cfd93a90c5277ea60032289c6f426
-EBUILD yasm-9999.ebuild 1464 SHA256 359da6c0965c06c95af6f8dad3b9708056b1bed91f5b1313d80fc82db7de9bf8 SHA512 f08e0d86cc320ec38288af54a10e6d1bd55a3d0487ab96e0fce4770df7b239152ae535179784ccfba41cba3df91e7f3fed4fdfddb3cbd5caa6d40bfc7c4e099e WHIRLPOOL d69e5f535580dcfeabb0f8b3a733cb17920c5ff583c34b35a3466803f93cca4300bf832b9fab6f883200abac41a33b0f7481d68393fcac8cf94d68bdb542c7a6
-MISC ChangeLog 7554 SHA256 3060b43b195ed5ec88cc14031eed2b0d1b4c1973abc50e6fd99e006b711f36b9 SHA512 26a378168d4c1e150098d5d6ce40a1803a887cf26ad8261744275a818c482cc12c59293c7b95c5194ad2c74daba9fdc489834d30b23aa3ce490f412a604d09ee WHIRLPOOL 540fabffd9d8201984326ea95352524450f48ed38d3afc39781d3fd46611ea83ee5a204197f73fa8c545b1059945f2f7632016ff8f5793453e527fee9a1242df
+EBUILD yasm-9999.ebuild 1490 SHA256 859293735998c001fa386d809561ad3ba5d98d84ad1a9f64addd51d3f227f411 SHA512 6e0531bf96fdedc6aa27e63d6fbb2a1b01be4ee5fe57a532812c5e4f28e9784e24fc7ac98407e2bdd75b6d545bb3cac7010c185e068423420a9cf4799763bdad WHIRLPOOL 24317605b03526e586394a470c91f74888854174d5befc46372792a48d62577bff401f033cf33b0e70a046ad6fbb25c7c1524fca5cfdf45af9fae3ac44cb9bfb
+MISC ChangeLog 7842 SHA256 c8dd5ce9474571ca089b1914050e948d8e2dd1b15187a38d0767eab2889128f1 SHA512 c9faecf54091ec81e07741ead7e5e3e5bcf5276a0b1f156daca160e2c9a62f87e1e7bbd711ce2fd0507dd29d69836ee37fc0e1c6744441779a9d85417170eb7f WHIRLPOOL 15b78bc15685d837f77721dcc4aae0da7043d072369424c67016b50a2c2df1fb446543d61a6b94331f0127ae7fc684dd0541226a4d6d91622caffbf335fd5a66
 MISC metadata.xml 263 SHA256 65aa9b1d10c37c41fcc4d03760cde2debbcd2027700193303184a7ee93ff0609 SHA512 a2c7955346b240c428417f11deebba06f63f4973e5f18a539e1744bcdec7326bdb272621fb4c70bb7ea763d24b175ad71d79e88f6847de77eb215ad21ca2cc11 WHIRLPOOL c21bb668c36d7460619e998fdf18dea54cd71335259b14f1f733f847f1018be963e04440483d43a625ed354ab79a6c848024657944a85bd75b65bdec91fdbd9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9ZNQAAoJELEHsLL7fEFWR2IP/iSTe7bNsCMHp8u2DlsQxXNl
-unnJ2bg4MzLpR5zGNeUW5u8Nt7CCZZcjTxFaun57fqr8mAzvbzMTK8fVlXfFjoRJ
-tsz/NnKDw8MnwJVU1m/8CFOOfXCc1teXNE0v4T9rI599BcqXbgrYZIkgjjUdUXCI
-liK6JsGJVtcBTmGBRMa3zNvhV+JzFr8azCpnIm9ynEhTmjwYKJCdi0boDs9qaY5z
-9KA7JfGx4Qjy4eN7oyJJY3loA5nzXYzFNO0uVPSd5IqPEK2lxFzgAawdu8dAcBcN
-HqsBko/kjgySRhTw0SLPZB2jgv0lkPmzstU3JxhhQhOgwu5V0yneyjPX+d46QKwQ
-Klxlcqxl5aG+mXlWcsXOPVV0jMs9Xwpn4BJxMxsImcPhLPXEVeNKRgXis+ama4Z4
-0kAHQAPSjQ/DlqylheY0VnP4LTad+UwWcyDNUd7B2vR4EI7LJcVRevWdjZhd2m96
-0PGg165A9e+LybrwXK0RJzoCO0avhjnN0A6rMHFRK7gbCM6pH/RJ5dZXKrlO4q5O
-XOHrjt8GlMFcWx9JuFGq2ce0mFC7idRmr3vTEmEWKKmnJ+oJ+T9HsLf9OIhB8q7a
-veuUPRD5sv1O8Q8gXy3mstDqrhmf9ggKi1dhPXSpxgMnYDh4NPPXYEQg5+9eH/rI
-CX5aKG+AHHiCPN2G7jWi
-=svaY
+iQEcBAEBCAAGBQJRjo+mAAoJEEdUh39IaPFN8XcH/0DDl+KFLqfztjXekqF86aQm
+7TdjFcShHq1vQqHgdUqhnbcFZrxgavT5GnrskVeATN9ptm1fm3i5FjTmnDNLBHmF
+apf1eAHdrpUmV1bQ9A3mG5fe160eID/Y+sqAstIKlEEF7qEZnupBgFraH3IPjrya
+Mc1UnyJ1jDJLGgDI5mR/1W434wGzfLN9Ys2ig4XGW4PnS3zY1yTv+Zqjtf6p1hRn
+TBOyTtUvqJ5Yp0HmlFO7AAtVNivWsmTckuhcBwYP2VSfI86QvJEMEh+PIegKsXH2
+ag3bNljT1omsJiN/JWPWcMod9AZswME8MansrUTdh4NLa2+cg//E4w2skT2ttkc=
+=NAiU
 -----END PGP SIGNATURE-----
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) \
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
index 7e9a65c97505..76c5b4d6cb40 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.ebuild
@@ -1,11 +1,11 @@
 # 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-9999.ebuild,v 1.2 2013/01/15 02:41:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-9999.ebuild,v 1.3 2013/05/11 18:37:07 ssuominen Exp $
 
-EAPI=4
-PYTHON_DEPEND="python? 2:2.7"
-inherit autotools eutils python
-if [[ ${PV} == "9999"* ]] ; then
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit autotools eutils python-r1
+if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://github.com/yasm/yasm.git"
 	inherit git-2
 else
@@ -22,30 +22,32 @@ 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}]
+		)"
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} ${PYTHON_DEPS} app-text/xmlto"
+fi
 
 DOCS=( AUTHORS )
 
-pkg_setup() {
-	# Python is required for generating x86insns.c, see
-	# modules/arch/x86/Makefile.inc for more details.
-	if use python || [[ ${PV} == "9999" ]] ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
 src_prepare() {
+	if ! [[ ${PV} == 9999* ]]; then
+		sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940
+	fi
 	# ksh doesn't grok $(xxx), makes aclocal fail
 	sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die
 	eautoreconf
 
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == 9999* ]] ; then
 		./modules/arch/x86/gen_x86_insn.py || die
 	fi
 }
 
 src_configure() {
+	python_export_best
+
 	econf \
 		--disable-warnerror \
 		$(use_enable python) \