public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2017-03-11 13:31 Agostino Sarubbo
  0 siblings, 0 replies; 9+ messages in thread
From: Agostino Sarubbo @ 2017-03-11 13:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f800c296bd3238a7c2f18903e4f6d1b297850e19
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 13:30:57 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 13:30:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f800c296

dev-python/cgkit: amd64 stable wrt bug #612264

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-python/cgkit/cgkit-2.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
index 0ce53541ecb..5ec8645e7a9 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="3ds"
 
 RDEPEND="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2017-03-11 13:42 Agostino Sarubbo
  0 siblings, 0 replies; 9+ messages in thread
From: Agostino Sarubbo @ 2017-03-11 13:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0a35d97bc3620c0c6f136cf3f29ed1f00c1e8774
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 13:42:04 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 13:42:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a35d97b

dev-python/cgkit: x86 stable wrt bug #612264

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-python/cgkit/cgkit-2.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
index 5ec8645e7a9..99cbeb9a4ca 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="3ds"
 
 RDEPEND="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2017-03-22  7:43 Michael Weber
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2017-03-22  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     58ded55ad5296db47dbd9a61c9078ede700dc54f
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 07:42:39 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 07:42:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ded55a

dev-python/cgkit: ppc stable (bug 612264).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-python/cgkit/cgkit-2.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
index 99cbeb9a4ca..346af45d30a 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="3ds"
 
 RDEPEND="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2017-05-02  9:48 Michał Górny
  0 siblings, 0 replies; 9+ messages in thread
From: Michał Górny @ 2017-05-02  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     bd20a709281ca3a755b4d98e2f0916f1ea5cd37d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 09:07:24 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May  2 09:48:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd20a709

dev-python/cgkit: Clean old versions up

 dev-python/cgkit/cgkit-2.0.0.ebuild | 86 -------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0.ebuild b/dev-python/cgkit/cgkit-2.0.0.ebuild
deleted file mode 100644
index 82a2af82ab7..00000000000
--- a/dev-python/cgkit/cgkit-2.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 eutils scons-utils toolchain-funcs
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Python library for creating 3D images"
-HOMEPAGE="http://cgkit.sourceforge.net"
-SRC_URI="$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py2k.tar.gz 'python2*')
-	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py3k.tar.gz 'python3*')"
-
-LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="3ds"
-
-RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pyprotocols[${PYTHON_USEDEP}]' 'python2*')
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	3ds? ( ~media-libs/lib3ds-1.3.0 )"
-DEPEND="${RDEPEND}
-	dev-util/scons"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-cgkit_unpack() {
-	local tarball
-	if [[ ${EPYTHON} == python3* ]]; then
-		tarball=${P}-py3k.tar.gz
-	else
-		tarball=${P}-py2k.tar.gz
-	fi
-	mkdir "${BUILD_DIR}" || die
-	tar -C "${BUILD_DIR}" -x --strip-components 1 -f "${DISTDIR}/${tarball}" || die
-}
-
-src_unpack() {
-	python_foreach_impl cgkit_unpack
-	mkdir "${S}" || die
-}
-
-python_prepare_all() {
-	return 0
-}
-
-python_prepare() {
-	if [[ ${EPYTHON} == python3* ]]; then
-		epatch "${FILESDIR}/${PN}-py3k-pillow.patch"
-	else
-		epatch "${FILESDIR}/${PN}-py2k-pillow.patch"
-	fi
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	sed -e "s/fPIC/fPIC\",\"${CFLAGS// /\",\"}/" -i supportlib/SConstruct
-	cp config_template.cfg config.cfg
-	echo "BOOST_LIB = 'boost_python-${EPYTHON#python}'" >> config.cfg
-	echo "LIBS += ['GL', 'GLU', 'glut']" >> config.cfg
-	if use 3ds; then
-		echo "LIB3DS_AVAILABLE = True" >> config.cfg
-	fi
-
-	sed -e "s:INC_DIRS = \[\]:INC_DIRS = \['/usr/include'\]:" -i setup.py
-
-	# Remove invalid test
-	rm -f unittests/test_pointcloud.py || die
-}
-
-python_compile() {
-	pushd supportlib > /dev/null || die
-	escons
-	popd > /dev/null || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd unittests > /dev/null || die
-	mkdir tmp || die
-	"${PYTHON}" all.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2018-06-27 20:52 Pacho Ramos
  0 siblings, 0 replies; 9+ messages in thread
From: Pacho Ramos @ 2018-06-27 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a0dbf23a052cf7fad641d19193f0b533f4e4bc9f
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 20:50:57 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 20:52:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0dbf23a

dev-python/cgkit: amd64 stable, bug #658884

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-python/cgkit/cgkit-2.0.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
index b5d7cbee09c..266537ff2c9 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="3ds"
 
 RDEPEND="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2018-06-27 20:52 Pacho Ramos
  0 siblings, 0 replies; 9+ messages in thread
From: Pacho Ramos @ 2018-06-27 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     739bf1df4ed8f2aa2c3debfa49fe3214b66c1681
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 20:50:33 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 20:52:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739bf1df

dev-python/cgkit: Support python3.6

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-python/cgkit/cgkit-2.0.0-r2.ebuild | 85 ++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
new file mode 100644
index 00000000000..b5d7cbee09c
--- /dev/null
+++ b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1 scons-utils toolchain-funcs
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Python library for creating 3D images"
+HOMEPAGE="http://cgkit.sourceforge.net"
+SRC_URI="
+	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py2k.tar.gz 'python2*')
+	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py3k.tar.gz 'python3*')"
+
+LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="3ds"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pyprotocols[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	3ds? ( ~media-libs/lib3ds-1.3.0 )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	cgkit_unpack() {
+		local tarball
+		if python_is_python3; then
+			tarball=${P}-py3k.tar.gz
+		else
+			tarball=${P}-py2k.tar.gz
+		fi
+		mkdir "${BUILD_DIR}" || die
+		tar -C "${BUILD_DIR}" -x --strip-components 1 -f "${DISTDIR}/${tarball}" || die
+	}
+	python_foreach_impl cgkit_unpack
+	mkdir "${S}" || die
+}
+
+python_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-2.0.0-fix-build-system.patch \
+		"${FILESDIR}"/${PN}-2.0.0-fix-c++14.patch
+	if python_is_python3; then
+		eapply "${FILESDIR}"/${PN}-py3k-pillow.patch
+	else
+		eapply "${FILESDIR}"/${PN}-py2k-pillow.patch
+	fi
+
+	cp config_template.cfg config.cfg || die
+	cat >> config.cfg <<- _EOF_ || die
+		BOOST_LIB = 'boost_python-${EPYTHON#python}'
+		LIBS += ['GL', 'GLU', 'glut']
+		LIB3DS_AVAILABLE = $(usex 3ds True False)
+	_EOF_
+
+	# Remove invalid test
+	rm -f unittests/test_pointcloud.py || die
+}
+
+python_configure_all() {
+	tc-export AR CXX
+}
+
+python_compile() {
+	pushd supportlib >/dev/null || die
+	CXXFLAGS="${CXXFLAGS} -fPIC" escons
+	popd >/dev/null || die
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd unittests >/dev/null || die
+	mkdir tmp || die
+	"${EPYTHON}" all.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2018-07-21  0:06 Mikle Kolyada
  0 siblings, 0 replies; 9+ messages in thread
From: Mikle Kolyada @ 2018-07-21  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     37a6cd8ab77ea66a19fefa19cff7f7e3b20185c9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 00:05:24 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 00:06:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a6cd8a

dev-python/cgkit: x86 stable wrt bug #658884

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/cgkit/cgkit-2.0.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
index 266537ff2c9..38c4d52f34d 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="3ds"
 
 RDEPEND="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2018-07-24  0:38 Mikle Kolyada
  0 siblings, 0 replies; 9+ messages in thread
From: Mikle Kolyada @ 2018-07-24  0:38 UTC (permalink / raw
  To: gentoo-commits

commit:     36036044c6dd2d08d649a555fa0f540a39de1af1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 00:38:20 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 00:38:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36036044

dev-python/cgkit: ppc stable wrt bug #658884

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/cgkit/cgkit-2.0.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
index 38c4d52f34d..86ba0935d20 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="3ds"
 
 RDEPEND="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/
@ 2019-07-27  7:54 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-07-27  7:54 UTC (permalink / raw
  To: gentoo-commits

commit:     f0b422090842ec668fd7d6ba01a12a49e25461b9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 07:52:41 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 07:53:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b42209

dev-python/cgkit: Fix configure with >=boost-1.70

Closes: https://bugs.gentoo.org/690800
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/cgkit/cgkit-2.0.0-r2.ebuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
index b5dd3ab667b..0edbc19a9c5 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
@@ -55,9 +55,16 @@ python_prepare() {
 		eapply "${FILESDIR}"/${PN}-py2k-pillow.patch
 	fi
 
+	local boostpy_ver="${EPYTHON#python}"
+	if has_version ">=dev-libs/boost-1.70"; then
+		boostpy_ver="${boostpy_ver/\.}"
+	else
+		boostpy_ver="-${boostpy_ver}"
+	fi
+
 	cp config_template.cfg config.cfg || die
 	cat >> config.cfg <<- _EOF_ || die
-		BOOST_LIB = 'boost_python-${EPYTHON#python}'
+		BOOST_LIB = 'boost_python${boostpy_ver}'
 		LIBS += ['GL', 'GLU', 'glut']
 		LIB3DS_AVAILABLE = $(usex 3ds True False)
 	_EOF_


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

end of thread, other threads:[~2019-07-27  7:54 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-11 13:42 [gentoo-commits] repo/gentoo:master commit in: dev-python/cgkit/ Agostino Sarubbo
  -- strict thread matches above, loose matches on Subject: below --
2019-07-27  7:54 Andreas Sturmlechner
2018-07-24  0:38 Mikle Kolyada
2018-07-21  0:06 Mikle Kolyada
2018-06-27 20:52 Pacho Ramos
2018-06-27 20:52 Pacho Ramos
2017-05-02  9:48 Michał Górny
2017-03-22  7:43 Michael Weber
2017-03-11 13:31 Agostino Sarubbo

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