5 files changed, 25 insertions, 21 deletions
diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog
index aae78dd98e98..a7b8903d9882 100644
--- a/dev-lang/yasm/ChangeLog
+++ b/dev-lang/yasm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.61 2013/05/11 18:42:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.62 2013/06/30 15:09:42 jlec Exp $
+
+  30 Jun 2013; Justin Lecher <jlec@gentoo.org> yasm-1.2.0-r1.ebuild,
+  yasm-9999.ebuild, metadata.xml:
+  Fix usage of python-r1.eclass
 
   11 May 2013; Samuli Suominen <ssuominen@gentoo.org> yasm-1.2.0-r1.ebuild,
   yasm-9999.ebuild:
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index 13da852be82b..d1cce0d11aa0 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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 1365 SHA256 c57119e62627d1f469aded02fcfce34c1e0c95fdef79b2c486feb79b5afae07a SHA512 20e104c963a8a5749f67cd7872110f11d1e921c94cec9594f82a1b4365ff1c3bfdc4d7d8fe44042d06635d8b35c87ce6d66bb57583b1f8b655ec355032ac94f3 WHIRLPOOL 784e3a6c6bc37e962182d10489d795af23b4b89a87ed80f9adcaf71c40b0bb683c666fcd5c8b181dcd642e3f2b975672596838a524517850a7d66f899b7bac54
+EBUILD yasm-1.2.0-r1.ebuild 1411 SHA256 9870eb299658562a1f8e130f8f0f77043247257c33cad6eeb993606c7c61765d SHA512 0f28f859d54a9bd82e48585dcead5cbe31dbf402bc9709149897d64d9ef057c8fcd6485b656c1e8169499a4201fc753368bd44be4ef3ade50c076c02f1f20fd1 WHIRLPOOL c871d2d4f5d041c77092900619a0f785eb75819191ffa2bfbf2ebb66135fa1a936de74c88d2c4ec932d2935cbb2d36b39de241463d0b248164147bbf572ecf42
 EBUILD yasm-1.2.0.ebuild 1171 SHA256 d881b284ddabf55d8915e0bcdf48e95c2cc43a80a20f49ad43778265c538b15e SHA512 c198a3b1d8506f8cadb14880cc265d4977b18f8884a9fafd7ce01a262e70269da8cedc981ba0582bc20631ce982e42487d4d8940dce695ebac0e6069380753f0 WHIRLPOOL b5718cb617dd4997ca4fcfa02cc047cef3884a02d2ab35eb3a00f0fbb2b785897b16a069253d7a19a86c3df067bcd9cfd45cfd93a90c5277ea60032289c6f426
