public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyilmbase/files/, dev-python/pyilmbase/
@ 2018-10-11 18:42 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2018-10-11 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     5536d29f8eda56741b434b92f3885434dba7282a
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Sep 30 19:49:21 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 18:42:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5536d29f

dev-python/pyilmbase: bump to version 2.3.0

Remove multilib inherit, python isn't multilib aware
Improve ebuild functions

Closes: https://bugs.gentoo.org/639998
Suggested-by: Jonathan Scruggs <dracwyrm <AT> gentoo.org>
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pyilmbase/Manifest                      |  1 +
 .../files/pyilmbase-2.3.0-fix-build-system.patch   | 48 ++++++++++++++++++
 .../files/pyilmbase-2.3.0-link-pyimath.patch       | 13 +++++
 dev-python/pyilmbase/pyilmbase-2.3.0.ebuild        | 59 ++++++++++++++++++++++
 4 files changed, 121 insertions(+)

diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index d7a8cdc14e0..55654e87ea4 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1 +1,2 @@
 DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
+DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
new file mode 100644
index 00000000000..bd35f87a0e0
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
@@ -0,0 +1,48 @@
+diff --git a/configure.ac b/configure.ac
+index 5cbf273..9e80b48 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,8 +4,7 @@ AC_SUBST(PYILMBASE_VERSION, 2.3.0)
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(PyIex/iexmodule.cpp)
+ AC_CONFIG_HEADER(config/PyIlmBaseConfig.h)
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ dnl static python modules make no sense - disable static
+ AC_DISABLE_STATIC
+ 
+@@ -20,7 +19,7 @@ dnl Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -164,22 +163,13 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+ 
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ dnl Platform-specific stuff
+ case "$host" in
+ *linux*)
+-  AC_DEFINE(HAVE_LINUX_PROCFS)
++  AC_DEFINE([HAVE_LINUX_PROCFS], [1], [define on linux])
+   ;;
+ *darwin*) 
+-  AC_DEFINE(HAVE_DARWIN) 
++  AC_DEFINE([HAVE_DARWIN], [1], [define on OSX]) 
+   ;;
+ esac
+ 

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
new file mode 100644
index 00000000000..878c270a885
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
@@ -0,0 +1,13 @@
+diff --git a/PyImath/Makefile.am b/PyImath/Makefile.am
+index bf87542..ad69515 100644
+--- a/PyImath/Makefile.am
++++ b/PyImath/Makefile.am
+@@ -82,7 +82,7 @@ imathmodule_la_SOURCES = imathmodule.cpp \
+     PyImathBasicTypes.cpp 
+ 
+ imathmodule_la_LDFLAGS = -avoid-version -module
+-imathmodule_la_LIBADD  = -lPyImath @BOOST_PYTHON_LIBS@
++imathmodule_la_LIBADD  = libPyImath.la @BOOST_PYTHON_LIBS@
+ 
+ noinst_HEADERS = PyImathFun.h \
+     PyImathBasicTypes.h 

diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
new file mode 100644
index 00000000000..fda4c62db80
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="ilmbase Python bindings"
+HOMEPAGE="http://www.openexr.com"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+numpy"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEP}
+	>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
+	~media-libs/ilmbase-${PV}:=
+	numpy? ( >=dev-python/numpy-1.10.4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEP}
+	>=virtual/pkgconfig-0-r1"
+
+PATCHES=(
+	"${FILESDIR}/${P}-link-pyimath.patch"
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
+		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
+		--with-boost-python-libname="boost_python-${EPYTHON:6}"
+		$(use_with numpy)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# Fails to install with multiple jobs
+	emake DESTDIR="${D}" -j1 install
+
+	einstalldocs
+
+	# package provides pkg-config files
+	find "${D}" -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyilmbase/files/, dev-python/pyilmbase/
@ 2019-06-30 18:15 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-06-30 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     78bcc41d75501923717b0e77b1a0b5b4ed0d7c02
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 15:45:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 18:14:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bcc41d

dev-python/pyilmbase: Drop 2.2.0

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/pyilmbase/Manifest                      |  1 -
 .../pyilmbase-2.2.0-configure-boost_python.patch   | 22 ---------
 dev-python/pyilmbase/pyilmbase-2.2.0.ebuild        | 53 ----------------------
 3 files changed, 76 deletions(-)

diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 55654e87ea4..e99c4ca8492 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,2 +1 @@
-DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch b/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch
deleted file mode 100644
index 897bc02baf9..00000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a4d6027..edfb49f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ LIBS="$LIBS -lpython$PYTHON_VERSION"
- BOOST_PYTHON_CXXFLAGS="" 
- BOOST_PYTHON_LDFLAGS="" 
- BOOST_PYTHON_LIBS="" 
--BOOST_PYTHON_LIBNAME="boost_python"
-+BOOST_PYTHON_LIBNAME="boost_python-$PYTHON_VERSION"
- 
- AC_ARG_WITH(
-    [boost-include-dir],
-@@ -90,7 +90,7 @@ AC_ARG_WITH(
- 
- AC_ARG_WITH(
-    [boost-python-libname],
--   [AS_HELP_STRING([--with-boost-python-libname],["boost::python library name (default: boost_python)"])],
-+   [AS_HELP_STRING([--with-boost-python-libname],["boost::python library name (default: boost_python-$PYTHON_VERSION)"])],
-    [BOOST_PYTHON_LIBNAME="$withval"])
- 
- CXXFLAGS="$CXXFLAGS $BOOST_PYTHON_CXXFLAGS -I$PYTHON_INC_DIR"

diff --git a/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild
deleted file mode 100644
index bf77c879e00..00000000000
--- a/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools python-single-r1 multilib-minimal
-
-DESCRIPTION="ilmbase Python bindings"
-HOMEPAGE="http://www.openexr.com"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+numpy"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEP}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-RDEPEND="
-	${PYTHON_DEP}
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
-	>=dev-libs/boost-1.62.0-r1[${MULTILIB_USEDEP},python(+),${PYTHON_USEDEP}]
-	numpy? ( >=dev-python/numpy-1.10.4 )"
-
-AT_M4DIR=m4
-PATCHES=(
-	"${FILESDIR}/${P}-configure-boost_python.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf "$(use_with numpy numpy)"
-}
-
-# fails to install successfully if MAKEOPTS is set to use more than one core.
-multilib_src_install() {
-	EMAKE_SOURCE=${S} emake DESTDIR="${D}" -j1 install
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyilmbase/files/, dev-python/pyilmbase/
@ 2020-09-19  8:50 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-09-19  8:50 UTC (permalink / raw
  To: gentoo-commits

commit:     2763da1a120c04d4ea47ba547a11b932b6df0c98
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 08:33:24 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 08:50:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2763da1a

dev-python/pyilmbase: Remove old (drop to ~x86)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pyilmbase/Manifest                      |  1 -
 .../files/pyilmbase-2.3.0-fix-build-system.patch   | 48 --------------
 .../files/pyilmbase-2.3.0-link-pyimath.patch       | 13 ----
 dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild     | 73 ----------------------
 4 files changed, 135 deletions(-)

diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 7d556826e89..fd35c16a42c 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,2 +1 @@
-DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
 DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
deleted file mode 100644
index bd35f87a0e0..00000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5cbf273..9e80b48 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,8 +4,7 @@ AC_SUBST(PYILMBASE_VERSION, 2.3.0)
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(PyIex/iexmodule.cpp)
- AC_CONFIG_HEADER(config/PyIlmBaseConfig.h)
--AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE
- dnl static python modules make no sense - disable static
- AC_DISABLE_STATIC
- 
-@@ -20,7 +19,7 @@ dnl Checks for programs.
- AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- 
- dnl
-@@ -164,22 +163,13 @@ AC_C_CONST
- AC_C_INLINE
- AC_TYPE_SIZE_T
- 
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
--
- dnl Platform-specific stuff
- case "$host" in
- *linux*)
--  AC_DEFINE(HAVE_LINUX_PROCFS)
-+  AC_DEFINE([HAVE_LINUX_PROCFS], [1], [define on linux])
-   ;;
- *darwin*) 
--  AC_DEFINE(HAVE_DARWIN) 
-+  AC_DEFINE([HAVE_DARWIN], [1], [define on OSX]) 
-   ;;
- esac
- 

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
deleted file mode 100644
index 878c270a885..00000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/PyImath/Makefile.am b/PyImath/Makefile.am
-index bf87542..ad69515 100644
---- a/PyImath/Makefile.am
-+++ b/PyImath/Makefile.am
-@@ -82,7 +82,7 @@ imathmodule_la_SOURCES = imathmodule.cpp \
-     PyImathBasicTypes.cpp 
- 
- imathmodule_la_LDFLAGS = -avoid-version -module
--imathmodule_la_LIBADD  = -lPyImath @BOOST_PYTHON_LIBS@
-+imathmodule_la_LIBADD  = libPyImath.la @BOOST_PYTHON_LIBS@
- 
- noinst_HEADERS = PyImathFun.h \
-     PyImathBasicTypes.h 

diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
deleted file mode 100644
index c3f5e7b949a..00000000000
--- a/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+numpy"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~media-libs/ilmbase-${PV}:=
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_MULTI_USEDEP}]
-		numpy? (
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				>=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-	')"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1"
-
-PATCHES=(
-	"${FILESDIR}/${P}-link-pyimath.patch"
-	"${FILESDIR}/${P}-fix-build-system.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local boostpython_ver="${EPYTHON:6}"
-	if has_version ">=dev-libs/boost-1.70.0"; then
-		boostpython_ver="${boostpython_ver/./}"
-	else
-		boostpython_ver="-${boostpython_ver}"
-	fi
-
-	local myeconfargs=(
-		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
-		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
-		--with-boost-python-libname="boost_python${boostpython_ver}"
-		$(use_with numpy)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	# Fails to install with multiple jobs
-	emake DESTDIR="${D}" -j1 install
-
-	einstalldocs
-
-	# package provides pkg-config files
-	find "${D}" -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyilmbase/files/, dev-python/pyilmbase/
@ 2021-06-22 18:35 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-06-22 18:35 UTC (permalink / raw
  To: gentoo-commits

commit:     99956560ab25b69d46b124327808015da988e7a2
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Jun 22 10:57:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 22 18:35:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99956560

dev-python/pyilmbase: bump to 2.5.7

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21373
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/pyilmbase/Manifest                      |  1 +
 ...yilmbase-2.5.7-0001-disable-py2-for-boost.patch | 25 ++++++++++
 ...yilmbase-2.5.7-0002-install-imathnumpy.so.patch | 22 +++++++++
 .../pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch  | 30 ++++++++++++
 dev-python/pyilmbase/pyilmbase-2.5.7.ebuild        | 55 ++++++++++++++++++++++
 5 files changed, 133 insertions(+)

diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 9ddce510273..7aa142d0f3a 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,2 +1,3 @@
 DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
+DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
new file mode 100644
index 00000000000..73281e5ad6d
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
@@ -0,0 +1,25 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 22 Jun 2021 11:08:15 +0200
+Subject: [PATCH] disable py2 for boost
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 291b96e..68b280d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,8 +142,6 @@ endif()
+ 
+ find_package(Boost OPTIONAL_COMPONENTS
+   python
+-  python2
+-  ${PYILMBASE_BOOST_PY2_COMPONENT}
+   python3
+   ${PYILMBASE_BOOST_PY3_COMPONENT})
+ set(_pyilmbase_have_perver_boost)
+-- 
+2.32.0
+

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
new file mode 100644
index 00000000000..1aa4152dbbe
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
@@ -0,0 +1,22 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 22 Jun 2021 11:46:30 +0200
+Subject: [PATCH 1/2] install imathnumpy.so
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ PyImathNumpy/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/PyImathNumpy/CMakeLists.txt b/PyImathNumpy/CMakeLists.txt
+index 7a70f06..2822127 100644
+--- a/PyImathNumpy/CMakeLists.txt
++++ b/PyImathNumpy/CMakeLists.txt
+@@ -49,4 +49,5 @@ if(TARGET Python3::Python AND
+     LIBRARY_OUTPUT_NAME "imathnumpy"
+     DEBUG_POSTFIX ""
+   )
++  install(TARGETS imathnumpy_python3 DESTINATION ${PyIlmBase_Python3_SITEARCH_REL})
+ endif()
+-- 
+2.32.0
+

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
new file mode 100644
index 00000000000..a28757cbf1d
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
@@ -0,0 +1,30 @@
+From 7469db402e2affb094585c374518765c69af703d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 22 Jun 2021 11:47:01 +0200
+Subject: [PATCH 2/2] fix pkgconfig file
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index a4139bc..45dcca4 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
+   # use a helper function to avoid variable pollution, but pretty simple
+   function(pyilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+-    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(exec_prefix "\${prefix}")
++    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
++    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
+     string(REPLACE ".in" "" pcout ${pcinfile})
+-- 
+2.32.0
+

diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
new file mode 100644
index 00000000000..53ab50f1275
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/openexr-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch
+	"${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch
+	"${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		# starting with boost-1.76.0 we ship the cmake config files
+		-DBoost_NO_BOOST_CMAKE=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyilmbase/files/, dev-python/pyilmbase/
@ 2021-07-10 12:37 John Helmert III
  0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2021-07-10 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     6bbc7789fdf2baf5d90726d7cc52c863aed41db8
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Jul 10 09:27:13 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 12:37:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbc7789

dev-python/pyilmbase: drop 2.5.5

Security cleanup #776808

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21582
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 dev-python/pyilmbase/Manifest                      |  1 -
 ...ig-file-for-PyIlmBase-to-include-prefixes.patch | 30 -----------
 dev-python/pyilmbase/pyilmbase-2.5.5.ebuild        | 62 ----------------------
 3 files changed, 93 deletions(-)

diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 7aa142d0f3a..4fa2593b00d 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,3 +1,2 @@
-DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40

diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
deleted file mode 100644
index 6e8eb30cc47..00000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 34b8fd05781b61ce06263cdd22866a8bfc4be5b5 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 3 Jul 2020 22:01:18 +0200
-Subject: [PATCH] Fix pkgconfig file for PyIlmBase to include prefixes
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- config/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index 1872c89..44a9f2f 100644
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
-   # use a helper function to avoid variable pollution, but pretty simple
-   function(pyilmbase_pkg_config_help pcinfile)
-     set(prefix ${CMAKE_INSTALL_PREFIX})
--    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
--    set(libdir ${CMAKE_INSTALL_LIBDIR})
--    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
-+    set(exec_prefix "\${prefix}")
-+    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-+    set(includedir "\${exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
-     string(REPLACE ".in" "" pcout ${pcinfile})
-     configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY)
--- 
-2.27.0
-

diff --git a/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
deleted file mode 100644
index d254903b155..00000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~x86"
-IUSE="exceptions +numpy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~media-libs/ilmbase-${PV}:=
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
-		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-admin/chrpath
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
-		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
-		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use numpy; then
-		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
-		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-07-10 12:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-11 18:42 [gentoo-commits] repo/gentoo:master commit in: dev-python/pyilmbase/files/, dev-python/pyilmbase/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2019-06-30 18:15 Andreas Sturmlechner
2020-09-19  8:50 Michał Górny
2021-06-22 18:35 Sam James
2021-07-10 12:37 John Helmert III

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox