commit: 4c8a4c689954a0ea85ede33f905c148b996e95ec Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Wed Nov 1 16:06:50 2023 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Wed Nov 1 16:24:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8a4c68
dev-python/stapler: fix dependency spec for pypdf Closes: https://bugs.gentoo.org/916105 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> ...tapler-1.0.0_p20220330-PyPDF2-to-pypdf-r1.patch | 52 ++++++++++++++++++++++ .../stapler/stapler-1.0.0_p20220330-r4.ebuild | 39 ++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/dev-python/stapler/files/stapler-1.0.0_p20220330-PyPDF2-to-pypdf-r1.patch b/dev-python/stapler/files/stapler-1.0.0_p20220330-PyPDF2-to-pypdf-r1.patch new file mode 100644 index 000000000000..8e4a30327ee5 --- /dev/null +++ b/dev-python/stapler/files/stapler-1.0.0_p20220330-PyPDF2-to-pypdf-r1.patch @@ -0,0 +1,52 @@ +diff --git a/staplelib/commands.py b/staplelib/commands.py +index caf75f9..e67f419 100644 +--- a/staplelib/commands.py ++++ b/staplelib/commands.py +@@ -4,7 +4,7 @@ import math + import os + + try: +- from PyPDF2 import PdfWriter, PdfReader ++ from pypdf import PdfWriter, PdfReader + except: + from pyPdf import PdfWriter, PdfReader + +diff --git a/staplelib/iohelper.py b/staplelib/iohelper.py +index 8df365c..5474898 100644 +--- a/staplelib/iohelper.py ++++ b/staplelib/iohelper.py +@@ -7,7 +7,7 @@ import re + import sys + + try: +- from PyPDF2 import PdfWriter, PdfReader ++ from pypdf import PdfWriter, PdfReader + except ImportError: + from pyPdf import PdfWriter, PdfReader + +diff --git a/staplelib/tests.py b/staplelib/tests.py +index 86db178..423406d 100755 +--- a/staplelib/tests.py ++++ b/staplelib/tests.py +@@ -5,7 +5,7 @@ import shutil + import tempfile + import unittest + +-from PyPDF2 import PdfReader ++from pypdf import PdfReader + + from staplelib import main, CommandError + +diff --git a/pyproject.toml b/pyproject.toml +index d34823e..765db3d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -15,7 +15,7 @@ packages = [ + + [tool.poetry.dependencies] + python = "^3.4" +-PyPDF2 = ">=1.26" ++pypdf = ">=3.1.0" + + [tool.poetry.dev-dependencies] + pytest = "*" diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r4.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r4.ebuild new file mode 100644 index 000000000000..9b6c4310cc1a --- /dev/null +++ b/dev-python/stapler/stapler-1.0.0_p20220330-r4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +EGIT_COMMIT="382f1edc62296e071093a5419811a2fca9d78d93" +MY_P="${PN}-${EGIT_COMMIT}" +DESCRIPTION="Suite of tools for PDF files manipulation written in Python" +HOMEPAGE=" + https://github.com/hellerbarde/stapler/ + https://pypi.org/project/stapler/ +" +SRC_URI=" + https://github.com/hellerbarde/stapler/archive/${EGIT_COMMIT}.tar.gz + -> ${MY_P}.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/pypdf[${PYTHON_USEDEP}] +" + +distutils_enable_tests unittest + +PATCHES=( + "${FILESDIR}"/${P}-fix-tests-for-PyPDF2-2.x.patch + "${FILESDIR}"/${P}-port-to-PyPDF2-3.0.0.patch + "${FILESDIR}"/${P}-use-poetry-core-backend-for-PEP517.patch + "${FILESDIR}"/${P}-PyPDF2-to-pypdf-r1.patch +)
