[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/, profiles/base/

2024-01-07 Thread John Helmert III 
commit: d7641dde7890255c203a6888dbcf73b9bf8675a8
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jan  8 03:31:41 2024 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jan  8 03:34:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7641dde

media-gfx/xsane: drop ocr USE flag and associated mask

app-text/gocr is removed.

Signed-off-by: John Helmert III  gentoo.org>

 media-gfx/xsane/metadata.xml | 3 ---
 media-gfx/xsane/{xsane-0.999-r5.ebuild => xsane-0.999-r6.ebuild} | 5 ++---
 profiles/base/package.use.mask   | 4 
 3 files changed, 2 insertions(+), 10 deletions(-)

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 @@
 print...@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-r6.ebuild
similarity index 94%
rename from media-gfx/xsane/xsane-0.999-r5.ebuild
rename to media-gfx/xsane/xsane-0.999-r6.ebuild
index 351830dee66a..e3d64fd75818 100644
--- a/media-gfx/xsane/xsane-0.999-r5.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 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"
+IUSE="nls jpeg png tiff gimp lcms"
 
 DEPEND="
dev-libs/glib:2
@@ -31,7 +31,6 @@ DEPEND="
lcms? ( media-libs/lcms:2 )
 "
 RDEPEND="${DEPEND}"
-PDEPEND="ocr? ( app-text/gocr )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4a0351abdaef..628183019dce 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -21,10 +21,6 @@ sys-devel/sparse llvm
 # https://gcc.gnu.org/PR113056
 >=sys-devel/gcc-14.0.0_pre20231217 rust
 
-# John Helmert III  (2023-11-25)
-# app-text/gocr has been masked for removal, bug #824290
-media-gfx/xsane ocr
-
 # Takuya Wakazono  (2023-11-21)
 # app-crypt/rpm-sequoia is not keyworded on most architectures.
 app-arch/rpm sequoia

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/, media-gfx/xsane/files/

2023-03-18 Thread Sam James 
commit: f3b5822bf70361e15208f95f832357fe7317e45b
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 19 02:50:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 19 02:50:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b5822b

media-gfx/xsane: fix configure w/ clang 16

Closes: https://bugs.gentoo.org/885311
Closes: https://bugs.gentoo.org/899806
Signed-off-by: Sam James  gentoo.org>

 .../files/xsane-0.999-configure-clang16.patch  | 12 ++
 ...xsane-0.999-r4.ebuild => xsane-0.999-r5.ebuild} | 28 +-
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch 
b/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch
new file mode 100644
index ..0e0ee342a3de
--- /dev/null
+++ b/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/885311
+https://bugs.gentoo.org/899806
+--- a/m4/sane.m4
 b/m4/sane.m4
