commit: b7f52b07c80d42966ec7e30eb0ad1cfebc4ba74b Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Jun 23 20:12:20 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jun 23 20:12:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f52b07
media-gfx/xsane: update EAPI 6 -> 8 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-gfx/xsane/Manifest | 2 +- ...xsane-0.999-r3.ebuild => xsane-0.999-r4.ebuild} | 34 +++++++++------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest index 126cfe38ffea..9a07937bd68d 100644 --- a/media-gfx/xsane/Manifest +++ b/media-gfx/xsane/Manifest @@ -1,3 +1,3 @@ -DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f +DIST xsane-0.998-patches-3.tar.xz 54480 BLAKE2B 8c77bf0304e60114fa964e337640b61e7c353a6b6f9ad5bc3c87fd5324440b27e58a45aef7df2f16d5faa63692b9f8b22cca7d5dbf21dd6a1cac8572e668cf65 SHA512 e0a85e536502fef66526f12d7607381d07a2a53953f200b298afd1225f85657dfa3550f37b1ee7827739cb2b00333ab926a146c6424ec2543b691f0945300b68 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5 diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild b/media-gfx/xsane/xsane-0.999-r4.ebuild similarity index 68% rename from media-gfx/xsane/xsane-0.999-r3.ebuild rename to media-gfx/xsane/xsane-0.999-r4.ebuild index a6324b3b8c28..78d35099cfd2 100644 --- a/media-gfx/xsane/xsane-0.999-r3.ebuild +++ b/media-gfx/xsane/xsane-0.999-r4.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools desktop epatch strip-linguas toolchain-funcs +inherit autotools desktop strip-linguas toolchain-funcs DESCRIPTION="Graphical scanning frontend" HOMEPAGE="http://www.xsane.org/"; SRC_URI=" http://www.xsane.org/download/${P}.tar.gz - https://dev.gentoo.org/~dilfridge/distfiles/${PN}-0.998-patches-2.tar.xz + https://dev.gentoo.org/~soap/distfiles/${PN}-0.998-patches-3.tar.xz https://dev.gentoo.org/~pacho/${PN}/${PN}-256x256.png " @@ -22,17 +22,15 @@ RDEPEND=" media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) gimp? ( media-gfx/gimp:0/2 ) lcms? ( media-libs/lcms:2 ) " PDEPEND="ocr? ( app-text/gocr )" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default @@ -40,25 +38,23 @@ src_prepare() { strip-linguas -i po/ #609672 # Apply multiple fixes from different distributions - # Drop included patch and reuse patchset from prior version - rm "${WORKDIR}/${PN}-0.998-patches-2"/005-update-param-crash.patch || die - epatch "${WORKDIR}/${PN}-0.998-patches-2"/*.patch + eapply "${WORKDIR}/${PN}-0.998-patches-3"/ # Fix compability with libpng15 wrt #377363 sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die # Fix AR calling directly (bug #442606) sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die - tc-export AR # Add support for lcms-2 (from Fedora) eapply "${FILESDIR}/${PN}-0.999-lcms2.patch" - mv configure.in configure.ac || die AT_M4DIR="m4" eautoreconf } src_configure() { + tc-export AR + econf \ --enable-gtk2 \ $(use_enable nls) \ @@ -76,15 +72,13 @@ src_install() { # link xsane so it is seen as a plugin in gimp if use gimp; then - local plugindir - local gimptool=( "${EPREFIX}"/usr/bin/gimptool* ) + local plugindir gimptool=( "${ESYSROOT}"/usr/bin/gimptool* ) if [[ ${#gimptool[@]} -gt 0 ]]; then plugindir="$("${gimptool[0]}" --gimpplugindir)/plug-ins" else die "Can't find GIMP plugin directory." fi - mkdir -p "${D}${plugindir}" || die - ln -s ../../../../bin/xsane "${D}${plugindir}"/xsane || die + dosym -r /usr/bin/xsane "${plugindir}"/xsane fi newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png
