[gentoo-commits] gentoo-x86 commit in dev-python/pyopencl: pyopencl-9999.ebuild pyopencl-2011.2-r1.ebuild pyopencl-2011.2.ebuild ChangeLog pyopencl-0.92.ebuild

[Mike Gilbert (floppym)]

floppym     12/01/28 19:51:45

  Modified:             pyopencl-9999.ebuild pyopencl-2011.2.ebuild
                        ChangeLog
  Added:                pyopencl-2011.2-r1.ebuild
  Removed:              pyopencl-0.92.ebuild
  Log:
  Prepare for PYTHON_ABI-versioned Boost Python libraries in Boost 1.48. Delete old version. Patch by Arfrever.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  dev-python/pyopencl/pyopencl-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-9999.ebuild?r1=1.7&r2=1.8

Index: pyopencl-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyopencl-9999.ebuild	21 Dec 2011 18:35:11 -0000	1.7
+++ pyopencl-9999.ebuild	28 Jan 2012 19:51:45 -0000	1.8
@@ -1,18 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-9999.ebuild,v 1.7 2011/12/21 18:35:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-9999.ebuild,v 1.8 2012/01/28 19:51:45 floppym Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 
 inherit distutils git-2
 
 EGIT_REPO_URI="http://git.tiker.net/trees/pyopencl.git"
 
 DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="http://mathema.tician.de/software/pyopencl"
+HOMEPAGE="http://mathema.tician.de/software/pyopencl http://pypi.python.org/pypi/pyopencl"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -20,29 +20,40 @@
 KEYWORDS=""
 IUSE="examples opengl"
 
-RDEPEND=">=dev-python/numpy-1.0.4
+RDEPEND=">=dev-libs/boost-1.48[python]
+	dev-python/numpy
 	=dev-python/pytools-9999
 	virtual/opencl"
-DEPEND="${RDEPEND}
-	dev-libs/boost[python]"
+DEPEND="${RDEPEND}"
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
 
 src_configure()
 {
-	if use opengl; then
-		myconf="${myconf} --cl-enable-gl"
-	fi
+	configuration() {
+		local myconf=()
 
-	"$(PYTHON -f)" ./configure.py --boost-python-libname=boost_python-mt \
-		--boost-thread-libname=boost_thread-mt --boost-compiler=gcc \
-		${myconf}
+		if use opengl; then
+			myconf+=(--cl-enable-gl)
+		fi
+
+		"$(PYTHON)" configure.py \
+			--boost-compiler=gcc \
+			--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
+			--boost-thread-libname=boost_thread-mt \
+			--no-use-shipped-boost \
+			"${myconf[@]}"
+	}
+	python_execute_function -s configuration
 }
 
 src_install()
 {
 	distutils_src_install
-	insinto /usr/share/doc/${PF}
+
 	if use examples; then
-		doins -r examples || die
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
 }
 



1.2                  dev-python/pyopencl/pyopencl-2011.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2.ebuild?r1=1.1&r2=1.2

Index: pyopencl-2011.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyopencl-2011.2.ebuild	8 Jan 2012 22:20:24 -0000	1.1
+++ pyopencl-2011.2.ebuild	28 Jan 2012 19:51:45 -0000	1.2
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2.ebuild,v 1.1 2012/01/08 22:20:24 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2.ebuild,v 1.2 2012/01/28 19:51:45 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 
 inherit distutils
 
@@ -18,12 +18,11 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="examples opengl"
 
-RDEPEND="dev-libs/boost[python]
+RDEPEND="<dev-libs/boost-1.48[python]
 	>=dev-python/numpy-1.0.4
 	dev-python/pytools
 	virtual/opencl"
-DEPEND="${RDEPEND}
-	dev-libs/boost[python]"
+DEPEND="${RDEPEND}"
 
 src_configure()
 {



1.11                 dev-python/pyopencl/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyopencl/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	8 Jan 2012 22:20:24 -0000	1.10
+++ ChangeLog	28 Jan 2012 19:51:45 -0000	1.11
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyopencl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/ChangeLog,v 1.10 2012/01/08 22:20:24 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/ChangeLog,v 1.11 2012/01/28 19:51:45 floppym Exp $
+
+*pyopencl-2011.2-r1 (28 Jan 2012)
+
+  28 Jan 2012; Mike Gilbert <floppym@g.o> +pyopencl-2011.2-r1.ebuild,
+  -pyopencl-0.92.ebuild, pyopencl-2011.2.ebuild, pyopencl-9999.ebuild:
+  Prepare for PYTHON_ABI-versioned Boost Python libraries in Boost 1.48. Delete
+  old version. Patch by Arfrever.
 
 *pyopencl-2011.2 (08 Jan 2012)
 



1.1                  dev-python/pyopencl/pyopencl-2011.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: pyopencl-2011.2-r1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2011.2-r1.ebuild,v 1.1 2012/01/28 19:51:45 floppym Exp $

EAPI="4"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"

inherit distutils

DESCRIPTION="Python wrapper for OpenCL"
HOMEPAGE="http://mathema.tician.de/software/pyopencl http://pypi.python.org/pypi/pyopencl"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples opengl"

RDEPEND=">=dev-libs/boost-1.48[python]
	dev-python/numpy
	dev-python/pytools
	virtual/opencl"
DEPEND="${RDEPEND}"

DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"

src_configure()
{
	configuration() {
		local myconf=()

		if use opengl; then
			myconf+=(--cl-enable-gl)
		fi

		"$(PYTHON)" configure.py \
			--boost-compiler=gcc \
			--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
			--boost-thread-libname=boost_thread-mt \
			--no-use-shipped-boost \
			"${myconf[@]}"
	}
	python_execute_function -s configuration
}

src_install()
{
	distutils_src_install

	if use examples; then
		insinto /usr/share/doc/${PF}
		doins -r examples
	fi
}

pkg_postinst()
{
	distutils_pkg_postinst
	if use examples; then
		elog "Some of the examples provided by this package require dev-python/matplotlib."
	fi
}