-EBUILD yasm-9999.ebuild 1597 SHA256 dcd45fe18e150fc66e1aa30eb1314d0feeb83e3bd4344d40131a180ec5de4d8b SHA512 87e427d603e31347ca4848ca759af00174f84decaa9234b65c18b6815f801ffd9fa3099ab975460697ef956da59608dd0feac741f69a85c3a12f8820932386c2 WHIRLPOOL 7323f024cc37be54a623c8aea192ef096cef4aa866e541b398f3680c7f4933725fd8ab86254a29862b329e5557165f25a231fd6e523b84fcf5903a39f8200ee6
-MISC ChangeLog 7916 SHA256 527b9badc6118dca6a8e9658ac2e0db7c5d3176e72c8d0affc103ef1dc616939 SHA512 877dc3f0c8354afdc7eb5530a0fdd3d8cde7dfa865ea252c4bba67759157e1d578e791475c06e0cca42953c5ef4f9fec884689e12de07d713dfa8bade143f864 WHIRLPOOL ecfcbf69f8c86cc18ea324cc0af4b6e0bfa8ba35de436277ac8284d07df4df248e97fdb661f07a81a51ad61478a3f7304139ffd178276b22485504a18eafa54f
-MISC metadata.xml 263 SHA256 65aa9b1d10c37c41fcc4d03760cde2debbcd2027700193303184a7ee93ff0609 SHA512 a2c7955346b240c428417f11deebba06f63f4973e5f18a539e1744bcdec7326bdb272621fb4c70bb7ea763d24b175ad71d79e88f6847de77eb215ad21ca2cc11 WHIRLPOOL c21bb668c36d7460619e998fdf18dea54cd71335259b14f1f733f847f1018be963e04440483d43a625ed354ab79a6c848024657944a85bd75b65bdec91fdbd9a
+EBUILD yasm-9999.ebuild 1643 SHA256 6ea216023f555460b815a2eadea661fd68cb60b756586129133d7466b432d450 SHA512 50bdbb6907141a68743e4b6ef555962ff8c44a76999ebc8efbd2cab1b6e5d1ec9e701b51d7acb6995694bb68f991f02b548361573bd779d4a5f9198c8e0b044b WHIRLPOOL 069ede27970ff44bcd63ad5c567a317fa1159f9c24689ed7b1b47510cf6625db60c112b69a19f4c5d88e6e67877d1318b05d830a49ab80c4002e52eff43b8905
+MISC ChangeLog 8047 SHA256 cdffa9c735dcc3a08e86b25007bccd5009a93a7f97f9872137c93a57dc57fcd2 SHA512 4cc0242009b7c5c357b62bb961def789f06b3e5d258ed0ff43b17d3573b787e68082c092d19784f7c387b7a4b23172ec40bdf2e68a5949f38d5366824ca1df84 WHIRLPOOL 81c0b38b398f57ab2c1a223f0b16f9a178fd4a9af9b96443b8b8a5eebeb92ede467fc130cda4a27a043eeb9f93af97f85dbc9c7eb21afeeee1c01948026a6797
+MISC metadata.xml 270 SHA256 ef58b1c4316d37bc29175e278d9664a16eb45869f908eb692acbd6e6f97e7da2 SHA512 4213dec88a84cec39d4c8f02271b0ce690cbf5c26f50a887b733f81d0f02f229ab163d7f24dd868cb16d9ce5533d8c64c980acbb6539bb009936e924e6d8b775 WHIRLPOOL be21a72d5149eb429a30ca933bbe6f97d924f13241b6368ee793b8a930d0338bc79e2b22b8ee2e9fba2f5c844016b73f211cad0ecabe6cfa8730870c84d7ae9f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRjpGWAAoJEEdUh39IaPFNGugIAJfnnfUJqAgc2WvVhKjSsLYM
-aTJuXB6dI5vX0cBPwH8TNWQeprN9aZUt8ZZfXzPw2OMzP3KT6uoeyEwJmj28asp0
-ee9MbppkFzvY3Z5zn02lvFIf0gEWVDjwQbtqAuj+6j0CjcW37lmVgGdg/0YlUoD7
-TvLTqKiGtGCgO5pZWVRKZS3bnuKx+3/XTxMG2r/M8KwvxOWYKBVnqR/4hCcmRJoX
-ZqDncP3f8Z6GHBauAAq5N+bkEppb1frleFY0N01FYlw4dvC66ZXJ8Am2/KTjyOdM
-JEMC2fsXWH3TLCBlbABRxTO4fXlhRcZj0ZX1ZVUphU4wL872Ogq4wK3VZNWmPiI=
-=RFw5
+iEYEAREKAAYFAlHQSjcACgkQgAnW8HDreRZ2WQCeMc0hTGZgPrRXwzJJ6s/PxzHY
+PeMAniO3gvpe/dBN4sGTU3XoRk1woPgx
+=zlht
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/yasm/metadata.xml b/dev-lang/yasm/metadata.xml
index e9e6c9bb5eb0..eb72a8082544 100644
--- a/dev-lang/yasm/metadata.xml
+++ b/dev-lang/yasm/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<maintainer>
-		<email>ssuominen@gentoo.org</email>
-		<name>Samuli Suominen</name>
-	</maintainer>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-lang/yasm/yasm-1.2.0-r1.ebuild b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
index 55e0026d9dc5..18afed96e34b 100644
--- a/dev-lang/yasm/yasm-1.2.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2013/05/11 18:37:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0-r1.ebuild,v 1.3 2013/06/30 15:09:42 jlec Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="nls python"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 RDEPEND="nls? ( virtual/libintl )"
 DEPEND="nls? ( sys-devel/gettext )
 	python? (
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
index eae985967e46..83c7ab5abd8b 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2013/05/11 18:45:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-9999.ebuild,v 1.6 2013/06/30 15:09:42 jlec Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,6 +20,8 @@ LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
 SLOT="0"
 IUSE="nls python"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 RDEPEND="nls? ( virtual/libintl )"
 DEPEND="nls? ( sys-devel/gettext )
 	python? (