media-gfx/ipe-tools: add 7.2.29.2, remove old versions

Also fix the pdftoipe USE flag being silently dead: it was declared
in IUSE/DEPEND but missing from the src_compile/src_install tool
loops, so enabling it built and installed nothing. Add REQUIRED_USE
for the python-single-r1 target, quote ${ED}, and regenerate the
Manifest to drop stale entries for removed old-version ebuilds.

diff --git a/media-gfx/ipe-tools/Manifest b/media-gfx/ipe-tools/Manifest
index fa4db696aa666cbd9df96458cd5a6a1533ea8699..0ce7140a2bcaaa240e5d7da5a815b42de4e80b23 100644 (file)
--- a/media-gfx/ipe-tools/Manifest
+++ b/media-gfx/ipe-tools/Manifest
@@ -1,6 +1,4 @@
-DIST v7.2.24.1.tar.gz 239300 BLAKE2B f853a0362fa7736cec0cca2a06ca409459552c70a8be1a567e5b21c9476e308305dfe35ce3be08f515d9ab340b388b8b32b23288d999918e9705a6370ddb77b3 SHA512 d12d35df3602fc0c0f0103377ed7b5ee7f0ca6d600fc6ea42626913ff021b516bea8bfe5a983d0cd89cee679e8d06ac8140f0f251e89ac6b35df7610d79f5b47
-DIST v7.2.29.1.tar.gz 240082 BLAKE2B 77cdaf04b32866457a3a5f46dd5107c4b820451bc7a4137b1b562ddd5f65a7b7bc668f16133ecffbbe986429d52b47de7329b98faf9d1ac92844704af531dd9f SHA512 5f4ff02d014dce87b4032df7204706e0ad33a96b2f9cc8919a40fc44b28cc5c1ec9a0aaa83d102b103a94ffdce369a9031e3acaa3a6e60f4ead915cbfcefb33b
-EBUILD ipe-tools-7.2.24.1.ebuild 1411 BLAKE2B 6f9cd0963d1d1bb1375d3aea74fa4359341d0c49f6977730fb557e4963cc5b6a4dc726249215e5e9e3797931fbcfa115c8112fa299ff3de43b9f7e4a7643c228 SHA512 a32a25bbc904fea20c1604bdbdae07361d8d136704cf24ca3e13dcdf36dc306a438c1b38e4606a07004ffd11fa554ac4704aef9026ad130d4e4f9374c1f05031
-EBUILD ipe-tools-7.2.29.1.ebuild 1411 BLAKE2B 6f9cd0963d1d1bb1375d3aea74fa4359341d0c49f6977730fb557e4963cc5b6a4dc726249215e5e9e3797931fbcfa115c8112fa299ff3de43b9f7e4a7643c228 SHA512 a32a25bbc904fea20c1604bdbdae07361d8d136704cf24ca3e13dcdf36dc306a438c1b38e4606a07004ffd11fa554ac4704aef9026ad130d4e4f9374c1f05031
+DIST v7.2.29.2.tar.gz 248986 BLAKE2B 799f26fd6934a30feeaf494842b602cc0bbc3003d17cceedd7a8e0abe2eb650cc3fe8a19144108177c42caad51d7694c34e4a4d2ff51cda05b988fd53cf675bf SHA512 621192edbdf18c0be1f5b0cb18a6e5a7b53187a3a80f69d42911adf1790c0344ee5bdea7c18ccfc68a2477a8aa30152ae185dfc1f976820ad40243be3cec103d
+EBUILD ipe-tools-7.2.29.2.ebuild 1522 BLAKE2B c03d6a8414440240480c430665864fe5d8bfa461051155985a168a6369fd1eb73fe4ea5b14ef85d604f975d6b4a31e6f9c3391e3a038fece1028458f5f30e278 SHA512 fc723f9a4905105ea076bb869902eaa09dd5e8481f3825403112d114b8c263a7acff6327c43ab6ea913c9a76e49f5a5095130e848e7729e18cdbf9ba9b439f04
 EBUILD ipe-tools-9999.ebuild 1595 BLAKE2B f5fec6f646bfa39e76e5a09457ab02aaad04b7e581bbb3edf8c98b25acef1efd2507be4ceeee5d21f53b7598fbcae65bf4b6fad23ad048a348845e8af8083902 SHA512 b00d5bc87da531c2f63aa7cf26ba7afdf5329648db5a5695dfbf723f16182aa3fb049eb525cb72f68f2c27f31094ee7786ac092e42be7f355b84f6dee7c5328a
 MISC metadata.xml 243 BLAKE2B 889d08efb220a9fb8457500f5f3c33c8c737616995e19fa8b621ced4bc9d380d016413d098d4d09925c679cd23f7fbd75e495424fe6ed809a9e873014caae682 SHA512 f9051a65d7e11d7abd1b9568dbbf8be84a6ae68eb994b0c22d57dff5620047d5ad5a324057a5cf4cec10837d16024e5f21a8cf5f1a6247807f62931839eb73bc

