diff options
Diffstat (limited to 'media-gfx')
53 files changed, 445 insertions, 1102 deletions
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml index 205a6aa850fd..919173b6ac59 100644 --- a/media-gfx/alembic/metadata.xml +++ b/media-gfx/alembic/metadata.xml @@ -25,7 +25,7 @@ </use> <upstream> <bugs-to>https://github.com/alembic/alembic/issues</bugs-to> - <remote-id type="github">https://github.com/alembic/alembic</remote-id> + <remote-id type="github">alembic/alembic</remote-id> </upstream> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest index 94ee827cbc79..0447e6919c63 100644 --- a/media-gfx/cairosvg/Manifest +++ b/media-gfx/cairosvg/Manifest @@ -1,3 +1 @@ -DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441 -DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd475ab75e268575ee2d3a45cb1da14a349d6a5516ef965191093f12ba916a1919fe115fa4b6e4dc0f9a22657946b SHA512 9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c DIST CairoSVG-2.5.1.tar.gz 8397716 BLAKE2B f5d307f3019df3b8e19a86c4f185bb6c95ff5f450705a06506f03447f7a4e97091fed4dbbdad7220da0b04c6bed3eb252f3f3e8d91bff55ab6432d0df7f62d70 SHA512 5f6732758ed8024b58173bc920a44fcafa65a2daf301ee07e088d542f1e82d0093bd853e58da2484c392d1b625fd27c0634d07ad58cf00e674741aa413013605 diff --git a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild b/media-gfx/cairosvg/cairosvg-2.4.2.ebuild deleted file mode 100644 index 2005b9b60017..000000000000 --- a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -MY_PN="CairoSVG" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG" -HOMEPAGE="https://cairosvg.org/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-python/cairocffi[${PYTHON_USEDEP}] - dev-python/cssselect2[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/tinycss2[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -src_prepare() { - # junk deps - sed -e '/pytest-runner/d' \ - -e '/--flake8/d' \ - -e '/--isort/d' \ - -i setup.cfg || die - distutils-r1_src_prepare -} diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild deleted file mode 100644 index 2005b9b60017..000000000000 --- a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -MY_PN="CairoSVG" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG" -HOMEPAGE="https://cairosvg.org/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-python/cairocffi[${PYTHON_USEDEP}] - dev-python/cssselect2[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/tinycss2[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -src_prepare() { - # junk deps - sed -e '/pytest-runner/d' \ - -e '/--flake8/d' \ - -e '/--isort/d' \ - -i setup.cfg || die - distutils-r1_src_prepare -} diff --git a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild index 59e4fa602816..b1cde0f1d39e 100644 --- a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild +++ b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-python/cairocffi[${PYTHON_USEDEP}] diff --git a/media-gfx/epson-ds-plugins/Manifest b/media-gfx/epson-ds-plugins/Manifest new file mode 100644 index 000000000000..00a69a2ceb02 --- /dev/null +++ b/media-gfx/epson-ds-plugins/Manifest @@ -0,0 +1,2 @@ +DIST imagescan-bundle-centos-7-1.3.28.x64.rpm.tar.gz 10975019 BLAKE2B c190fd160b91ea192c7f0f431e761e8e4c6ee369924b0e325a57e80a8a4c0b6c3162cdc80121fa813f1afef8118b440e59ea3a38a6621ecc320d00f8cad08268 SHA512 051743bc64760038bb468201114d7270e6f22c3f802824ee80f77b5b6200409aca4da330d3afb4a11a7754dfdcb28d7c4a8246180f3e0fb4483349072c10c86f +DIST imagescan-bundle-centos-7-3.63.0.x64.rpm.tar.gz 11012473 BLAKE2B 221c041f113405cc679c51242a4b6ebf3fa8e25008748215074966e8c0298a18eb0e89a758d4c2ddaa36c7e0bd43924e17c3b6f75a78fd7a454b42c4d56ffe87 SHA512 ddfbf12849bfe25b903a8c483520a7297ead129477dc4f3b0c39c424918d507314834d0b161f84d58d1ceb469ee9a12c726ff9651a78807e901abbc81e608d2d diff --git a/media-gfx/epson-ds-plugins/epson-ds-plugins-1.3.28.ebuild b/media-gfx/epson-ds-plugins/epson-ds-plugins-1.3.28.ebuild new file mode 100644 index 000000000000..abfceec1289a --- /dev/null +++ b/media-gfx/epson-ds-plugins/epson-ds-plugins-1.3.28.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit rpm + +S="${WORKDIR}" + +DESCRIPTION="Non-free network plugin package for Epson DS line of scanners" +HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +#SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz" +SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest2/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz" + +RESTRICT="nomirror" + +LICENSE="COPYING.EPSON" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND=" + ${DEPEND} + media-gfx/utsushi +" + +# EPSON provided closed-source binary +QA_PRESTRIPPED="usr/libexec/utsushi/networkscan" + +src_unpack() { + # Create a 'core' and 'plugins' directory to unpack into + mkdir -p "${WORKDIR}/"{core,plugins} + + # Unpack top-level package + unpack "$A" + + # Unpack the core drivers to the created 'core' directory + cd "${WORKDIR}/core" + rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/core/imagescan-*.rpm + + # Unpack 'networkscan' plugin to the created 'plugins' directory + cd "${WORKDIR}/plugins" + rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/plugins/imagescan-plugin-networkscan*.rpm +} + +# +# The udev rules are not installed as it's handled by the 'utsushi' source +# package. +# +# The 'utsushi' config file for SANE (/etc/sane.d/dll.d/utsushi) is handled by +# the 'utsushi' source package +# +src_install() { + # Create a subdirectory to install the 'networkscan' docs + dodoc ${WORKDIR}/plugins/usr/share/doc/imagescan-plugin-networkscan-*/{README,NEWS} + + # Install the 'networkscan' config files + # Renamed config to 'utsushi.conf' to be picked up by utsushi SANE backend + insinto /etc/utsushi + newins ${WORKDIR}/core/etc/imagescan/imagescan.conf utsushi.conf + + # Install the 'networkscan' binary + exeinto /usr/libexec/utsushi + doexe ${WORKDIR}/plugins/usr/libexec/utsushi/networkscan +} + +pkg_postinst() { + elog + elog "Remember to insert your scanner information into:" + elog " /etc/utsushi/utsushi.conf" + elog + elog "See /usr/share/doc/${PF}/README.bz2 for examples" + elog +} diff --git a/media-gfx/epson-ds-plugins/epson-ds-plugins-3.63.0.ebuild b/media-gfx/epson-ds-plugins/epson-ds-plugins-3.63.0.ebuild new file mode 100644 index 000000000000..d2c85da1be05 --- /dev/null +++ b/media-gfx/epson-ds-plugins/epson-ds-plugins-3.63.0.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit rpm + +S="${WORKDIR}" + +DESCRIPTION="Non-free network plugin package for Epson DS line of scanners" +HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +#SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz" +SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest2/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz" + +RESTRICT="nomirror" + +LICENSE="COPYING.EPSON" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="" +RDEPEND=" + ${DEPEND} + media-gfx/utsushi +" + +# EPSON provided closed-source binary +QA_PRESTRIPPED="usr/libexec/utsushi/networkscan" + +src_unpack() { + # Create a 'core' and 'plugins' directory to unpack into + mkdir -p "${WORKDIR}/"{core,plugins} + + # Unpack top-level package + unpack "$A" + + # Unpack the core drivers to the created 'core' directory + cd "${WORKDIR}/core" + rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/core/imagescan-*.rpm + + # Unpack 'networkscan' plugin to the created 'plugins' directory + cd "${WORKDIR}/plugins" + rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/plugins/imagescan-plugin-networkscan*.rpm +} + +# +# The udev rules are not installed as it's handled by the 'utsushi' source +# package. +# +# The 'utsushi' config file for SANE (/etc/sane.d/dll.d/utsushi) is handled by +# the 'utsushi' source package +# +src_install() { + # Create a subdirectory to install the 'networkscan' docs + dodoc ${WORKDIR}/plugins/usr/share/doc/imagescan-plugin-networkscan-*/{README,NEWS} + + # Install the 'networkscan' config files + # Renamed config to 'utsushi.conf' to be picked up by utsushi SANE backend + insinto /etc/utsushi + newins ${WORKDIR}/core/etc/imagescan/imagescan.conf utsushi.conf + + # Install the 'networkscan' binary + exeinto /usr/libexec/utsushi + doexe ${WORKDIR}/plugins/usr/libexec/utsushi/networkscan +} + +pkg_postinst() { + elog + elog "Remember to insert your scanner information into:" + elog " /etc/utsushi/utsushi.conf" + elog + elog "See /usr/share/doc/${PF}/README.bz2 for examples" + elog +} diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest index 7fdaf2ae5a37..8a884efe8b84 100644 --- a/media-gfx/exif/Manifest +++ b/media-gfx/exif/Manifest @@ -1,2 +1 @@ -DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild deleted file mode 100644 index 379dfe2fbe3d..000000000000 --- a/media-gfx/exif/exif-0.6.21.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files" -HOMEPAGE="https://libexif.github.io/" -SRC_URI="mirror://sourceforge/libexif/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="nls" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -DEPEND=" - dev-libs/popt - >=media-libs/libexif-${PV} -" -RDEPEND="${DEPEND}" - -src_configure() { - econf $(use_enable nls) -} diff --git a/media-gfx/exif/exif-0.6.22.ebuild b/media-gfx/exif/exif-0.6.22.ebuild index c9a3c41fdbb2..fb8a673b2a4f 100644 --- a/media-gfx/exif/exif-0.6.22.ebuild +++ b/media-gfx/exif/exif-0.6.22.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="nls" BDEPEND=" diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index c9049bd95a03..6335227892d6 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -1,6 +1,2 @@ -DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9 -DIST feh-3.4.1.tar.bz2 2114441 BLAKE2B c24e5f54762439cfbb031b4b24ded03f1c0c9c75233ae5b6dc66a7a56922902c672606a1b36fef9b30789c09946c8ccc5f9a60fe201db07e70bcf0ce0638c0c1 SHA512 d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66 -DIST feh-3.4.tar.bz2 2114146 BLAKE2B 0bc65db77c67c42b693122b877417c3dc4db7a0551cdf62723b3f7c134e5f2bb73ee6d0aa5a0c81402cf5a5f723ceb29a45fb5e4aef1911dc643aeb82c3ef17d SHA512 50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce -DIST feh-3.5.tar.bz2 2115162 BLAKE2B 8300cfc0e480afb070d40e35390edb30dc451dc5581add5f377a370bf606f7e7730a99c8a4773accb38b01a4e9b47fe5c95d8e9c2dcf9d71e96a71c4fd11a388 SHA512 69b4c73a8009c5b5e031bdf3c6a628da2f3cd71927d6c546ba2b2cfb6d10912e4a44e5d0de93704645a4dd33d71f1445749abe03383cc2298fa10c2d5d88fb5e DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7 diff --git a/media-gfx/feh/feh-3.3.ebuild b/media-gfx/feh/feh-3.3.ebuild deleted file mode 100644 index 4e3f9e8b8cd6..000000000000 --- a/media-gfx/feh/feh-3.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="A fast, lightweight imageviewer using imlib2" -HOMEPAGE="https://feh.finalrewind.org/" -SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" - -LICENSE="feh" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86" -IUSE="debug curl exif test xinerama" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="media-libs/imlib2[X] - >=media-libs/libpng-1.2:0= - x11-libs/libX11 - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - virtual/jpeg:0" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libXt - test? ( - >=dev-lang/perl-5.10 - dev-perl/Test-Command - media-libs/imlib2[gif,jpeg,png] - )" - -PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch ) - -pkg_setup() { - use_feh() { usex $1 1 0; } - - fehopts=( - DESTDIR="${D}" - PREFIX="${EPREFIX}"/usr - doc_dir='${main_dir}'/share/doc/${PF} - example_dir='${main_dir}'/share/doc/${PF}/examples - curl=$(use_feh curl) - debug=$(use_feh debug) - xinerama=$(use_feh xinerama) - exif=$(use_feh exif) - ) -} - -src_compile() { - tc-export CC - emake "${fehopts[@]}" -} - -src_install() { - emake "${fehopts[@]}" install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/feh/feh-3.4.1.ebuild b/media-gfx/feh/feh-3.4.1.ebuild deleted file mode 100644 index 7d87a35ace60..000000000000 --- a/media-gfx/feh/feh-3.4.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="A fast, lightweight imageviewer using imlib2" -HOMEPAGE="https://feh.finalrewind.org/" -SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" - -LICENSE="feh" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" -IUSE="debug curl exif test xinerama" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="media-libs/imlib2[X] - >=media-libs/libpng-1.2:0= - x11-libs/libX11 - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - virtual/jpeg:0" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libXt - test? ( - >=dev-lang/perl-5.10 - dev-perl/Test-Command - media-libs/imlib2[gif,jpeg,png] - )" - -PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch ) - -pkg_setup() { - use_feh() { usex $1 1 0; } - - fehopts=( - DESTDIR="${D}" - PREFIX="${EPREFIX}"/usr - doc_dir='${main_dir}'/share/doc/${PF} - example_dir='${main_dir}'/share/doc/${PF}/examples - curl=$(use_feh curl) - debug=$(use_feh debug) - xinerama=$(use_feh xinerama) - exif=$(use_feh exif) - ) -} - -src_compile() { - tc-export CC - emake "${fehopts[@]}" -} - -src_install() { - emake "${fehopts[@]}" install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/feh/feh-3.4.ebuild b/media-gfx/feh/feh-3.4.ebuild deleted file mode 100644 index cdfb177f990f..000000000000 --- a/media-gfx/feh/feh-3.4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="A fast, lightweight imageviewer using imlib2" -HOMEPAGE="https://feh.finalrewind.org/" -SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" - -LICENSE="feh" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="debug curl exif test xinerama" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="media-libs/imlib2[X] - >=media-libs/libpng-1.2:0= - x11-libs/libX11 - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - virtual/jpeg:0" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libXt - test? ( - >=dev-lang/perl-5.10 - dev-perl/Test-Command - media-libs/imlib2[gif,jpeg,png] - )" - -PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch ) - -pkg_setup() { - use_feh() { usex $1 1 0; } - - fehopts=( - DESTDIR="${D}" - PREFIX="${EPREFIX}"/usr - doc_dir='${main_dir}'/share/doc/${PF} - example_dir='${main_dir}'/share/doc/${PF}/examples - curl=$(use_feh curl) - debug=$(use_feh debug) - xinerama=$(use_feh xinerama) - exif=$(use_feh exif) - ) -} - -src_compile() { - tc-export CC - emake "${fehopts[@]}" -} - -src_install() { - emake "${fehopts[@]}" install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/feh/feh-3.5.ebuild b/media-gfx/feh/feh-3.5.ebuild deleted file mode 100644 index 7d87a35ace60..000000000000 --- a/media-gfx/feh/feh-3.5.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="A fast, lightweight imageviewer using imlib2" -HOMEPAGE="https://feh.finalrewind.org/" -SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" - -LICENSE="feh" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" -IUSE="debug curl exif test xinerama" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="media-libs/imlib2[X] - >=media-libs/libpng-1.2:0= - x11-libs/libX11 - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - virtual/jpeg:0" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libXt - test? ( - >=dev-lang/perl-5.10 - dev-perl/Test-Command - media-libs/imlib2[gif,jpeg,png] - )" - -PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch ) - -pkg_setup() { - use_feh() { usex $1 1 0; } - - fehopts=( - DESTDIR="${D}" - PREFIX="${EPREFIX}"/usr - doc_dir='${main_dir}'/share/doc/${PF} - example_dir='${main_dir}'/share/doc/${PF}/examples - curl=$(use_feh curl) - debug=$(use_feh debug) - xinerama=$(use_feh xinerama) - exif=$(use_feh exif) - ) -} - -src_compile() { - tc-export CC - emake "${fehopts[@]}" -} - -src_install() { - emake "${fehopts[@]}" install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild index fd4b2c7274c4..2ced1d104010 100644 --- a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND=" diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild index 1f7dfed6644c..9db9479d4d87 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index a56cb5466654..eec2245c13b3 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,2 +1 @@ -DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42 diff --git a/media-gfx/graphviz/files/dotty_change_button.patch b/media-gfx/graphviz/files/dotty_change_button.patch deleted file mode 100644 index 8c5f34a2e128..000000000000 --- a/media-gfx/graphviz/files/dotty_change_button.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty -index a8c9116..a708c61 100644 ---- a/cmd/dotty/dotty_ui.lefty -+++ b/cmd/dotty/dotty_ui.lefty -@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [ - else - gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1); - }; -- 'rightdown' = function (data) { -+ 'rightup' = function (data) { - local vt, gt, menu, i; - - vt = dotty.views[data.widget]; -@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [ - 'middledown' = dotty.protovt.normal.uifuncs.middledown; - 'middlemove' = dotty.protovt.normal.uifuncs.middlemove; - 'middleup' = dotty.protovt.normal.uifuncs.middleup; -- 'rightdown' = dotty.protovt.normal.uifuncs.rightdown; -+ 'rightup' = dotty.protovt.normal.uifuncs.rightup; - 'keyup' = dotty.protovt.normal.uifuncs.keyup; - 'redraw' = dotty.protovt.normal.uifuncs.redraw; - 'closeview' = dotty.protovt.normal.uifuncs.closeview; diff --git a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild deleted file mode 100644 index e0773850adfc..000000000000 --- a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild +++ /dev/null @@ -1,281 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils - -DESCRIPTION="Open Source Graph Visualization Software" -HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" -SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD" - -REQUIRED_USE=" - !cairo? ( !X !gtk !postscript !lasi ) - pdf? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# Requires ksh, tests against installed package, missing files and directory -RESTRICT="test" - -BDEPEND=" - sys-devel/flex - sys-devel/libtool - x11-libs/gdk-pixbuf:2 - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.14.5 ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - tcl? ( dev-lang/swig ) -" -RDEPEND=" - >=dev-libs/expat-2 - >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl:0 - >=media-libs/fontconfig-2.3.95 - >=media-libs/freetype-2.1.10 - >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] - >=media-libs/libpng-1.2:0= - sys-libs/zlib - virtual/jpeg:0 - virtual/libiconv - cairo? ( - >=x11-libs/cairo-1.1.10[svg] - >=x11-libs/pango-1.12 - ) - devil? ( media-libs/devil[png,jpeg] ) - gtk? ( x11-libs/gtk+:2 ) - gts? ( sci-libs/gts ) - lasi? ( media-libs/lasi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ruby? ( dev-lang/ruby:* ) - svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:0= ) - X? ( - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - ) -" -DEPEND="${RDEPEND} - guile? ( - dev-lang/swig - dev-scheme/guile - ) - java? ( - dev-lang/swig - >=virtual/jdk-1.5 - ) -" - -# Dependency description / Maintainer-Info: - -# Rendering is done via the following plugins (/plugins): -# - core, dot_layout, neato_layout, gd , dot -# the ones which are always compiled in, depend on zlib, gd -# - gtk -# Directly depends on gtk-2. -# needs 'pangocairo' enabled in graphviz configuration -# gtk-2 depends on pango, cairo and libX11 directly. -# - gdk-pixbuf -# Disabled, GTK-1 junk. -# - glitz -# Disabled, no particular reason -# needs 'pangocairo' enabled in graphviz configuration -# - ming -# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's -# incomplete. -# - cairo/pango: -# Needs pango for text layout, uses cairo methods to draw stuff -# - xlib: -# needs cairo+pango, -# can make use of gnomeui and inotify support (??? unsure), -# needs libXaw for UI -# UI also links directly against libX11, libXmu, and libXt -# and uses libXpm if available so we make sure it always is - -# There can be swig-generated bindings for the following languages (/tclpkg/gv): -# - c-sharp (disabled) -# - scheme (enabled via guile) ... no longer broken on ~x86 -# - go (disabled) -# - io (disabled) -# - java (enabled via java) *2 -# - lua (enabled via lua) -# - ocaml (enabled via ocaml) -# - perl (enabled via perl) *1 -# - php (enabled via php) *2 -# - python (enabled via python) *1 -# - ruby (enabled via ruby) *1 -# - tcl (enabled via tcl) -# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location -# *2 = Those bindings don't build because the paths for the headers/libs aren't -# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) - -# There are several other tools in /tclpkg: -# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl -# tkspline, tkstubs ; enabled with: --with-tk - -# And the commands (/cmd): -# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :) -# sci-libs/gts can be used for some of these -# - lefty: -# needs Xaw and X to build -# - gvedit (via 'qt5'): -# based on ./configure it needs qt-core and qt-gui only -# - smyrna : experimental opengl front-end (via 'smyrna') -# currently disabled -- it segfaults a lot -# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut -# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' -# with flags enabled at configure time - -PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch - "${FILESDIR}"/dotty_change_button.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - # ToDo: Do the same thing for examples and/or - # write a patch for a configuration-option - # and send it to upstream - # note - the longer sed expression removes multi-line assignments that are extended via '\' - if ! use doc ; then - find . -iname Makefile.am \ - | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \ - -e '/^\(html\|pdf\)_DATA/d' || die - fi - - # This is an old version of libtool - # use the ./configure option to exclude its use, and - # delete the dir since we don't need to eautoreconf it - rm -r libltdl || die - - # Nuke the dead symlinks for the bindings - sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die - - # replace the whitespace with tabs - sed -i -e 's: :\t:g' doc/info/Makefile.am || die - - # use correct version of qmake. bug #567236 - sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die - - # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895 - use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos) - - use java && append-cppflags $(java-pkg_get-jni-cflags) - - eautoreconf -} - -src_configure() { - local myconf=( - --enable-ltdl - --enable-gdk-pixbuf - $(use_with cairo pangocairo) - $(use_with devil) - $(use_with gtk) - $(use_with gts) - $(use_with qt5 qt) - $(use_with lasi) - $(use_with pdf poppler) - $(use_with postscript ghostscript) - $(use_enable static-libs static) - $(use_with svg rsvg) - $(use_with X x) - $(use_with X xaw) - $(use_with X lefty) - --with-digcola - --with-fontconfig - --with-freetype2 - --with-ipsepcola - --with-libgd - --with-sfdp - --without-ming - # new/experimental features, to be tested, disable for now - --with-cgraph - --without-glitz - --without-ipsepcola - --without-smyrna - --without-visio - # Bindings: - $(use_enable guile) - $(use_enable java) - $(use_enable perl) - $(use_enable python python2) - $(use_enable python python3) - $(use_enable ruby) - $(use_enable tcl) - --disable-go - --disable-io - --disable-lua - --disable-ocaml - --disable-php - --disable-python - --disable-r - --disable-sharp - # libtool file collision, bug #276609 - --without-included-ltdl - --disable-ltdl-install - ) - econf "${myconf[@]}" -} - -src_install() { - sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die - - emake DESTDIR="${D}" \ - txtdir="${EPREFIX}"/usr/share/doc/${PF} \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \ - pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \ - pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \ - install - - if ! use examples; then - rm -rf "${ED}"/usr/share/graphviz/demo || die - fi - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - einstalldocs - - use python && python_optimize \ - "${D}$(python_get_sitedir)" \ - "${D}/usr/$(get_libdir)/graphviz/python2" \ - "${D}/usr/$(get_libdir)/graphviz/python3" -} - -pkg_postinst() { - # This actually works if --enable-ltdl is passed - # to configure - dot -c || die -} - -pkg_postrm() { - # Remove cruft, bug #547344 - rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die -} diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild index eb2a65b1aa1d..0a48d939b957 100644 --- a/media-gfx/hugin/hugin-2019.2.0.ebuild +++ b/media-gfx/hugin/hugin-2019.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -99,7 +99,7 @@ src_install() { *) dir=${lang/-/_};; esac if ! use l10n_${lang} ; then - rm -r "${ED%/}"/usr/share/locale/${dir} || die + rm -r "${ED}"/usr/share/locale/${dir} || die fi done } diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild index 5b2c409ef53a..275059aaf1a5 100644 --- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -92,7 +92,7 @@ src_install() { *) dir=${lang/-/_};; esac if ! use l10n_${lang} ; then - rm -r "${ED%/}"/usr/share/locale/${dir} || die + rm -r "${ED}"/usr/share/locale/${dir} || die fi done } diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 453831cd2d3d..b2474ecc3410 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,4 +1,4 @@ -DIST ImageMagick-6.9.11-46.tar.xz 9165256 BLAKE2B 5fb2c7ef90c165388bf9c9b42d752823e62b94a631f8dd8161d8c71b718154b5f577474a7074f42644e994af1aec99f28c4d69913be3045865cbc87533c05fca SHA512 63022225e694dccbfb52eec3793332bc92ff2d6a51a6ed161d63e044a33c8d13f0a2630afc1935cb139ca2d0e141d99a9bec23f5eac82a488a461ed30baf85f5 -DIST ImageMagick-6.9.11-52.tar.xz 9152084 BLAKE2B bc50767e3eacc06ccf6168d9cac5666a2836e3b2085ee834594da419c2912cafce7dee84573f1a2062e051afb066529ae79b7bea25242fb055fdd11e734ee0d7 SHA512 79e6ab62722060601283f4c172f7a27b7d3c00f5dbdfaea4c1f5c1940a681ab3fd53e4ea4b736adc3e0662ecccba13f7f86baada3d319733191eda37abee38a1 -DIST ImageMagick-7.0.10-46.tar.xz 9649132 BLAKE2B 8083aa4fa26d59c4bea4bd9a45ab5b1a46d3fe0ecdbb0090588d16bcc31ad044171a59dc7e8681c878e885d83c7b34a4bbfa21273d5711181bbefdee457ac895 SHA512 7008286a05a1794a3061bd598bf6acc70dcfe1aec3a6b5632dce9dd87bb6c28385af0d469b47996d5576c4b39c5d48a4fcd7752b9353ec28b7f7d8160f4c5023 -DIST ImageMagick-7.0.10-52.tar.xz 9642352 BLAKE2B c1a86214978da88d66ef90b91516482fe67ee5e215fd5d76c79dbbcd9e33cc2d417d8f5d8e29056743737dd2275fe7a8d891b6ad2f3c8d7d5ab0adfd83f60dd1 SHA512 da1a8d53af0dc8f0dc8f71a7d41c5277c1e17f81e03a3c54852ced65d5d379577989e274bac66926c8a10f4d2f2834f7456b79635007252308ca593e98ef6d43 +DIST ImageMagick-6.9.11-58.tar.xz 9167216 BLAKE2B 48fa4d6ced002a08268bb607bcf5988bb9fdb27c6c5fc20e5c73c06b9e48837c972b884e73d8a57d16dc0a1d9ba0cb4cf6aaee144a7193caa3d9fbd5ec6839a8 SHA512 b116596bb737cf78b9ec27ae4cc8aa3163f4201e68c3bbc9666421766859d2a2d7521697a4fdd94c6276d190667161816d0ee31dde3e06303bf09ffe79409885 +DIST ImageMagick-6.9.11-60.tar.xz 9167220 BLAKE2B e212c2435414ef052de478c3c65c25291dac2f7b8d213b4408a1971d9c3b57180269a430b6f9fbe9da45587dc52fe62cd9b520f2b2a8e5b03fd86260107c2d0c SHA512 5a4de32a76cca71ae1ccbdc67f160aa451fbf44cf77fb7476ba3a2a6116783034a334f9dec7b8fbb328f06a2a4bec2423f72e4a6b452436b6953bec83a49a8b5 +DIST ImageMagick-7.0.10-58.tar.xz 9655792 BLAKE2B b16db99046427bc0c764588fbf7d10f9f7cdf665d8662b03103ec69c75d44aea80575ae1b8381b15e33dc6a393216918cecbdbd93ea61639b4b09ec15d1588c8 SHA512 ec58eba8a35d78e481d98ae6e13daddc81a8e28904b1524735ce54a7d1557b4ec22d314ecdfcb199685ba55604e6fcdc3cbf9193775627dbd42bf61983c98593 +DIST ImageMagick-7.0.10-60.tar.xz 10143800 BLAKE2B 665cb5517cf9864ffd7e132bdeb01df02fbc5211b73be568751ef3cdd2638a9052862a6607e0b5236cd44df3a796e107f4f0ec5d088b032d6829342f937d56b1 SHA512 bfc3192ad465511ed8b88947cf4b8f306202b6ed3ec230ac524a13a17a5adcab44788d79b659d071df82d4da7833d1e9bca0481c83de51dfdfb9cc16b97537d6 diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild index 203c905e1c68..8b0ce8fdad51 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild @@ -206,7 +206,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild index 1ad14695c634..d80bdfa74e82 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild @@ -206,7 +206,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild index 88889b42904e..5d7a1d8dc05b 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild index e5a1d02609e0..67687ea276c1 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index e5a1d02609e0..67687ea276c1 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml index 09285a2552fb..5ada31fcb796 100644 --- a/media-gfx/imagemagick/metadata.xml +++ b/media-gfx/imagemagick/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="project"> + <email>codec@gentoo.org</email> + <name>Gentoo Codec Project</name> + </maintainer> <maintainer type="person"> <email>dilfridge@gentoo.org</email> <name>Andreas K. Huettel</name> diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 9048977f8e67..2455bcce9116 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,2 +1,2 @@ DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96 -DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0 +DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild index 8480c31485ca..533b08c0e9d0 100644 --- a/media-gfx/inkscape/inkscape-1.0.1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg" diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2.ebuild index 81f4db8fac88..3b88ef146b3a 100644 --- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,20 +10,16 @@ inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 DESCRIPTION="SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz" +SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -PATCHES=( - "${FILESDIR}/missing_atomic_include.patch" -) - BDEPEND=" dev-util/glib-utils >=dev-util/intltool-0.40 @@ -102,7 +98,7 @@ DEPEND="${COMMON_DEPEND} RESTRICT="test" -S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49 +S="${WORKDIR}"/${P}_2021-01-15_e86c870879 pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]] && use openmp; then @@ -155,4 +151,7 @@ src_install() { if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then python_optimize "${ED}"/usr/share/${PN}/extensions fi + + # Empty directory causes sandbox issues, see bug #761915 + rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." } diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 789a2b08b4f3..60a9e5269704 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,2 +1,3 @@ DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe +DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild new file mode 100644 index 000000000000..b9440da88175 --- /dev/null +++ b/media-gfx/krita/krita-4.4.2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +KFMIN=5.74.0 +QTMIN=5.15.1 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/" + +LICENSE="GPL-3" +SLOT="5" +IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext +" +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:= + dev-libs/quazip + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ') + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + color-management? ( media-libs/opencolorio ) + fftw? ( sci-libs/fftw:3.0= ) + gif? ( media-libs/giflib ) + gsl? ( sci-libs/gsl:= ) + jpeg? ( virtual/jpeg:0 ) + heif? ( media-libs/libheif:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr + ) + pdf? ( app-text/poppler[qt5] ) + qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) + raw? ( media-libs/libraw:= ) + tiff? ( media-libs/tiff:0 ) +" +DEPEND="${RDEPEND} + vc? ( >=dev-libs/vc-1.1.0 ) +" + +# bug 630508 +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch + "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die +} + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged + $(cmake_use_find_package color-management OCIO) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package gif GIF) + $(cmake_use_find_package gsl GSL) + $(cmake_use_find_package heif HEIF) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package qtmedia Qt5Multimedia) + $(cmake_use_find_package raw LibRaw) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package vc Vc) + ) + + ecm_src_configure +} diff --git a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild index 9fc843665a0f..8bd658c7b2f6 100644 --- a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild index 3a7e4f1709b2..4a5d1003acfc 100644 --- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild +++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat" RESTRICT="!test? ( test )" diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml index e717f42ce48b..c74b44c86053 100644 --- a/media-gfx/povray/metadata.xml +++ b/media-gfx/povray/metadata.xml @@ -5,7 +5,6 @@ <email>sci@gentoo.org</email> </maintainer> <use> - <flag name="mkl">Enable support for Intel Vector Math Library, part of sci-libs/mkl</flag> <flag name="io-restrictions">POV-Ray's mechanism for control of I/O operations</flag> </use> <upstream> diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild deleted file mode 100644 index f67e16f0be82..000000000000 --- a/media-gfx/povray/povray-3.7.0.0.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils flag-o-matic multilib versionator virtualx - -POVRAY_MAJOR_VER=$(get_version_component_range 1-3) -POVRAY_MINOR_VER=$(get_version_component_range 4) -if [ -n "$POVRAY_MINOR_VER" ]; then - POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC} - MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}" -else - MY_PV=${POVRAY_MAJOR_VER} -fi - -DESCRIPTION="The Persistence of Vision Raytracer" -HOMEPAGE="https://www.povray.org/" -SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="debug +io-restrictions mkl openexr static-libs tiff X" - -DEPEND=" - >=dev-libs/boost-1.50.0:=[threads(+)] - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg - mkl? ( sci-libs/mkl ) - openexr? ( - media-libs/ilmbase - media-libs/openexr ) - tiff? ( media-libs/tiff:0 ) - X? ( media-libs/libsdl )" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - sys-devel/boost-m4" - -S=${WORKDIR}/${PN}-${MY_PV} - -PATCHES=( - "${FILESDIR}"/${P}-user-conf.patch - "${FILESDIR}"/${P}-boost-1.50.patch - "${FILESDIR}"/${P}-automagic.patch - ) - -src_prepare() { - [[ ${CHOST} == *-darwin* ]] && \ - PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch ) - - cd unix || die - bash -x prebuild.sh || die - cd .. || die - rm -rf libraries || die - - # Change some destination directories that cannot be adjusted via configure - sed \ - -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \ - -e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \ - -e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \ - -e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \ - -i configure.ac || die - - sed \ - -e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \ - -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \ - -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \ - -e 's:mkdir_p:MKDIR_P:g' \ - -i Makefile.am || die - - # The "+p" option on the test command line causes a pause and - # prompts the user to interact, so remove it. - sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die - - autotools-utils_src_prepare -} - -_src_compile() { - einfo "${LDFLAGS}" - autotools-utils_src_compile LDFLAGS="${LDFLAGS}" -} - -src_configure() { - local non_redist_conf - - # Fixes bug 71255 - if [[ $(get-flag march) == k6-2 ]]; then - filter-flags -fomit-frame-pointer - fi - - # The config files are installed correctly (e.g. povray.conf), - # but the code compiles using incorrect [default] paths - # (based on /usr/local...), so povray will not find the system - # config files without the following fix: - append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\" - - if ! use tiff ; then - non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes" - else - non_redist_conf="" - fi - - local myeconfargs=( - ${non_redist_conf} - COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" - $(use_enable debug) - $(use_enable io-restrictions) - $(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)") - $(use_with mkl libmkl "${EPREFIX}/usr/$(get_libdir)") - $(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") - $(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") - $(use_with X x "${EPREFIX}/usr/$(get_libdir)") - --disable-pipe - --disable-strip - --disable-optimiz - --disable-optimiz-arch - ) - autotools-utils_src_configure -} - -src_test() { - # For the beta releases, we generate a license extension in case needed - VIRTUALX_COMMAND="autotools-utils_src_test" - virtualmake -} - -pkg_preinst() { - # Copy the old config files if they are in the old location - # but do not yet exist in the new location. - # This way, they can be treated by CONFIG_PROTECT as normal. - for conf_file in $(ls "${ED}/etc/${PN}"); do - if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then - for version_dir in $(ls "${EROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do - if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then - mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}" - elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/" - break - fi - done - fi - done -} diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest new file mode 100644 index 000000000000..90d6bb2a4348 --- /dev/null +++ b/media-gfx/svg2rlg/Manifest @@ -0,0 +1 @@ +DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12 diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml new file mode 100644 index 000000000000..dbcb64c74ba2 --- /dev/null +++ b/media-gfx/svg2rlg/metadata.xml @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>nerdboy@gentoo.org</email> + <name>Steve Arnold</name> + </maintainer> + <longdescription lang="en"> + A tool to convert from SVG to reportlab graphics objects. + </longdescription> + <upstream> + <remote-id type="github">sarnold/svg2rlg</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild new file mode 100644 index 000000000000..050ab1e7959d --- /dev/null +++ b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Converts SVG files to PDFs or reportlab graphics" +HOMEPAGE="https://github.com/sarnold/svg2rlg https://pypi.python.org/pypi/svg2rlg/" + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/sarnold/svg2rlg.git" + EGIT_BRANCH="master" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" + +RDEPEND="${PYTHON_DEPS}" + +DEPEND="${PYTHON_DEPS} + dev-python/reportlab[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] ) +" + +RESTRICT="!test? ( test )" + +python_test() { + nosetests -sx test_svg2rlg.py || die "Test failed with ${EPYTHON}" +} diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild index 54c07b3a5c24..1584bac1d1c0 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild +++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" RDEPEND=" app-text/libpaper diff --git a/media-gfx/utsushi/Manifest b/media-gfx/utsushi/Manifest index a4f4ce2746c0..e7455c63c8dc 100644 --- a/media-gfx/utsushi/Manifest +++ b/media-gfx/utsushi/Manifest @@ -1,3 +1 @@ -AUX utsushi-9999-boost.patch 2322 BLAKE2B 3c0ed2966897e8610ed90dc7f27d6648535b64628b33cc799874f18dac45335c37c2c9ac175d5744e9d7c4448575fa9023a30bf64fccedd98541dea862d10265 SHA512 8cbc2605135b0d730340b9365612d7cea5f22eabd77e200a1ff0371e3d4dd63606974efdee6ac3688d18ecd423ae5881e635e374009499ccd127b7caf1a13d01 -AUX utsushi-9999-magick-pp.patch 1038 BLAKE2B 80cc535640dc51b914604599a64d3da9ba349288cecaf8da5f50bca6650109f9d947526440e8b7bed552bd8510d6ab861252ab244abf9032bc4f3fe4a7536e96 SHA512 9ddb87ec5bccce55e08eaa47ba4d609aa0f9b095ef68c3898197b6d4e1b221693b19237292645b910dd73d66b849a38c46b2f668443eb3c8c2c9a6af5172a6aa -EBUILD utsushi-9999.ebuild 2765 BLAKE2B 3b115472bb315b468be665fe36daaf1dc016dd4f8fa490ac1177bcb9a3e015bc609de46bbaba844249a319a8424a8d82b30f4adc399c576112c7f8b6c4f8da13 SHA512 5271abc5e6ad77d36ba57de9ebe9ee393c467518b495527624781d36a0bf17f07797d23eec03c02ad743430779ad1cd370dd5333c77c234496842e2be964ab34 +DIST utsushi-20210116.tar.gz 5977031 BLAKE2B 0461cd2148cf1b7f41641f5b23994ac755743ca312c02519c03c33c762b5b967e1dadcd2a2d46a96c23023c5e3846bd8b99ea2e388a2cfd3d627d5133f1f1e4d SHA512 0dd798593e82b4308fa9b01920061dc3f91cfb0383b6061430b68700928a13cc1719d289e95fa375647bccb059a6a95b83d99eed080cd2ef8d1f383b71627bea diff --git a/media-gfx/utsushi/files/utsushi-9999-boost-1.73.patch b/media-gfx/utsushi/files/utsushi-9999-boost-1.73.patch new file mode 100644 index 000000000000..da6cc66c13be --- /dev/null +++ b/media-gfx/utsushi/files/utsushi-9999-boost-1.73.patch @@ -0,0 +1,44 @@ +diff -urN a/drivers/esci/verify.cpp b/drivers/esci/verify.cpp +--- a/drivers/esci/verify.cpp 2019-11-18 04:08:45.000000000 +0200 ++++ b/drivers/esci/verify.cpp 2020-05-09 20:22:00.899968638 +0300 +@@ -58,6 +58,7 @@ + + using namespace utsushi; + using namespace _drv_::esci; ++using namespace boost::placeholders; + + using std::basic_string; + using std::ios_base; +diff -urN a/lib/monitor.cpp b/lib/monitor.cpp +--- a/lib/monitor.cpp 2019-11-18 04:08:08.000000000 +0200 ++++ b/lib/monitor.cpp 2020-05-09 20:22:26.392174029 +0300 +@@ -49,6 +49,7 @@ + namespace utsushi { + + using boost::filesystem::exists; ++using namespace boost::placeholders; + + class monitor::impl + { +diff -urN a/sane/handle.cpp b/sane/handle.cpp +--- a/sane/handle.cpp 2019-11-18 04:08:08.000000000 +0200 ++++ b/sane/handle.cpp 2020-05-09 20:21:49.559223712 +0300 +@@ -65,6 +65,7 @@ + using utsushi::_flt_::deskew; + using utsushi::_flt_::autocrop; + using utsushi::_flt_::pnm; ++using namespace boost::placeholders; + + namespace sane { + +--- utsushi-0.62.0/gtkmm/pump.cpp.orig 2019-11-18 03:08:48.000000000 +0100 ++++ utsushi-0.62.0/gtkmm/pump.cpp 2020-05-10 21:59:32.986379049 +0200 +@@ -31,6 +31,8 @@ + namespace utsushi { + namespace gtkmm { + ++using namespace boost::placeholders; ++ + pump::pump (idevice::ptr idev) + : utsushi::pump (idev) + , idev_ptr_(idev) diff --git a/media-gfx/utsushi/files/utsushi-9999-boost.patch b/media-gfx/utsushi/files/utsushi-9999-boost.patch deleted file mode 100644 index 84a0e78f426f..000000000000 --- a/media-gfx/utsushi/files/utsushi-9999-boost.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/bootstrap b/bootstrap -index 56c68a7..ba910e7 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -209,7 +209,7 @@ fi - # not diagnosed by autoreconf itself (or could use some extra help - # explaining what to do in those cases). - --if grep AX_BOOST configure >/dev/null 2>&1; then -+if ! grep AX_BOOST configure >/dev/null 2>&1; then - cat <<EOF - It seems 'aclocal' could not find the autoconf macros for the Boost - library. These macros are available in the 'autoconf-archive'. If -@@ -233,50 +233,6 @@ EOF - exit 1 - fi - --# Patch up AX_BOOST_BASE to suit our purposes --# While recent versions do support the ACTION-IF-[NOT-]FOUND API, --# they still produce a way too verbose message for the case where --# we can fall back to our included Boost sources. --# Older versions did not support the ACTION-IF-[NOT-]FOUND API. -- --serial=`awk '/^#serial/{ if ($2>26) print $2 }' $macro_dir/ax_boost_base.m4` --if test -n "$serial"; then -- cat <<EOF >&2 --It seems there is a new AX_BOOST_BASE macro version out there. The --local patching that follows has not been tested on this version, so --there may be trouble ahead. If everything went fine for you please --update the serial number used for this check in $0. -- --When doing so, also check if our patch is still correct/necessary. --EOF --fi --sed -i 's/\(-VERSION\]\))/\1, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])/' \ -- $macro_dir/ax_boost_base.m4 --sed -i '/"$succeeded" != "yes"/q' $macro_dir/ax_boost_base.m4 --sed -i '/"$succeeded" != "yes"/d' $macro_dir/ax_boost_base.m4 --cat <<EOF >> $macro_dir/ax_boost_base.m4 -- if test "\$succeeded" != "yes" ; then -- if test "\$_version" = "0" ; then -- AC_MSG_RESULT([no]) -- else -- AC_MSG_RESULT([too old (\$_version)]) -- fi -- # execute ACTION-IF-NOT-FOUND (if present): -- ifelse([\$3], , :, [\$3]) -- else -- AC_SUBST(BOOST_CPPFLAGS) -- AC_SUBST(BOOST_LDFLAGS) -- AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) -- # execute ACTION-IF-FOUND (if present): -- ifelse([\$2], , :, [\$2]) -- fi -- -- CPPFLAGS="\$CPPFLAGS_SAVED" -- LDFLAGS="\$LDFLAGS_SAVED" --fi -- --]) --EOF - autoreconf # sync build infra-structure - - # Make sure the top-level config.h and its dependencies can be found diff --git a/media-gfx/utsushi/files/utsushi-9999-configure.patch b/media-gfx/utsushi/files/utsushi-9999-configure.patch deleted file mode 100644 index 89e7c0dd6b7d..000000000000 --- a/media-gfx/utsushi/files/utsushi-9999-configure.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u utsushi-9999/configure.ac utsushi-9999-patched/configure.ac ---- utsushi-9999/configure.ac 2018-06-02 21:12:44.745999644 +0200 -+++ utsushi-9999-patched/configure.ac 2018-06-02 21:14:07.844308412 +0200 -@@ -201,7 +201,7 @@ - - dnl checks for programs, modules and libraries - --AM_INIT_AUTOMAKE([1.11.2 gnu tar-ustar -Wall -Werror std-options nostdinc subdir-objects]) -+AM_INIT_AUTOMAKE([1.11.2 gnu tar-ustar -Wall std-options nostdinc subdir-objects]) - AM_MAINTAINER_MODE([enable]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -@@ -612,8 +612,8 @@ - ['-I$(top_builddir) $(BOOST_CPPFLAGS)'])]) - - # Check if we can assume whether All Warnings Are Really Errors --AS_IF([test xyes = x$ac_cv_cxx_compiler_gnu], -- [gcc_AWARE=-Werror]) -+#AS_IF([test xyes = x$ac_cv_cxx_compiler_gnu], -+# [gcc_AWARE=-Werror]) - - AC_SUBST([AM_CXXFLAGS], ["-Wall $gcc_AWARE $code_coverage_cxxflags"]) - AC_SUBST([AM_LDFLAGS], [""]) diff --git a/media-gfx/utsushi/files/utsushi-9999-magick-pp.patch b/media-gfx/utsushi/files/utsushi-9999-magick-pp.patch deleted file mode 100644 index b87075e1e643..000000000000 --- a/media-gfx/utsushi/files/utsushi-9999-magick-pp.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/filters/doc-locate.cpp b/filters/doc-locate.cpp -index 4b09b29..4508274 100644 ---- a/filters/doc-locate.cpp -+++ b/filters/doc-locate.cpp -@@ -260,17 +260,17 @@ public: - clone.rotate (deskew_angle ()); - - Magick::Geometry rv = bbox (clone); -- if (HAVE_IMAGE_MAGICK_PP) -- { -- if (clone.page ().xNegative ()) -- rv.xOff (rv.xOff () - clone.page ().xOff()); -- else -- rv.xOff (rv.xOff () + clone.page ().xOff()); -- if (clone.page ().yNegative ()) -- rv.yOff (rv.yOff () - clone.page ().yOff()); -- else -- rv.yOff (rv.yOff () + clone.page ().yOff()); -- } -+ /*if (HAVE_IMAGE_MAGICK_PP) -+ *{ -+ * if (clone.page ().xNegative ()) -+ * rv.xOff (rv.xOff () - clone.page ().xOff()); -+ * else -+ * rv.xOff (rv.xOff () + clone.page ().xOff()); -+ * if (clone.page ().yNegative ()) -+ * rv.yOff (rv.yOff () - clone.page ().yOff()); -+ * else -+ * rv.yOff (rv.yOff () + clone.page ().yOff()); -+ }*/ - return scale (rv); - } - diff --git a/media-gfx/utsushi/utsushi-9999.ebuild b/media-gfx/utsushi/utsushi-20210116.ebuild index ce10520fd892..abc6cbd91511 100644 --- a/media-gfx/utsushi/utsushi-9999.ebuild +++ b/media-gfx/utsushi/utsushi-20210116.ebuild @@ -1,16 +1,18 @@ +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools eutils git-r3 multilib toolchain-funcs +inherit autotools eutils multilib toolchain-funcs udev +COMMIT="ab7063358c9819dd37129c6ba58da1009302bdd7" DESCRIPTION="SANE backend driver for newer Epson scanners (DS, ET, PX, etc)" -HOMEPAGE="https://github.com/utsushi/utsushi" -EGIT_REPO_URI="https://github.com/utsushi/utsushi.git" +HOMEPAGE="https://gitlab.com/utsushi/utsushi" +SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~x86 ~x64" +KEYWORDS="~x86 amd64" IUSE="gtk jpeg +network nls openmp tiff udev" # These are needed by utsushi's 'bootstrap': @@ -21,24 +23,14 @@ IUSE="gtk jpeg +network nls openmp tiff udev" # sys-devel/gettext # sys-devel/libtool # sys-devel/patch -# -# NOTE: -# Utsushi fails to build with GCC >= 8.0 -# Utsushi fails to build with libusb >= 1.0.22 -# ImageMagick is now a hard dependency. See: -# https://github.com/utsushi/utsushi/issues/58 DEPEND=" - dev-libs/gnulib sys-devel/autoconf-archive sys-devel/autoconf-wrapper sys-devel/automake-wrapper sys-devel/gettext - sys-devel/libtool - sys-devel/patch media-gfx/imagemagick media-gfx/sane-backends - <sys-devel/gcc-8 - <=dev-libs/libusb-1.0.22 + >=dev-libs/libusb-1.0.22 >=dev-libs/boost-1.50.0 gtk? ( dev-cpp/gtkmm:2.4 ) jpeg? ( virtual/jpeg:0 ) @@ -52,32 +44,18 @@ RDEPEND=" " PATCHES=( - # AX_BOOST_BASE does not need to be patched - "${FILESDIR}/${PF}-boost.patch" - - # ImageMagick >= 7 removed various *_MAGICK_PP api's, which are possibly - # not needed. See: https://github.com/utsushi/utsushi/issues/43 - "${FILESDIR}/${PF}-magick-pp.patch" - - # Disable Werror in configure - "${FILESDIR}/${PF}-configure.patch" + # Fixes building on boost 1.73 + # https://bugs.gentoo.org/721696 + "${FILESDIR}/${PN}-9999-boost-1.73.patch" ) -pkg_setup() { - # Ensure GCC <= 8 is used, as a user may have a lower version installed - # but is currently set to use GCC >= 8 - if (( $(gcc-major-version) >= 8 )); then - eerror - eerror "'${PN}' does not currently compile with >=sys-devel/gcc-8.0.0" - eerror "Use 'gcc-config' to set GCC to a lower version" - eerror - die - fi -} +S="${WORKDIR}/${PN}-${COMMIT}" src_prepare() { default + sed -i "s/m4_esyscmd_s(\[git describe --always\])/${PV}/" ${S}/configure.ac + # utsushi requires using this bootstrap wrapper in lieu of autotools ${S}/bootstrap || die @@ -88,9 +66,9 @@ src_prepare() { src_configure() { econf \ + --with-boost-system \ --with-sane \ --with-sane-confdir="${EPREFIX}"/etc/sane.d \ - --with-boost=yes \ --with-magick \ --with-magick-pp \ $(use_with gtk gtkmm) \ @@ -99,6 +77,6 @@ src_configure() { $(use_enable openmp) \ $(use_with tiff) \ $(use_enable udev udev-config) \ - $(use_with udev udev-confdir "${EPREFIX}"/$(get_libdir)/udev) + $(use_with udev udev-confdir "$(get_udevdir)") + #$(use_with udev udev-confdir "${EPREFIX}"/lib/udev) } - diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest deleted file mode 100644 index ecedd947ff22..000000000000 --- a/media-gfx/wkhtmltopdf/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wkhtmltopdf-0.12.5.tar.gz 511181 BLAKE2B f52d56fd932dfa514cc2711d22f99ea29960a3c4da2522be9f58f3197cb12494f1cdc8856399e328cfc39956282b8174886ee8edfc7417ba5c5d65ea353f6046 SHA512 3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb diff --git a/media-gfx/wkhtmltopdf/metadata.xml b/media-gfx/wkhtmltopdf/metadata.xml deleted file mode 100644 index 6fae1b92ff2a..000000000000 --- a/media-gfx/wkhtmltopdf/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">wkhtmltopdf/wkhtmltopdf</remote-id> - </upstream> - <origin>gentoo-staging</origin> -</pkgmetadata> diff --git a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild deleted file mode 100644 index 3fb400e2f185..000000000000 --- a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="Convert html to pdf (and various image formats) using webkit" -HOMEPAGE="https://wkhtmltopdf.org/ https://github.com/wkhtmltopdf/wkhtmltopdf/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5[printsupport] - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND} - dev-qt/qtxmlpatterns:5 -" - -src_prepare() { - default - sed -i "s:\(INSTALLBASE/\)lib:\1$(get_libdir):" src/lib/lib.pro || die -} - -src_configure() { - eqmake5 INSTALLBASE=/usr -} - -src_install() { - emake INSTALL_ROOT="${D}" install - use examples && dodoc -r examples - einstalldocs -} diff --git a/media-gfx/xpaint/xpaint-2.10.2.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild index 17706384f2e8..2351497166aa 100644 --- a/media-gfx/xpaint/xpaint-2.10.2.ebuild +++ b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit desktop toolchain-funcs DESCRIPTION="Image editor with tiff, jpeg and png support" @@ -11,7 +12,8 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="jpeg2k pgf tiff" +IUSE="pgf tiff" +# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592 RDEPEND=" media-libs/fontconfig @@ -26,17 +28,17 @@ RDEPEND=" x11-libs/libXpm x11-libs/libXt sys-libs/zlib - virtual/jpeg:0 - jpeg2k? ( media-libs/openjpeg:0= ) + media-libs/libjpeg-turbo:= pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0= media-libs/tiff:0 ) " -DEPEND="${RDEPEND} - sys-devel/flex +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/bison + sys-devel/flex virtual/pkgconfig " @@ -48,7 +50,7 @@ src_prepare() { src_configure() { econf \ $(use_enable tiff) \ - $(use_enable jpeg2k libopenjpeg) + --disable-libopenjpeg } src_compile() { |