old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 7 insertions, 91 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/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
-}