diff --git a/media-gfx/ipe-tools/ipe-tools-7.2.29.1.ebuild b/media-gfx/ipe-tools/ipe-tools-7.2.29.1.ebuild
deleted file mode 100644 (file)
index 539082a..0000000
--- a/media-gfx/ipe-tools/ipe-tools-7.2.29.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..13} )
-inherit python-single-r1
-
-DESCRIPTION="Tools to use with the Ipe drawing editor."
-HOMEPAGE="https://github.com/otfried/ipe-tools"
-SRC_URI="https://github.com/otfried/ipe-tools/archive/v${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+annotate +svgtoipe +figtoipe +ipe5toxml +pdftoipe"
-
-DEPEND="annotate? ( ${PYTHON_DEPS} dev-python/pypdf )
-               svgtoipe? ( !media-gfx/svgtoipe ${PYTHON_DEPS} )
-               figtoipe? ( !media-gfx/figtoipe sys-libs/zlib )
-               ipe5toxml? ( !media-gfx/ipe5toxml )
-               pdftoipe? ( !media-gfx/pdftoipe app-text/poppler )"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_compile() {
-       # Tools with makefile
-       for tool in figtoipe ipe5toxml; do
-               if use ${tool}; then
-                       cd ${tool}
-                       emake
-                       cd ..
-               fi
-       done
-
-       # Fixing python tool naming
-       use svgtoipe && mv svgtoipe/svgtoipe.py svgtoipe/svgtoipe
-       # File collision with annotate from media-libs/gd, hence suffix -ipe
-       use annotate && mv annotate/annotate.py annotate/annotate-ipe
-}
-
-src_install() {
-       exeinto /usr/bin/
-
-       for tool in svgtoipe figtoipe ipe5toxml; do
-               use ${tool} && doexe ${tool}/${tool}
-               use ${tool} && doman ${tool}/${tool}.1
-       done
-
-       use annotate && doexe annotate/annotate-ipe
-
-       # Fixing python tools
-       if use annotate || use svgtoipe; then
-               python_fix_shebang ${ED}/usr/bin
-       fi
-}

diff --git a/media-gfx/ipe-tools/ipe-tools-7.2.24.1.ebuild b/media-gfx/ipe-tools/ipe-tools-7.2.29.2.ebuild
similarity index 82%
rename from media-gfx/ipe-tools/ipe-tools-7.2.24.1.ebuild
rename to media-gfx/ipe-tools/ipe-tools-7.2.29.2.ebuild
index 539082ab074f1dca3a3322593de4b98959f18f0a..fc06a3f6dbce2b9a87a0cf2ca75fb38c4fbf1961 100644 (file)
--- a/media-gfx/ipe-tools/ipe-tools-7.2.24.1.ebuild
+++ b/media-gfx/ipe-tools/ipe-tools-7.2.29.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..13} )
+PYTHON_COMPAT=( python3_{8..14} )
 inherit python-single-r1
 
 DESCRIPTION="Tools to use with the Ipe drawing editor."
@@ -14,6 +14,8 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+annotate +svgtoipe +figtoipe +ipe5toxml +pdftoipe"
+REQUIRED_USE="annotate? ( ${PYTHON_REQUIRED_USE} )
+               svgtoipe? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="annotate? ( ${PYTHON_DEPS} dev-python/pypdf )
                svgtoipe? ( !media-gfx/svgtoipe ${PYTHON_DEPS} )
@@ -25,7 +27,7 @@ BDEPEND=""
 
 src_compile() {
        # Tools with makefile
-       for tool in figtoipe ipe5toxml; do
+       for tool in figtoipe ipe5toxml pdftoipe; do
                if use ${tool}; then
                        cd ${tool}
                        emake
@@ -42,7 +44,7 @@ src_compile() {
 src_install() {
        exeinto /usr/bin/
 
-       for tool in svgtoipe figtoipe ipe5toxml; do
+       for tool in svgtoipe figtoipe ipe5toxml pdftoipe; do
                use ${tool} && doexe ${tool}/${tool}
                use ${tool} && doman ${tool}/${tool}.1
        done
@@ -51,6 +53,6 @@ src_install() {
 
        # Fixing python tools
        if use annotate || use svgtoipe; then
-               python_fix_shebang ${ED}/usr/bin
+               python_fix_shebang "${ED}"/usr/bin
        fi
 }