media-gfx/ipe-tools: Add ipe-tools-7.2.24.1

Also wwitch from PyPDF2 to pypdf.

diff --git a/media-gfx/ipe-tools/Manifest b/media-gfx/ipe-tools/Manifest
index 2162abcf0bd3afd587eca7843428f6aa5cb4c7de..0f9810fbf2a3573427a10631742fd873c194298f 100644 (file)
--- a/media-gfx/ipe-tools/Manifest
+++ b/media-gfx/ipe-tools/Manifest
@@ -1,5 +1,5 @@
-DIST v7.2.13.1.tar.gz 238265 BLAKE2B 155892772eccad7992d9754a7893fbaaaf5a10437ff3f00b19895409461de4362caa202c630a5435392a083c43af7e01b65d416c49a1a0cf04789f2eb528a9ba SHA512 edcd8af4194cb9ab8f73837cc2c73e9c67de07f513bdf5be67474a9d77b2afbca83c0f7746b0126688cb3ba853527b99668dcd5baeabed2bff7a8ddea8288678
 DIST v7.2.20.1.tar.gz 238820 BLAKE2B 3e85ed58252a0c242c4fcab05123fea7e62fb4bd577a1bcad5c48b83d9a4a6667fee5a1a46d0d45f2b89b9d2ce094ace6578924b63b1bccf5f519d7565828d09 SHA512 88533a0c13740201716939d567b5c6ca1fa3ddf16c58d3c1fd7db5d54faf8d1f8d3d788548284ee982bd510b565ed8c6e699f3eb47c27ba17522b4360154d3ce
-EBUILD ipe-tools-7.2.13.1.ebuild 1185 BLAKE2B bd8aae5e21d5bda7d55522416d3fd1d3d4fa8c0a7f00e32a97e08d892a64242be7098730fdbda86edaa75bb6fcd9efd93ad725009ed69065594c6e07cdf938b6 SHA512 3324c5d883f1e2bf084ccc082230c0778ec603268802a56211781199845ee205e9aebd0ba7c901e6aaedc4e565bc96f3c842a50eac808adce6e25a803b12a1c2
+DIST v7.2.24.1.tar.gz 239300 BLAKE2B f853a0362fa7736cec0cca2a06ca409459552c70a8be1a567e5b21c9476e308305dfe35ce3be08f515d9ab340b388b8b32b23288d999918e9705a6370ddb77b3 SHA512 d12d35df3602fc0c0f0103377ed7b5ee7f0ca6d600fc6ea42626913ff021b516bea8bfe5a983d0cd89cee679e8d06ac8140f0f251e89ac6b35df7610d79f5b47
 EBUILD ipe-tools-7.2.20.1.ebuild 1433 BLAKE2B e2382d7717066fc85af8eb444dbadf894bcb0951b6e2cdf7e74632c88c3f6497e9e1f49a285a1798e6723f2d0b2341f4c2aeb52fb481466e96b38a1269ca4b9d SHA512 585f0bad892044ed50908c26459f8b925348896353eeca08db05e2e3180960f21422ba77af1e81e5c5340e6dcdc4f251dce65f21a6bbf30a2405457501eab9a1
+EBUILD ipe-tools-7.2.24.1.ebuild 1432 BLAKE2B 3193f5bacddd71b49240033599cdb91b32788ff94385722692c1e70fb744e87c35388820803a35dfc3bad92c1fbeefa52a1e3acf15932125db88ec5bece2551f SHA512 932678ce09b7d339004c6f04008e107ded2beb7bdbedbca76d9a4a8a63c7a0e4c27a929fd33202328b773daacf9d8d4825d3bffbe8eb4af77c2d3488b52bb61f
 MISC metadata.xml 243 BLAKE2B 889d08efb220a9fb8457500f5f3c33c8c737616995e19fa8b621ced4bc9d380d016413d098d4d09925c679cd23f7fbd75e495424fe6ed809a9e873014caae682 SHA512 f9051a65d7e11d7abd1b9568dbbf8be84a6ae68eb994b0c22d57dff5620047d5ad5a324057a5cf4cec10837d16024e5f21a8cf5f1a6247807f62931839eb73bc

diff --git a/media-gfx/ipe-tools/ipe-tools-7.2.13.1.ebuild b/media-gfx/ipe-tools/ipe-tools-7.2.24.1.ebuild
similarity index 56%
rename from media-gfx/ipe-tools/ipe-tools-7.2.13.1.ebuild
rename to media-gfx/ipe-tools/ipe-tools-7.2.24.1.ebuild
index fb126112bb5099323b314f8c6eab6d96c84a0629..4e144cfa47e1020b189e1d567561aa3a94c2a570 100644 (file)
--- a/media-gfx/ipe-tools/ipe-tools-7.2.13.1.ebuild
+++ b/media-gfx/ipe-tools/ipe-tools-7.2.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit python-single-r1
 
 DESCRIPTION="Tools to use with the Ipe drawing editor."
@@ -13,9 +13,10 @@ SRC_URI="https://github.com/otfried/ipe-tools/archive/v${PV}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+svgtoipe +figtoipe +ipe5toxml +pdftoipe"
+IUSE="+annotate +svgtoipe +figtoipe +ipe5toxml +pdftoipe"
 
-DEPEND="svgtoipe? ( !media-gfx/svgtoipe ${PYTHON_DEPS} dev-lang/python[xml] )
+DEPEND="annotate? ( ${PYTHON_DEPS} dev-python/pypdf )
+               svgtoipe? ( !media-gfx/svgtoipe ${PYTHON_DEPS} dev-lang/python[xml] )
                figtoipe? ( !media-gfx/figtoipe sys-libs/zlib )
                ipe5toxml? ( !media-gfx/ipe5toxml )
                pdftoipe? ( !media-gfx/pdftoipe app-text/poppler )"
@@ -23,7 +24,7 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
-       # tools with makefile
+       # Tools with makefile
        for tool in figtoipe ipe5toxml; do
                if use ${tool}; then
                        cd ${tool}
@@ -32,24 +33,24 @@ src_compile() {
                fi
        done
 
-       # Fixing python tools
-       if use svgtoipe; then
-               mv svgtoipe/svgtoipe.py svgtoipe/svgtoipe
-       fi
+       # 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
-               if use ${tool}; then
-                       doexe ${tool}/${tool}
-                       doman ${tool}/${tool}.1
-               fi
+               use ${tool} && doexe ${tool}/${tool}
+               use ${tool} && doman ${tool}/${tool}.1
        done
 
+       use annotate && doexe annotate/annotate-ipe
+
        # Fixing python tools
-       if use svgtoipe; then
+       if use annotate || use svgtoipe; then
                python_fix_shebang ${ED}/usr/bin
        fi
 }