From 1fbaf1314579f2155166bebd1ddfe6131d400807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Jan 2024 06:56:53 +0000 Subject: gentoo auto-resync : 08:01:2024 - 06:56:53 --- media-gfx/Manifest.gz | Bin 37684 -> 37686 bytes media-gfx/xsane/Manifest | 4 +- media-gfx/xsane/metadata.xml | 3 -- media-gfx/xsane/xsane-0.999-r5.ebuild | 91 ---------------------------------- media-gfx/xsane/xsane-0.999-r6.ebuild | 90 +++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 96 deletions(-) delete mode 100644 media-gfx/xsane/xsane-0.999-r5.ebuild create mode 100644 media-gfx/xsane/xsane-0.999-r6.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index dd49037a4850..ba792de9ce93 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest index 92b2af399db0..811351d4c565 100644 --- a/media-gfx/xsane/Manifest +++ b/media-gfx/xsane/Manifest @@ -3,5 +3,5 @@ AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a 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 -EBUILD xsane-0.999-r5.ebuild 2120 BLAKE2B 87b5ac88788256a19612c28670ed2d073daaf13c154255580c42204466625c31734244266a30bddfc028deb2cd4a83c0b17af0f5b080c60b4949a92aaffcef59 SHA512 8377c831b80593d9c9b6948c6afaff0ae93a3c9943ab5d70c01428c76ce2288225e3127e85327f934a06193294204f2c095d6f43740be3a937bf1ae33164a719 -MISC metadata.xml 371 BLAKE2B 2816d22902bed33d3af4bc8df476953a4bfd8e4f08411d2da60af273c966ffe692f155eaaf5cfb8dc79b78d0f82ef117cabdf1e315b051cbe216fe451da98400 SHA512 2def02aa540182ef68f99c7c327b1f6607ff6cb151bb44e232338549da82ef5b60d7096ad6212f4fd6d7aeb93063dca9ca994bec95fcfe0133e674e4ec5b6922 +EBUILD xsane-0.999-r6.ebuild 2083 BLAKE2B 2b968aeb3aa061e73249596b89c18e86e0d4778a63d47b9b559f4368fc5b4ef43942d3782087d6ab72545d6915e148e0bc85d2335fad419ca61ef23af4b38c57 SHA512 59d658c428472be0f7efc7710ec2ec6ae167bf87f26791a3d31162c70cf64124341bae96bc3439d71d60690325bdaad8fc24786df0688c7182f6ab9aad4ff2a7 +MISC metadata.xml 270 BLAKE2B 09229da5990760035496e9713f1cc329ea7132567d225f460228a0a8dce57c412f1a8227e4520be9c8704ea225dc0020706f8bae8a40ccb3dd0a88ceb15934bc SHA512 3fcf9353f1df5792aa59097099cd6138bc2b0227b35dbe630956fdc47300afe9e4d7a07eec76b1791148631e298540f4b2ad2b7a0242dd9803e557f19f9de304 diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml index ebdf9916c6ef..e030db6bbbd6 100644 --- a/media-gfx/xsane/metadata.xml +++ b/media-gfx/xsane/metadata.xml @@ -5,7 +5,4 @@ printing@gentoo.org Gentoo Printing Project - - Enable support for Optical Character Recognition reader - diff --git a/media-gfx/xsane/xsane-0.999-r5.ebuild b/media-gfx/xsane/xsane-0.999-r5.ebuild deleted file mode 100644 index 351830dee66a..000000000000 --- a/media-gfx/xsane/xsane-0.999-r5.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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/~soap/distfiles/${PN}-0.998-patches-3.tar.xz - https://dev.gentoo.org/~pacho/${PN}/${PN}-256x256.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="nls jpeg png tiff gimp lcms ocr" - -DEPEND=" - dev-libs/glib:2 - media-gfx/sane-backends - sys-libs/zlib - x11-libs/gtk+:2 - x11-misc/xdg-utils - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( media-libs/libpng:= ) - tiff? ( media-libs/tiff:= ) - gimp? ( media-gfx/gimp:0/2 ) - lcms? ( media-libs/lcms:2 ) -" -RDEPEND="${DEPEND}" -PDEPEND="ocr? ( app-text/gocr )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - # Apply multiple fixes from different distributions - "${WORKDIR}"/${PN}-0.998-patches-3 - # Add support for lcms-2 (from Fedora) - "${FILESDIR}"/${PN}-0.999-lcms2.patch - # See bug #885311 and bug #899806 - "${FILESDIR}"/${PN}-0.999-configure-clang16.patch -) - -src_prepare() { - default - - # bug #609672 - strip-linguas -i po/ - - # Fix compability with libpng15 (bug #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 - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - tc-export AR - - econf \ - --enable-gtk2 \ - $(use_enable nls) \ - $(use_enable jpeg) \ - $(use_enable png) \ - $(use_enable tiff) \ - $(use_enable gimp) \ - $(use_enable lcms) -} - -src_install() { - default - - dodoc xsane.* - - # link xsane so it is seen as a plugin in gimp - if use gimp; then - 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 - dosym -r /usr/bin/xsane "${plugindir}"/xsane - fi - - newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png -} diff --git a/media-gfx/xsane/xsane-0.999-r6.ebuild b/media-gfx/xsane/xsane-0.999-r6.ebuild new file mode 100644 index 000000000000..e3d64fd75818 --- /dev/null +++ b/media-gfx/xsane/xsane-0.999-r6.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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/~soap/distfiles/${PN}-0.998-patches-3.tar.xz + https://dev.gentoo.org/~pacho/${PN}/${PN}-256x256.png +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="nls jpeg png tiff gimp lcms" + +DEPEND=" + dev-libs/glib:2 + media-gfx/sane-backends + sys-libs/zlib + x11-libs/gtk+:2 + x11-misc/xdg-utils + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) + gimp? ( media-gfx/gimp:0/2 ) + lcms? ( media-libs/lcms:2 ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # Apply multiple fixes from different distributions + "${WORKDIR}"/${PN}-0.998-patches-3 + # Add support for lcms-2 (from Fedora) + "${FILESDIR}"/${PN}-0.999-lcms2.patch + # See bug #885311 and bug #899806 + "${FILESDIR}"/${PN}-0.999-configure-clang16.patch +) + +src_prepare() { + default + + # bug #609672 + strip-linguas -i po/ + + # Fix compability with libpng15 (bug #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 + + AT_M4DIR="m4" eautoreconf +} + +src_configure() { + tc-export AR + + econf \ + --enable-gtk2 \ + $(use_enable nls) \ + $(use_enable jpeg) \ + $(use_enable png) \ + $(use_enable tiff) \ + $(use_enable gimp) \ + $(use_enable lcms) +} + +src_install() { + default + + dodoc xsane.* + + # link xsane so it is seen as a plugin in gimp + if use gimp; then + 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 + dosym -r /usr/bin/xsane "${plugindir}"/xsane + fi + + newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png +} -- cgit v1.2.3