+@@ -44,6 +44,7 @@ dnl
+   AC_TRY_RUN([
+ #include 
+ #include 
++#include 
+ 
+ int 
+ main ()

diff --git a/media-gfx/xsane/xsane-0.999-r4.ebuild 
b/media-gfx/xsane/xsane-0.999-r5.ebuild
similarity index 83%
rename from media-gfx/xsane/xsane-0.999-r4.ebuild
rename to media-gfx/xsane/xsane-0.999-r5.ebuild
index 78d35099cfd2..351830dee66a 100644
--- a/media-gfx/xsane/xsane-0.999-r4.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,8 +18,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
-RDEPEND="
+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:= )
@@ -28,27 +30,31 @@ RDEPEND="
gimp? ( media-gfx/gimp:0/2 )
lcms? ( media-libs/lcms:2 )
 "
+RDEPEND="${DEPEND}"
 PDEPEND="ocr? ( app-text/gocr )"
-DEPEND="${RDEPEND}"
 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
 
-   strip-linguas -i po/ #609672
+   # bug #609672
+   strip-linguas -i po/
 
-   # Apply multiple fixes from different distributions
-   eapply "${WORKDIR}/${PN}-0.998-patches-3"/
-
-   # Fix compability with libpng15 wrt #377363
+   # 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
 
-   # Add support for lcms-2 (from Fedora)
-   eapply "${FILESDIR}/${PN}-0.999-lcms2.patch"
-
AT_M4DIR="m4" eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2022-06-23 Thread David Seifert 
commit: b7f52b07c80d42966ec7e30eb0ad1cfebc4ba74b
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jun 23 20:12:20 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jun 23 20:12:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f52b07

media-gfx/xsane: update EAPI 6 -> 8

Signed-off-by: David Seifert  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"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2021-06-30 Thread Ulrich Müller 
commit: cee2c5ac0790b65a49b4d6078f8774ad93d1
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 28 10:03:57 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun 30 10:15:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee2c5a5

media-gfx/xsane: Update inherit from l10n to strip-linguas

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 media-gfx/xsane/xsane-0.999-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild 
b/media-gfx/xsane/xsane-0.999-r3.ebuild
index f6c40655879..a6324b3b8c2 100644
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools desktop epatch l10n toolchain-funcs
+inherit autotools desktop epatch strip-linguas toolchain-funcs
 
 DESCRIPTION="Graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/";

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2020-11-15 Thread Michał Górny 
commit: a4c4394579b56009954e476af1ba3f5fa1ad58d8
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 15 09:45:44 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 15 10:12:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c43945

media-gfx/xsane: Use relative symlink, fix ugly shell code

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/xsane/xsane-0.999-r3.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild 
b/media-gfx/xsane/xsane-0.999-r3.ebuild
index 21fc69c4858..08d3756194f 100644
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -76,14 +76,14 @@ src_install() {
# link xsane so it is seen as a plugin in gimp
if use gimp; then
local plugindir
-   local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1)
-   if [ -n "${gimptool}" ]; then
-   plugindir="$(${gimptool} --gimpplugindir)/plug-ins"
+   local gimptool=( "${EPREFIX}"/usr/bin/gimptool* )
+   if [[ ${#gimptool[@]} -gt 0 ]]; then
+   plugindir="$("${gimptool[0]}" --gimpplugindir)/plug-ins"
else
die "Can't find GIMP plugin directory."
fi
-   dodir "${plugindir#${EPREFIX}}"
-   dosym "${EPREFIX}/usr/bin/xsane" "${plugindir#${EPREFIX}}"/xsane
+   mkdir -p "${D}${plugindir}" || die
+   ln -s ../../../../bin/xsane "${D}${plugindir}"/xsane || die
fi
 
newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2020-11-08 Thread Sam James 
commit: d4e24ca4e1d0587c85126df916c1e12e9dde9c4f
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  8 12:50:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  8 12:50:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e24ca4

media-gfx/xsane: fix AbsoluteSymlink

I don't see an easy way (right now) to figure out
how deep the GIMP path will be, so let's do this instead.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-gfx/xsane/xsane-0.999-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild 
b/media-gfx/xsane/xsane-0.999-r3.ebuild
index c3854c395cb..21fc69c4858 100644
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -83,7 +83,7 @@ src_install() {
die "Can't find GIMP plugin directory."
fi
dodir "${plugindir#${EPREFIX}}"
-   dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"/xsane
+   dosym "${EPREFIX}/usr/bin/xsane" "${plugindir#${EPREFIX}}"/xsane
fi
 
newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2020-11-08 Thread Sam James 
commit: 3057bc70ef1432f06e354328263ac38dd45c2363
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Nov  4 22:21:19 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  8 11:53:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3057bc70

media-gfx/xsane: switch media-gfx/gimp-2.10 to SLOT="0/2"

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/xsane/{xsane-0.999-r2.ebuild => xsane-0.999-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild 
b/media-gfx/xsane/xsane-0.999-r3.ebuild
similarity index 98%
rename from media-gfx/xsane/xsane-0.999-r2.ebuild
rename to media-gfx/xsane/xsane-0.999-r3.ebuild
index 6d380c05701..c3854c395cb 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
png? ( media-libs/libpng:0= )
tiff? ( media-libs/tiff:0 )
-   gimp? ( media-gfx/gimp )
+   gimp? ( media-gfx/gimp:0/2 )
lcms? ( media-libs/lcms:2 )
 "
 PDEPEND="ocr? ( app-text/gocr )"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/files/

2020-10-15 Thread Lars Wendler 
commit: 246d53d0ea28e680beed6dba9823a119b1ee349b
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct 15 22:25:36 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct 15 22:29:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246d53d0

media-gfx/xsane: Make lcms2 patch POSIX sh compliant

Thanks-to: Nico R.  gmx.net>
Closes: https://bugs.gentoo.org/723516
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/xsane/files/xsane-0.999-lcms2.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/xsane/files/xsane-0.999-lcms2.patch 
b/media-gfx/xsane/files/xsane-0.999-lcms2.patch
index c3d696c28ec..0a98bc8122b 100644
--- a/media-gfx/xsane/files/xsane-0.999-lcms2.patch
+++ b/media-gfx/xsane/files/xsane-0.999-lcms2.patch
@@ -32,10 +32,10 @@ index df7b114..3659c97 100644
 +  if test "${ac_cv_search_cmsOpenProfileFromFile}" != "no"; then
 +AC_DEFINE(HAVE_LIBLCMS, 1, [Define if LCMS is to be used.])
 +  fi
-+  if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms2"; then
++  if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms2"; then
 +AC_DEFINE(HAVE_LIBLCMS2, 1, [Define if you have liblcms2.])
 +  else
-+if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms"; then
++if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms"; then
 +  AC_DEFINE(HAVE_LIBLCMS1, 1, [Define if you have liblcms.])
 +fi
 +  fi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2020-10-11 Thread Sam James 
commit: b964cad399111c20425d80865c5c444dd38a857c
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 11 19:19:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 11 19:19:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b964cad3

media-gfx/xsane: Keyword 0.999-r2 arm64, #747178

Signed-off-by: Sam James  gentoo.org>

 media-gfx/xsane/xsane-0.999-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild 
b/media-gfx/xsane/xsane-0.999-r2.ebuild
index da19a27bb81..6d380c05701 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2020-07-22 Thread Kent Fredric 
commit: 782a754c7a70a3b070ee612024f7afe20b166eec
Author: Kent Fredric  gentoo  org>
AuthorDate: Thu Jul 23 04:50:30 2020 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Thu Jul 23 05:13:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782a754c

media-gfx/xsane: Drop macos prefixes re bug #690140

Depends:
- media-gfx/gimp
 - media-libs/gegl
  - media-video/ffmpeg
   - net-misc/wget
- dev-perl/IO-Socket-SSL

Bug: https://bugs.gentoo.org/690140
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Kent Fredric  gentoo.org>

 media-gfx/xsane/xsane-0.999-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild 
b/media-gfx/xsane/xsane-0.999-r2.ebuild
index 9c0f60ec0b3..da19a27bb81 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2019-02-07 Thread Miroslav Šulc 
commit: 3e06dd4dbcd2bb33f3d75f20c64ea64f105b3afe
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Feb  7 13:31:04 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb  7 13:31:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e06dd4d

media-gfx/xsane-0.999-r2: fixed gimptool handling

Closes: https://bugs.gentoo.org/39
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/xsane/xsane-0.999-r2.ebuild | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild 
b/media-gfx/xsane/xsane-0.999-r2.ebuild
index 65a365cff25..c45649a3a83 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,10 +76,9 @@ src_install() {
# link xsane so it is seen as a plugin in gimp
if use gimp; then
local plugindir
-   if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
-   plugindir="$(gimptool --gimpplugindir)/plug-ins"
-   elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
-   plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+   local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1)
+   if [ -n "${gimptool}" ]; then
+   plugindir="$(${gimptool} --gimpplugindir)/plug-ins"
else
die "Can't find GIMP plugin directory."
fi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2017-02-21 Thread Pacho Ramos 
commit: 1b243247fb3ae98aa27ac13e81a61b09027531bb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Feb 21 19:56:08 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Feb 21 19:57:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b243247

media-gfx/xsane: Dropping from metadata as I am not using this for a long time

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/xsane/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index 29998d79a9..83d97d0e07 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -1,9 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-   pa...@gentoo.org
-
 
 print...@gentoo.org
 Gentoo Printing Project

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2017-02-18 Thread Pacho Ramos 
commit: 1789c04a61a4e13559d1fbd2ca5c6f0abe8ff6f1
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Feb 18 18:49:57 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Feb 18 18:50:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1789c04a

media-gfx/xsane: Don't try to build unavailable linguas, bug #609672 by Chris 
Mansfield

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/xsane/xsane-0.999-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild 
b/media-gfx/xsane/xsane-0.999-r2.ebuild
index e3886389b6..14660e6c81 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
default
 
+   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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2017-02-11 Thread Pacho Ramos 
commit: 6d722fdf3a546676174a1953f125b949b1ad4b5f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Feb 11 12:02:55 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Feb 11 12:03:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d722fdf

media-gfx/xsane: Fix dependencies, bump eapi, use bigger icon for desktop file

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --force

 media-gfx/xsane/Manifest|  1 +
 ...{xsane-0.999-r1.ebuild => xsane-0.999-r2.ebuild} | 21 -
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index cb5d50e419..f5b65dcc72 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,2 +1,3 @@
 DIST xsane-0.998-patches-2.tar.xz 54804 SHA256 
84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c SHA512 
973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
 WHIRLPOOL 
2294601aa696c442e8d2b5173b8ee04d158439e0ae02dd22c7d5c8f9fce98c8238a42e0867a5e511d206dd4030f7a15df2a98676471abe1e91870883662add56
 DIST xsane-0.999.tar.gz 2950621 SHA256 
5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b SHA512 
73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 WHIRLPOOL 
7d50f6ecd8ad671d36a6b92eb365a6361da8d90bfea3136cf7add0890313294903f8cbc75684cbc24e42a028f83922a0308783fb20d89b0d6b14b1f949283ad5
+DIST xsane-256x256.png 18478 SHA256 
cb3f91fda48033734f1ac233fd788313e19522446680113dbc6dc5f5d33e4b16 SHA512 
7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
 WHIRLPOOL 
138c3b657d0527241237540cbe23dc541dff31f691c5971984c5e710cfb658cab301fc9ea6be0dcc609382104dab67dbd4c1bd65d9f8aabf1d04d6974922cf39

diff --git a/media-gfx/xsane/xsane-0.999-r1.ebuild 
b/media-gfx/xsane/xsane-0.999-r2.ebuild
similarity index 85%
rename from media-gfx/xsane/xsane-0.999-r1.ebuild
rename to media-gfx/xsane/xsane-0.999-r2.ebuild
index 26651ddcad..e3886389b6 100644
--- a/media-gfx/xsane/xsane-0.999-r1.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="graphical scanning frontend"
@@ -10,6 +10,7 @@ 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/~pacho/${PN}/${PN}-256x256.png
 "
 
 LICENSE="GPL-2"
@@ -21,21 +22,21 @@ RDEPEND="
media-gfx/sane-backends
x11-libs/gtk+:2
x11-misc/xdg-utils
-   jpeg? ( virtual/jpeg )
-   png? ( media-libs/libpng )
-   tiff? ( media-libs/tiff )
+   jpeg? ( virtual/jpeg:0 )
+   png? ( media-libs/libpng:0= )
+   tiff? ( media-libs/tiff:0 )
gimp? ( media-gfx/gimp )
lcms? ( media-libs/lcms:2 )
 "
-
 PDEPEND="ocr? ( app-text/gocr )"
 
 DEPEND="${RDEPEND}
-   app-arch/xz-utils
virtual/pkgconfig
 "
 
 src_prepare() {
+   default
+
# 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
@@ -49,7 +50,9 @@ src_prepare() {
tc-export AR
 
# Add support for lcms-2 (from Fedora)
-   epatch "${FILESDIR}/${PN}-0.999-lcms2.patch"
+   eapply "${FILESDIR}/${PN}-0.999-lcms2.patch"
+
+   mv configure.in configure.ac || die
AT_M4DIR="m4" eautoreconf
 }
 
@@ -83,5 +86,5 @@ src_install() {
dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"/xsane
fi
 
-   newicon src/xsane-48x48.png ${PN}.png
+   newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/

2015-11-22 Thread Markus Meier 
commit: 58cdf774f389e90d7359cb81ee23295765dadefe
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Nov 22 08:14:53 2015 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Nov 22 08:14:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cdf774

media-gfx/xsane: arm stable, bug #518456

Package-Manager: portage-2.2.25

 media-gfx/xsane/xsane-0.999-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/xsane/xsane-0.999-r1.ebuild 
b/media-gfx/xsane/xsane-0.999-r1.ebuild
index 8ea21fe..26651dd 100644
--- a/media-gfx/xsane/xsane-0.999-r1.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="