[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclpython/, dev-tcltk/tclpython/files/
commit: 68954313c0a0c1715d05989798ee12a2819f8c23
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Feb 6 10:49:20 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Feb 6 10:49:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68954313
dev-tcltk/tclpython: PythonCompatUpdate
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch | 20
dev-tcltk/tclpython/tclpython-5.0-r1.ebuild | 4 ++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
index c77339982fd6..39bdf20c095c 100644
--- a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
+++ b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
@@ -24,3 +24,23 @@
ifneq ($(MAKECMDGOALS), clean)
-include $(DEPEND)
+--- a/src/py.c 2022-02-06 10:20:03.352580186 +0100
b/src/py.c 2022-02-06 11:16:49.504796684 +0100
+@@ -24,7 +24,6 @@
+ // First time initializing Python
+ Py_NoSiteFlag = 1;
+ Py_Initialize();
+-PyEval_InitThreads();
+ GlobalThread = PyEval_SaveThread();
+ }
+
+@@ -60,7 +59,8 @@
+ #ifdef WITH_THREAD
+ PyEval_RestoreThread(interp->thread_state);
+ Py_EndInterpreter(interp->thread_state);
+-PyEval_ReleaseLock();
++PyThreadState_Swap(GlobalThread);
++PyEval_SaveThread();
+ #endif
+
+ free(interp);
diff --git a/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
b/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
index 05156fc6ea87..92a9fda120d9 100644
--- a/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-single-r1 toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclpython/, dev-tcltk/tclpython/files/
commit: 9dfbf7a90b70366380cc9daf70d0a90a37078d2c
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Jun 1 13:12:39 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Jun 1 13:12:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfbf7a9
dev-tcltk/tclpython: do not use colon in sed
Closes: https://bugs.gentoo.org/726610
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch | 4 ++--
dev-tcltk/tclpython/tclpython-5.0.ebuild | 11 ++-
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
index 965fe3d8d72..c77339982fd 100644
--- a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
+++ b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
@@ -5,12 +5,12 @@
TCL_VERSION=$(shell echo 'puts $\$$tcl_version' | tclsh)
-CFLAGS:= -O2 -Wall -fPIC -DUSE_TCL_STUBS
-+CFLAGS:= @CFLAGS@ -fPIC -DUSE_TCL_STUBS
++CFLAGS:= $(MYCFLAGS) -fPIC -DUSE_TCL_STUBS
CFLAGS+= $(shell $(PYTHON_CONFIG) --includes)
CFLAGS+= -I/usr/include/tcl$(TCL_VERSION)
CFLAGS+= -DTCLPYTHON_VERSION=$(PKG_VERSION)
-LDFLAGS:= -shared -s
-+LDFLAGS:= @LDFLAGS@ -shared
++LDFLAGS:= $(MYLDFLAGS) -shared
LDFLAGS+= $(shell $(PYTHON_CONFIG) --libs)
LDFLAGS+= -ltclstub$(TCL_VERSION)
diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild
b/dev-tcltk/tclpython/tclpython-5.0.ebuild
index 90df040a57a..2603ce545fd 100644
--- a/dev-tcltk/tclpython/tclpython-5.0.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild
@@ -24,16 +24,9 @@ RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-src_prepare() {
- default
- sed -i \
- -e "s:@CFLAGS@:${CFLAGS}:g" \
- -e "s:@LDFLAGS@:${LDFLAGS}:g" \
- Makefile || die
-}
-
src_compile() {
- emake PKG_NAME=tclpython3 CC=$(tc-getCC)
+ emake PKG_NAME=tclpython3 CC=$(tc-getCC) \
+ MYCFLAGS="${CFLAGS}" MYLDFLAGS="${LDFLAGS}"
}
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclpython/, dev-tcltk/tclpython/files/
commit: 12bb26e7487c4fb04cbfd2fe45a04876a3b1e1b0
Author: Tupone Alfredo gentoo org>
AuthorDate: Mon Oct 29 07:57:47 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Oct 29 07:57:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12bb26e7
dev-tcltk/tclpython: Version bump to 5.0
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-tcltk/tclpython/Manifest | 1 +
.../tclpython/files/tclpython-5.0-gentoo.patch | 12 +
dev-tcltk/tclpython/tclpython-5.0.ebuild | 51 ++
3 files changed, 64 insertions(+)
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 54cd3528959..9bd7a795d51 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -1 +1,2 @@
DIST tclpython-4.1.tar.bz2 10580 BLAKE2B
98d4783cc52bc907c21d50ee393e25ee084b449db7c393c16b0b1f0420469bd0904d16dc2a6806b776dad7dabd521e5f2e8cc942c720d9e69750385302355608
SHA512
5f08e7129a7d9afeb1ac6bf1ab1c83ad3bb481593c9516c0653c7b4ba0dfb1b3129a336e64b998cec8ef2d2377a6a366b73c640d25839ab280d5079c0b220d54
+DIST tclpython-5.0.tar.gz 19327 BLAKE2B
bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900
SHA512
fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
diff --git a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
new file mode 100644
index 000..7f4aa0bf5a2
--- /dev/null
+++ b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
@@ -0,0 +1,12 @@
+--- a/Makefile 2018-10-28 17:21:20.274137396 +0100
b/Makefile 2018-10-28 17:21:47.696694473 +0100
+@@ -62,7 +62,8 @@
+ $(OUTPUT_DIR)/pkgIndex.tcl:pkg/pkgIndex.tcl
+ cp -t $(dir $@) $^
+
+-package: $(OUTPUT_DIR)/$(LIBRARY) $(OUTPUT_DIR)/pkgIndex.tcl
++package: $(OUTPUT_DIR)/$(LIBRARY)
++ ${MAKE} $(OUTPUT_DIR)/pkgIndex.tcl
+
+ ifneq ($(MAKECMDGOALS), clean)
+ -include $(DEPEND)
diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild
b/dev-tcltk/tclpython/tclpython-5.0.ebuild
new file mode 100644
index 000..e4a170a603e
--- /dev/null
+++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Python package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclpython.htm;
+SRC_URI="https://github.com/amykyta3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+ local PKG_NAME
+ if python_is_python3; then
+ PKG_NAME=tclpython3
+ else
+ PKG_NAME=tclpython
+ fi
+ emake PKG_NAME=${PKG_NAME} CC=$(tc-getCC)
+}
+
+src_install() {
+ if python_is_python3; then
+ insinto /usr/$(get_libdir)
+ doins -r build/tclpython3/tclpython3
+ fperms 775 /usr/$(get_libdir)/tclpython3/tclpython3.so.${PV}
+ dosym tclpython3.so.${PV}
/usr/$(get_libdir)/tclpython3/tclpython3.so
+ else
+ insinto /usr/$(get_libdir)
+ doins -r build/tclpython/tclpython
+ fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
+ dosym tclpython.so.${PV}
/usr/$(get_libdir)/tclpython/tclpython3.so
+ fi
+
+ dodoc README.md VERSION.md
+}
