old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 17 insertions, 105 deletions

diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog
index a0889c0d497e..c85739137d9d 100644
--- a/dev-lang/yasm/ChangeLog
+++ b/dev-lang/yasm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/yasm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.51 2011/12/23 21:01:49 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.52 2012/01/26 13:13:46 ssuominen Exp $
+
+  26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -yasm-1.1.0-r1.ebuild,
+  -files/yasm-1.1.0-cython-0.14.patch,
+  -files/yasm-1.1.0-skip_cython_check.patch:
+  old
 
   23 Dec 2011; Agostino Sarubbo <ago@gentoo.org> yasm-1.2.0.ebuild:
   Stable for X86, wrt bug #395775
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index 6bcf6f2eabb9..a167ba922660 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX yasm-1.1.0-cython-0.14.patch 719 RMD160 dc69a23a248cb5ce08ed68480f20a63c8d129aea SHA1 85386c28902e0e79ef3d545df32c2bc47901aa6b SHA256 f21989241856d16750cab7ed6608eacb69253459665b5e8914df140eb380c749
-AUX yasm-1.1.0-skip_cython_check.patch 701 RMD160 2b24da3738ef79a3741de078f7e5302d1bb6383b SHA1 23e85c86e8de7e5d833369d56611b74d50a1d30c SHA256 a0fb5760e0d090a159afac6eaf2961be10e11644fc7c7dbef809fcd95363f9f2
-DIST yasm-1.1.0.tar.gz 1409438 RMD160 93e9ee40319ca02a3a8fff7f85af216d37fb1d06 SHA1 8b252d2a50f6d0d8fe13997183596c3cd7589db9 SHA256 e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232
 DIST yasm-1.2.0.tar.gz 1436502 RMD160 6d2baf27a45d6dbe250f972f18fb6627f50394d9 SHA1 773d28f27f83c44ac35079add0d3167ca6c1def8 SHA256 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31
-EBUILD yasm-1.1.0-r1.ebuild 1212 RMD160 dc99dc3bbc91ef142183b1dfd5711ce314d8886d SHA1 1560e6a569f8fe2aa0273f14904d0d9f8065ca43 SHA256 46df857a8b2c6a212852dbb8ae2884280ad34fdf2805635f2b5216365d4e8bdd
 EBUILD yasm-1.2.0.ebuild 962 RMD160 905aa3cfe40858e12405452033e6d2d1e171d3df SHA1 9b0ec0133866d2d0318c1011be0f7481921cf712 SHA256 11f38eb1287f0a90130ee372df24d2d2da5c731d25b35a899cfad380e08fc70b
-MISC ChangeLog 6415 RMD160 9e9e3117da7d570e7605c7cd3eef62a62aa17122 SHA1 a3b32103dcb8bb587aa976c143af03e251b48a01 SHA256 2f8080f12364ac0248b6571b90a36c2609ea8386f11ef685830c05cb92a2a109
+MISC ChangeLog 6589 RMD160 e1b9a02cb9666b417d66757c2a6a39e4ab8d52b1 SHA1 4aea1054b4055b6c9eeddda5eece118631821f49 SHA256 8b4d1fd60295f8803fd6ab4137b3f0321ecb200bff179abc979284d0f24cd1b3
 MISC metadata.xml 159 RMD160 d52f9d709e07e1eca289e2940d4292c64fda6029 SHA1 021f81ae2e25595444e199cc4be3c122d37da802 SHA256 38c5ab0a3cf60ec0611d1112056b9ff16183715db2c60a2ac84590da0ce7fb76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO9OxFAAoJEOTDgjZ80txdLs4H/1hL49EYea5cQcsJfYVcRlKx
-htYw/0GdjXchngLoaCGk0G/Ulbl+wrpFoG4wKQYheUqkpEBzrbTnkagnnDh8ysZ+
-wTMLHolNYwERJgbbMKn4iyvG+TaimLBLmiRVXK/mfTofYdOk+xTyCh8gH/mcTPvj
-z9RHkJzMedCVENA0q8Y4xPixVXiCAQ903c7OgVfFdLHycenWkqpK5N1wYXj3ZrUm
-9HEPq/3u/aM9Oe/PzxdH8/w6hv/M6ewoSmJhPneFW+/XKsYP7v9cjk66hA0WtvOd
-TTceQfBhToojkgf+P5Kmnf91LQ2oSUfrb/xg3jDuSBHjTHv02e2WsTnLEYQKcq0=
-=JA3X
+iQEcBAEBAgAGBQJPIVENAAoJEEdUh39IaPFNAcQIAJkbvFFEdNEm4lpm71+0RFrC
+iz/Or7VlGNxErw4gDNb+Cuu4Kr8N9KyOwsz8mDPRRwJejB60chlPwabxOfa2GF9j
+grRHZtyku5RdFjlL8BjM0rG1fSTHfmrHk0tawqrb3/BihntcR1j6VZFdoJQIPaqe
+P660XCgLKREK5YACZQ1rUv8H2JeZI8XWb86PvWNtdiz5MFG8VVxjz/qYocoRb5DI
+IgRY4FHAg11hSTp5az8wdZE8R0rhblv3cHyAFFF+JchFcAhSo9idxRJiolVAIou9
+oOzHOM5lhA7PzMX5/xXl5sjYT/vBf42ZO5bhY38eeRGKamBqwzIGEYo75VSZapI=
+=ZS0X
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/yasm/files/yasm-1.1.0-cython-0.14.patch b/dev-lang/yasm/files/yasm-1.1.0-cython-0.14.patch
deleted file mode 100644
index 65a0585ce200..000000000000
--- a/dev-lang/yasm/files/yasm-1.1.0-cython-0.14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=348587
-
---- tools/python-yasm/yasm.pyx
-+++ tools/python-yasm/yasm.pyx
-@@ -97,7 +97,7 @@
- #
- cdef class __assoc_data_callback:
-     cdef yasm_assoc_data_callback *cb
--    def __new__(self, destroy, print_):
-+    def __cinit__(self, destroy, print_):
-         self.cb = <yasm_assoc_data_callback *>malloc(sizeof(yasm_assoc_data_callback))
-         self.cb.destroy = <void (*) (void *)>PyCObject_AsVoidPtr(destroy)
-         #self.cb.print_ = <void (*) (void *, FILE *, int)>PyCObject_AsVoidPtr(print_)
-@@ -107,7 +107,7 @@
- 
- cdef class Register:
-     cdef unsigned long reg
--    def __new__(self, reg):
-+    def __cinit__(self, reg):
-         self.reg = reg
- 
- include "errwarn.pxi"
diff --git a/dev-lang/yasm/files/yasm-1.1.0-skip_cython_check.patch b/dev-lang/yasm/files/yasm-1.1.0-skip_cython_check.patch
deleted file mode 100644
index a6538a32a81e..000000000000
--- a/dev-lang/yasm/files/yasm-1.1.0-skip_cython_check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Skip semi-broken Cython version check because it barfs on 0.13_beta0.
-
-http://www.tortall.net/projects/yasm/ticket/222
-
---- configure.ac
-+++ configure.ac
-@@ -285,11 +285,7 @@
-     AC_MSG_NOTICE([Checking to see if we can build Python bindings])
-     have_python_bindings=no
-     if test x$have_python = xyes; then
--        AC_MSG_CHECKING([for Cython >= 0.11.3])
--        CYTHON_CHECK_VERSION(0.11.3, [AC_MSG_RESULT(yes)
--                                      have_cython=yes],
--                                     [AC_MSG_RESULT(no)
--                                      have_cython=no])
-+        have_cython=yes
- 
-         AM_CHECK_PYTHON_HEADERS(have_python_headers=yes,have_python_headers=no)
- 
diff --git a/dev-lang/yasm/yasm-1.1.0-r1.ebuild b/dev-lang/yasm/yasm-1.1.0-r1.ebuild
deleted file mode 100644
index 102aabcd9a51..000000000000
--- a/dev-lang/yasm/yasm-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.1.0-r1.ebuild,v 1.5 2011/12/15 07:42:44 ulm Exp $
-
-EAPI=2
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit autotools eutils python
-
-DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
-HOMEPAGE="http://www.tortall.net/projects/yasm/"
-SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
-
-LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="nls python"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )
-	python? ( >=dev-python/cython-0.13 )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.0-skip_cython_check.patch \
-		"${FILESDIR}"/${PN}-1.1.0-cython-0.14.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable python python-bindings) \
-		--disable-dependency-tracking \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}