commit: bae696ae9e0c9b4a9869dd912b715964597bec56
Author: Michael Schubert <mschu.dev <AT> gmail <DOT> com>
AuthorDate: Mon Nov 11 14:47:02 2024 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Thu Feb 6 13:54:30 2025 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bae696ae
dev-python/py2bit: fix gcc14 compile; drop 0.3.0
Signed-off-by: Michael Schubert <mschu.dev <AT> gmail.com>
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
dev-python/py2bit/files/py2bit-0.3.1-gcc14.patch | 13 ++++++++++
dev-python/py2bit/py2bit-0.3.0.ebuild | 32 ------------------------
dev-python/py2bit/py2bit-0.3.1.ebuild | 10 +++++---
dev-python/py2bit/py2bit-9999.ebuild | 10 +++++---
4 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/dev-python/py2bit/files/py2bit-0.3.1-gcc14.patch
b/dev-python/py2bit/files/py2bit-0.3.1-gcc14.patch
new file mode 100644
index 000000000..7fe1a84f6
--- /dev/null
+++ b/dev-python/py2bit/files/py2bit-0.3.1-gcc14.patch
@@ -0,0 +1,13 @@
+diff --git a/py2bit.c b/py2bit.c
+index dc24535..a9080c3 100644
+--- a/py2bit.c
++++ b/py2bit.c
+@@ -32,7 +32,7 @@ static PyObject *py2bitOpen(PyObject *self, PyObject *args,
PyObject *kwds) {
+ }
+
+ PyObject *py2bitEnter(pyTwoBit_t *self, PyObject *args) {
+- pyTwoBit_t *pytb = self->tb;
++ pyTwoBit_t *pytb = self;
+
+ if(!pytb) {
+ PyErr_SetString(PyExc_RuntimeError, "The 2bit file handle is not
open!");
diff --git a/dev-python/py2bit/py2bit-0.3.0.ebuild
b/dev-python/py2bit/py2bit-0.3.0.ebuild
deleted file mode 100644
index 4b1c29658..000000000
--- a/dev-python/py2bit/py2bit-0.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for accessing 2bit files"
-HOMEPAGE="https://github.com/dpryan79/py2bit";
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dpryan79/py2bit";
-else
- SRC_URI="https://github.com/dpryan79/py2bit/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="sci-libs/lib2bit"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-
-python_test() {
- epytest "py2bitTest/test.py"
-}
diff --git a/dev-python/py2bit/py2bit-0.3.1.ebuild
b/dev-python/py2bit/py2bit-0.3.1.ebuild
index 4b1c29658..decc59666 100644
--- a/dev-python/py2bit/py2bit-0.3.1.ebuild
+++ b/dev-python/py2bit/py2bit-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
@@ -13,9 +13,9 @@ HOMEPAGE="https://github.com/dpryan79/py2bit";
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/dpryan79/py2bit";
+ EGIT_REPO_URI="https://github.com/deeptools/py2bit";
else
- SRC_URI="https://github.com/dpryan79/py2bit/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ SRC_URI="https://github.com/deeptools/py2bit/archive/${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -25,6 +25,8 @@ SLOT="0"
DEPEND="sci-libs/lib2bit"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-0.3.1-gcc14.patch" )
+
distutils_enable_tests pytest
python_test() {
diff --git a/dev-python/py2bit/py2bit-9999.ebuild
b/dev-python/py2bit/py2bit-9999.ebuild
index 4b1c29658..decc59666 100644
--- a/dev-python/py2bit/py2bit-9999.ebuild
+++ b/dev-python/py2bit/py2bit-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
@@ -13,9 +13,9 @@ HOMEPAGE="https://github.com/dpryan79/py2bit";
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/dpryan79/py2bit";
+ EGIT_REPO_URI="https://github.com/deeptools/py2bit";
else
- SRC_URI="https://github.com/dpryan79/py2bit/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ SRC_URI="https://github.com/deeptools/py2bit/archive/${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -25,6 +25,8 @@ SLOT="0"
DEPEND="sci-libs/lib2bit"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-0.3.1-gcc14.patch" )
+
distutils_enable_tests pytest
python_test() {
