subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-gfx\/sane\-backends\/"

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

2024-04-04 Thread Sam James

commit: 70d6d8868c46d5ef8b312552faf4ec463bbb
Author: Eli Schwartz  gmail  com>
AuthorDate: Thu Apr  4 01:57:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 01:20:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d6d886

media-gfx/sane-backends: drop outdated seds from 1.2.1

 * SED: the following did not cause any changes
 * sed 's|@LDFLAGS   ||' -i tools/*.pc.in || die;
 * no-op: -e s|@LDFLAGS@ ||

The LDFLAGS interpolation was removed upstream in this version:
https://gitlab.com/sane-project/backends/-/commit/b3b44f1188f902a959a7b8d71cf70eef8abb63da

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 79cd8cec7b15..11edb9d15f94 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -198,9 +198,6 @@ src_prepare() {
-e "/by sane-desc 3.5 from sane-backends/s:sane-backends 
.*:sane-backends ${ver}:" \
testsuite/tools/data/html* || die
 
-   # don't bleed user LDFLAGS into pkgconfig files
-   sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
-
# Needed for udev rules generation/installation
multilib_copy_sources
 }

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

2024-04-04 Thread Sam James

commit: d75c56f7c128b1aeb9870584c940a9aec33d2c19
Author: Eli Schwartz  gmail  com>
AuthorDate: Thu Apr  4 01:53:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 01:20:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75c56f7

media-gfx/sane-backends: remove outdated seds

Fixes:

 * SED: the following did not cause any changes
 * sed -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" -e 
'/^AM_MAINTAINER_MODE/d' -i configure.ac || die;
 * no-op: -e s/m4_esyscmd_s(\[git describe --dirty\])/1.2.1/
 * no-op: -e /^AM_MAINTAINER_MODE/d

Maintainer mode was removed upstream:
https://gitlab.com/sane-project/backends/-/commit/262e32ce591feb79ba5be9b21396b9dd71f1f067

git describe was dropped in favor of tools/git-version-gen:
https://gitlab.com/sane-project/backends/-/commit/c28c9843ed12f0fe2697d66c3dad724f68d0e576

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild | 5 -
 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 5 -
 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 5 -
 3 files changed, 15 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
index 044b4fd553fc..bed67f34eff9 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
@@ -190,11 +190,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
default
 
-   # Patch out the git reference so we can run eautoreconf
-   sed \
-   -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-   -e '/^AM_MAINTAINER_MODE/d' \
-   -i configure.ac || die
eautoreconf
 
# Fix for "make check".  Upstream sometimes forgets to update this.

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 99b7d0e574d9..639413ca7003 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -195,11 +195,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
default
 
-   # Patch out the git reference so we can run eautoreconf
-   sed \
-   -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-   -e '/^AM_MAINTAINER_MODE/d' \
-   -i configure.ac || die
eautoreconf
 
# Fix for "make check".  Upstream sometimes forgets to update this.

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 0654e5f25260..79cd8cec7b15 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -190,11 +190,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
default
 
-   # Patch out the git reference so we can run eautoreconf
-   sed \
-   -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-   -e '/^AM_MAINTAINER_MODE/d' \
-   -i configure.ac || die
eautoreconf
 
# Fix for "make check".  Upstream sometimes forgets to update this.

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

2024-04-04 Thread Sam James

commit: a29e18c24eacd7f6a85b56adb8e2782c6307683f
Author: Eli Schwartz  gmail  com>
AuthorDate: Thu Apr  4 02:40:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 01:20:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29e18c2

media-gfx/sane-backends: remove confusing and outdated seds

 * SED: the following did not cause any changes
 * sed -i -e "/by sane-desc 3.5 from sane-backends/s:sane-backends 
.*:sane-backends ${ver}:" testsuite/tools/data/html* || die;
 * no-op: -e /by sane-desc 3.5 from sane-backends/s:sane-backends 
.*:sane-backends 1.2.1:

This is seemingly redundant since upstream ticket:
https://gitlab.com/sane-project/backends/-/issues/228

The sources are changed with a minor version bump to sane-desc (not
sane-backends!) such that the sed no longer applies. Seds are wonderful!
Especially at silently failing and never being noticed.

The tests do still pass, regardless of commented claims in the ebuild.
Is that because the issue was misdiagnosed? Is that because the upstream
ticket to remove timestamps made the issue obsolete? I don't know, and
I'm not fussed about finding out. The tests have passed for years
without this, so that's good enough for me.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild | 6 --
 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 6 --
 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 6 --
 3 files changed, 18 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
index bed67f34eff9..7cda923f849d 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
@@ -192,12 +192,6 @@ src_prepare() {
 
eautoreconf
 
-   # Fix for "make check".  Upstream sometimes forgets to update this.
-   local ver=$(./configure --version | awk '{print $NF; exit 0}')
-   sed -i \
-   -e "/by sane-desc 3.5 from sane-backends/s:sane-backends 
.*:sane-backends ${ver}:" \
-   testsuite/tools/data/html* || die
-
# don't bleed user LDFLAGS into pkgconfig files
sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
 

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 639413ca7003..cc8ec2c60f74 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -197,12 +197,6 @@ src_prepare() {
 
eautoreconf
 
-   # Fix for "make check".  Upstream sometimes forgets to update this.
-   local ver=$(./configure --version | awk '{print $NF; exit 0}')
-   sed -i \
-   -e "/by sane-desc 3.5 from sane-backends/s:sane-backends 
.*:sane-backends ${ver}:" \
-   testsuite/tools/data/html* || die
-
# don't bleed user LDFLAGS into pkgconfig files
sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
 

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 11edb9d15f94..2b69e30c7d17 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -192,12 +192,6 @@ src_prepare() {
 
eautoreconf
 
-   # Fix for "make check".  Upstream sometimes forgets to update this.
-   local ver=$(./configure --version | awk '{print $NF; exit 0}')
-   sed -i \
-   -e "/by sane-desc 3.5 from sane-backends/s:sane-backends 
.*:sane-backends ${ver}:" \
-   testsuite/tools/data/html* || die
-
# Needed for udev rules generation/installation
multilib_copy_sources
 }

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

2023-05-01 Thread Sam James

commit: acb8188fa1db29948e05ce5b43b7b551e1372ef5
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 08:49:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 08:49:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb8188f

media-gfx/sane-backends: Stabilize 1.2.1 x86, #901957

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

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 222bbdea5285..e5b01f2eadf0 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2023-05-01 Thread Sam James

commit: 60eb0e1befb183cfacab7980bcd21f3566c72062
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 06:24:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 06:24:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60eb0e1b

media-gfx/sane-backends: Stabilize 1.2.1 sparc, #901957

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

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 2e0efd2813c7..222bbdea5285 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2023-04-30 Thread Sam James

commit: 2f54d826cd5883bf698515c863e7fcba6bc8c3ff
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 04:15:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 04:15:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f54d826

media-gfx/sane-backends: Stabilize 1.2.1 ppc, #901957

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

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 98a3e730bdff..2e0efd2813c7 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2023-04-30 Thread Sam James

commit: e916c07d0039e2a5a1639708c6a4d8d956393e01
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 03:14:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 03:14:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e916c07d

media-gfx/sane-backends: Stabilize 1.2.1 ppc64, #901957

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

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index beb0650e2e4d..98a3e730bdff 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2023-04-30 Thread Sam James

commit: 84535ba3bca586ca9a8fb26e627d27740d6e35ca
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 02:25:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 02:25:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84535ba3

media-gfx/sane-backends: Stabilize 1.2.1 arm, #901957

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

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 24ad5289cb85..d8bfd25e8a94 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2023-04-30 Thread Sam James

commit: aad8789eee6c5857ffe29e1a20590771d1725275
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 02:25:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 02:25:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad8789e

media-gfx/sane-backends: Stabilize 1.2.1 arm64, #901957

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

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index d8bfd25e8a94..beb0650e2e4d 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2023-04-30 Thread Sam James

commit: 34fa0a8e5d3a01b35fbeda6d33630b17b625a007
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 01:49:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 01:49:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34fa0a8e

media-gfx/sane-backends: Stabilize 1.2.1 amd64, #901957

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

 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 65901c95f628..24ad5289cb85 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2023-02-06 Thread Sam James

commit: 87d5cb7824a7361f22c8f17460d9c12de321290d
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  7 04:01:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  7 04:29:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d5cb78

media-gfx/sane-backends: add 1.2.1

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

 media-gfx/sane-backends/Manifest   |   1 +
 media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 370 +
 2 files changed, 371 insertions(+)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 1c5f2c1f96df..cb3d569a9c23 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1 +1,2 @@
 DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 
02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473
 SHA512 
25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d
+DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 
8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140
 SHA512 
3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1

diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
new file mode 100644
index ..65901c95f628
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+# python-any-r1 required for a script in backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   epsonds
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/${P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-user/saned
+   acct-group/scanner
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+   sane_backends_dc240? (

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

2023-01-08 Thread Joonas Niilola

commit: efe8a7d8deb2e185731b92266ec20b5c5b33918c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jan  8 08:06:15 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jan  8 08:06:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe8a7d8

media-gfx/sane-backends: Stabilize 1.1.1-r13 x86, #887079

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index fb1659fbd216..dd0efbaf1624 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.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
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-18 Thread Sam James

commit: e857182ca7287bcaf4482e24a896151aa37f2b5d
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 03:52:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 03:52:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e857182c

media-gfx/sane-backends: Stabilize 1.1.1-r13 ppc64, #887079

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

 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 38de87d2d8c2..fd5dc921edd9 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-18 Thread Sam James

commit: 28c47c39992262e84edcd379f38097556c2b9b83
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 03:52:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 03:52:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c47c39

media-gfx/sane-backends: Stabilize 1.1.1-r13 sparc, #887079

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

 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index fd5dc921edd9..fb1659fbd216 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-18 Thread Sam James

commit: 7ecddaa18765dc31bcda1fb62a2b64c4bc8c4b05
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 03:52:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 03:52:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ecddaa1

media-gfx/sane-backends: Stabilize 1.1.1-r13 amd64, #887079

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

 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 2bfee61a05f8..4e6ba54c2102 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-18 Thread Sam James

commit: 89f028b38f4b952dd244d92c20a0b6a52abb7660
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 03:52:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 03:52:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f028b3

media-gfx/sane-backends: Stabilize 1.1.1-r13 ppc, #887079

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

 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 4e6ba54c2102..38de87d2d8c2 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-18 Thread Sam James

commit: 27f0da42b3ec42a6136fcfbe8f86fd5f510f5c72
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 03:01:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 03:01:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f0da42

media-gfx/sane-backends: Stabilize 1.1.1-r13 arm64, #887079

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

 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 6fa6459f8282..2bfee61a05f8 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-18 Thread Sam James

commit: fea113a3444f625e24e24050e35d0c312194622a
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 02:59:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 02:59:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea113a3

media-gfx/sane-backends: Stabilize 1.1.1-r13 arm, #887079

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

 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 385b090370aa..6fa6459f8282 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-18 Thread Sam James

commit: 0891f002e96a1ca716a201e8479f2ec75e0b2274
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 01:10:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 01:13:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0891f002

media-gfx/sane-backends: restore clang, musl patches & udev rules

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

 ...1-r12.ebuild => sane-backends-1.1.1-r13.ebuild} | 29 +-
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
similarity index 96%
rename from media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild
rename to media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 432ddeab111d..385b090370aa 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -103,7 +103,7 @@ IUSE_SANE_BACKENDS=(
xerox_mfp
 )
 
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
 
 for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
case ${GBACKEND} in
@@ -134,16 +134,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong 
~m68k ~mips ~ppc ~ppc64 ~
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
acct-user/saned
+   acct-group/scanner
gphoto2? (
-   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
)
sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
sane_backends_dell1600n_net? (
-   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
>=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
+   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
)
sane_backends_escl? (
app-text/poppler[cairo]
@@ -182,6 +183,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
# https://gitlab.com/sane-project/backends/-/merge_requests/688
"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch
+   "${FILESDIR}"/${P}-gcc12-tests.patch
+   "${FILESDIR}"/${PN}-1.1.1-configure-clang16.patch
+   "${FILESDIR}"/${P}-musl.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -250,14 +254,15 @@ multilib_src_configure() {
# that break in many ways, bug #636202, #668232, #668350
# People can refer to the "Programmer's Documentation" at 
http://www.sane-project.org/docs.html
myconf+=(
+   --enable-ipv6
--disable-locking
$(use_with gphoto2)
$(multilib_native_use_with systemd)
$(use_with v4l)
-   $(use_enable ipv6)
$(use_enable threads pthread)
$(use_with zeroconf avahi)
)
+
ECONF_SOURCE="${S}" \
SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
BACKENDS="${lbackends}" \
@@ -324,7 +329,7 @@ multilib_src_install() {
printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || 
die
tools/sane-desc -m hwdb -s doc/descriptions-external/ >> 
"${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
# udev rule for saned (SANE scanning daemon) to be able to 
write on usb port
-   udev_dorules "${FILESDIR}/66-saned.rules"
+   udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules
fi
 }
 
@@ -332,7 +337,7 @@ multilib_src_install_all() {
dodir /etc/env.d
 
if use systemd ; then
-   systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+   systemd_newunit "${FILESDIR}"/saned_at.service-r1 
"saned@.service"
systemd_newunit "${FILESDIR}"/saned.socket saned.socket
fi
 
@@ -354,7 +359,13 @@ multilib_src_install_all() {
newconfd "${FILESDIR}"/saned.confd saned
 }
 
+pkg_postrm() {
+   udev_reload
+}
+
 pkg_postinst() {
+   udev_reload
+
optfeature "Network scanner backend" media-gfx/sane-airscan
optfeature "Epson-specific backend" media-gfx/iscan
optfeature "HP-specific backend" net-print/hplip
@@ -363,10 +374,4 @@ pkg_postinst() {
elog "If you want remote clients to connect, edit"
elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
fi
-
-   udev_reload
-}
-
-pkg_postrm() {
-   udev_reload
 }

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

2022-12-18 Thread Maciej Mrozowski

commit: 02aff788e43bafd970b642bd7c7f468fc528b368
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sun Dec 18 23:47:44 2022 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Sun Dec 18 23:47:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02aff788

media-gfx/sane-backends: restore epsonds backend accidentally removed while 
bumping -r11 from -r7 instead of -r10 in 
bbb466bb667bb9b0af11e24619c58fe336838e65

Signed-off-by: Maciej Mrozowski  gentoo.org>

 .../sane-backends/sane-backends-1.1.1-r12.ebuild   | 372 +
 1 file changed, 372 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild
new file mode 100644
index ..432ddeab111d
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   epsonds
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-user/saned
+   gphoto2? (
+   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+   sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+   sane_backends_dell1600n_net? (
+   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+   >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_escl? (
+   app-text/poppler[cairo]
+   || (
+   net-dns/avahi[dbus]
+   net-dns/avahi[gtk]
+   )
+   net-dns/avahi[${MULTILIB_USEDEP}]
+   net-misc/curl[${MULTILIB_USEDEP}]
+   )
+   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+

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

2022-12-18 Thread Pacho Ramos

commit: 4c42d8158713512085c747436ce8062c3c5404b8
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec 18 09:40:00 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec 18 09:40:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c42d815

media-gfx/sane-backends: Run udev_reload

Closes: https://bugs.gentoo.org/886269
Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
index b8de8f738d47..2f29e89372ca 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
@@ -362,4 +362,10 @@ pkg_postinst() {
elog "If you want remote clients to connect, edit"
elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
fi
+
+   udev_reload
+}
+
+pkg_postrm() {
+   udev_reload
 }

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

2022-12-17 Thread Sam James

commit: f005db6156e9dd256511a12ea86502586537a0df
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 07:07:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 07:07:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f005db61

media-gfx/sane-backends: drop 1.1.1-r5, forward ~loong

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

 .../sane-backends/sane-backends-1.1.1-r11.ebuild   |   2 +-
 .../sane-backends/sane-backends-1.1.1-r5.ebuild| 377 -
 2 files changed, 1 insertion(+), 378 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
index 0a087eb13385..b8de8f738d47 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
deleted file mode 100644
index f6c0e2682408..
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-   abaton
-   agfafocus
-   apple
-   artec
-   artec_eplus48u
-   as6e
-   avision
-   bh
-   canon
-   canon630u
-   canon_dr
-   canon_lide70
-   canon_pp
-   cardscan
-   coolscan
-   coolscan2
-   coolscan3
-   dc210
-   dc240
-   dc25
-   dell1600n_net
-   dmc
-   epjitsu
-   epson
-   epson2
-   epsonds
-   escl
-   fujitsu
-   genesys
-   gt68xx
-   hp
-   hp3500
-   hp3900
-   hp4200
-   hp5400
-   hp5590
-   hpljm1005
-   hpsj5s
-   hs2p
-   ibm
-   kodak
-   kodakaio
-   kvs1025
-   kvs20xx
-   kvs40xx
-   leo
-   lexmark
-   ma1509
-   magicolor
-   matsushita
-   microtek
-   microtek2
-   mustek
-   mustek_pp
-   mustek_usb
-   mustek_usb2
-   nec
-   net
-   niash
-   p5
-   pie
-   pieusb
-   pixma
-   plustek
-   plustek_pp
-   pnm
-   qcam
-   ricoh
-   ricoh2
-   rts8891
-   s9036
-   sceptre
-   sharp
-   sm3600
-   sm3840
-   snapscan
-   sp15c
-   st400
-   stv680
-   tamarack
-   teco1
-   teco2
-   teco3
-   test
-   u12
-   umax
-   umax1220u
-   umax_pp
-   xerox_mfp
-)
-
-IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-   case ${GBACKEND} in
-   # Disable backends that require parallel ports as no one has those 
anymore.
-   canon_pp|hpsj5s|mustek_pp|\
-   pnm|mustek_usb2|kvs40xx)
-   IUSE+=" sane_backends_${GBACKEND}"
-   ;;
-   *)
-   IUSE+=" +sane_backends_${GBACKEND}"
-   esac
-done
-
-REQUIRED_USE="
-   sane_backends_escl? ( zeroconf )
-   sane_backends_kvs40xx? ( threads )
-   sane_backends_mustek_usb2? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/;
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz;
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-   acct-user/saned
-   acct-group/scanner
-   gphoto2? (
-   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-   sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-

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

2022-12-17 Thread Sam James

commit: bbb466bb667bb9b0af11e24619c58fe336838e65
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 07:05:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 07:07:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb466bb

media-gfx/sane-backends: fix udev rule again

Previous change wasn't intentional -- the script used for the libtiff
revbumps got it wrong.

Fixes: 70e19cb29c796c97f89a870ee991374857014d82
Closes: https://bugs.gentoo.org/876772
Signed-off-by: Sam James  gentoo.org>

 .../sane-backends/sane-backends-1.1.1-r10.ebuild   | 367 -
 1-r7.ebuild => sane-backends-1.1.1-r11.ebuild} |   0
 2 files changed, 367 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r10.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r10.ebuild
deleted file mode 100644
index 1547683ff308..
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r10.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-   abaton
-   agfafocus
-   apple
-   artec
-   artec_eplus48u
-   as6e
-   avision
-   bh
-   canon
-   canon630u
-   canon_dr
-   canon_lide70
-   canon_pp
-   cardscan
-   coolscan
-   coolscan2
-   coolscan3
-   dc210
-   dc240
-   dc25
-   dell1600n_net
-   dmc
-   epjitsu
-   epson
-   epson2
-   epsonds
-   escl
-   fujitsu
-   genesys
-   gt68xx
-   hp
-   hp3500
-   hp3900
-   hp4200
-   hp5400
-   hp5590
-   hpljm1005
-   hpsj5s
-   hs2p
-   ibm
-   kodak
-   kodakaio
-   kvs1025
-   kvs20xx
-   kvs40xx
-   leo
-   lexmark
-   ma1509
-   magicolor
-   matsushita
-   microtek
-   microtek2
-   mustek
-   mustek_pp
-   mustek_usb
-   mustek_usb2
-   nec
-   net
-   niash
-   p5
-   pie
-   pieusb
-   pixma
-   plustek
-   plustek_pp
-   pnm
-   qcam
-   ricoh
-   ricoh2
-   rts8891
-   s9036
-   sceptre
-   sharp
-   sm3600
-   sm3840
-   snapscan
-   sp15c
-   st400
-   stv680
-   tamarack
-   teco1
-   teco2
-   teco3
-   test
-   u12
-   umax
-   umax1220u
-   umax_pp
-   xerox_mfp
-)
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-   case ${GBACKEND} in
-   # Disable backends that require parallel ports as no one has those 
anymore.
-   canon_pp|hpsj5s|mustek_pp|\
-   pnm|mustek_usb2|kvs40xx)
-   IUSE+=" sane_backends_${GBACKEND}"
-   ;;
-   *)
-   IUSE+=" +sane_backends_${GBACKEND}"
-   esac
-done
-
-REQUIRED_USE="
-   sane_backends_escl? ( zeroconf )
-   sane_backends_kvs40xx? ( threads )
-   sane_backends_mustek_usb2? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/;
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz;
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-   acct-user/saned
-   gphoto2? (
-   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-   sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-   sane_backends_dell1600n_net? (
-   >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
-   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_escl? (
-   app-text/poppler[cairo]
-   || (
-   net-dns/avahi[dbus]
-   net-dns/avahi[gtk]
-   )
-   net-dns/avahi[${MULTILIB_USEDEP}]
-   net-misc/curl[${MULTILIB_USEDEP}]
-   )
-   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_mustek_pp? (

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

2022-12-01 Thread Sam James

commit: 7d0456d43c81568dcb42e6379a0d6c74a4c6f63e
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  2 00:45:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  2 00:45:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0456d4

media-gfx/sane-backends: Stabilize 1.1.1-r5 ppc, #883899

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

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index 0efb50a1105f..66de198008eb 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-01 Thread Sam James

commit: c7e31e19d72c015b0a4fbb60f149239cdda086b9
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  2 00:45:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  2 00:45:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e31e19

media-gfx/sane-backends: Stabilize 1.1.1-r5 ppc64, #883899

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

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index 31860df83c3e..0efb50a1105f 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-01 Thread Jakov Smolić

commit: 8f479c3a8219e75bf20b8a45082502993126c6bf
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 22:27:35 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 22:27:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f479c3a

media-gfx/sane-backends: Stabilize 1.1.1-r5 x86, #883899

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index 8ec69bb3777a..31860df83c3e 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-01 Thread Jakov Smolić

commit: de43a571d74f0a28ccbae63230c7e69c135ee49b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 22:23:45 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 22:23:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de43a571

media-gfx/sane-backends: Stabilize 1.1.1-r5 amd64, #883899

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index 6ab9de627f5f..8ec69bb3777a 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-01 Thread Jakov Smolić

commit: e9b7945d96bf17f2f25336bd010e55e50e021116
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 22:22:16 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 22:22:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b7945d

media-gfx/sane-backends: Stabilize 1.1.1-r5 arm, #883899

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index d28b643c462c..6ab9de627f5f 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-01 Thread Jakov Smolić

commit: 3ac63080ed0853fff109ceff268626346e0a78d2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 22:22:15 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 22:22:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac63080

media-gfx/sane-backends: Stabilize 1.1.1-r5 arm64, #883899

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index 66a682326b87..d28b643c462c 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-12-01 Thread Arthur Zamarin

commit: c569063121bb46ea59a85c2e47feebeb4660c3e4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec  1 20:47:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec  1 20:47:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5690631

media-gfx/sane-backends: Stabilize 1.1.1-r5 sparc, #883899

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index e317f95a32ee..66a682326b87 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-11-29 Thread WANG Xuerui

commit: 0ceab7d5e2dd43763ce675081bab8f6c7ab697cd
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Nov 29 14:48:14 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue Nov 29 15:57:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ceab7d5

media-gfx/sane-backends: keyword 1.1.1-r5 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index e319cc9e20b1..e317f95a32ee 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -129,7 +129,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-11-03 Thread Sam James

commit: e9100c7c514918a3d8535050ccc5434a8017fb95
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  4 04:25:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  4 04:25:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9100c7c

media-gfx/sane-backends: add gitlab upstream metadata

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

 media-gfx/sane-backends/metadata.xml | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-gfx/sane-backends/metadata.xml 
b/media-gfx/sane-backends/metadata.xml
index 972a9391d288..809900125a1b 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -1,8 +1,9 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-
-cpe:/a:sane-backends_project:sane-backends
-
+   
+   
+   cpe:/a:sane-backends_project:sane-backends
+   sane-project/backends
+

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

2022-11-03 Thread Sam James

commit: f9b3a0fbfd6625bbf87787d885ccf279bad17d7c
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  4 04:20:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  4 04:20:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b3a0fb

media-gfx/sane-backends: always enable IPv6

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

 media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
index 77b5ec95218e..e319cc9e20b1 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r5.ebuild
@@ -103,7 +103,7 @@ IUSE_SANE_BACKENDS=(
xerox_mfp
 )
 
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
 
 for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
case ${GBACKEND} in
@@ -254,14 +254,15 @@ multilib_src_configure() {
# that break in many ways, bug #636202, #668232, #668350
# People can refer to the "Programmer's Documentation" at 
http://www.sane-project.org/docs.html
myconf+=(
+   --enable-ipv6
--disable-locking
$(use_with gphoto2)
$(multilib_native_use_with systemd)
$(use_with v4l)
-   $(use_enable ipv6)
$(use_enable threads pthread)
$(use_with zeroconf avahi)
)
+
ECONF_SOURCE="${S}" \
SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
BACKENDS="${lbackends}" \

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

2022-11-03 Thread Sam James

commit: 3865b4531959596959b487d84fd862e2aac4999f
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  4 04:17:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  4 04:18:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3865b453

media-gfx/sane-backends: fix configure w/ clang 16; fix service file & udev

- Fix configure with Clang 16
- Fix saned_at.service user name (scanner->saned, as scanner is the group)
- Fix path to setfacl in udev rule (previous one assumed /usr merge)
- Fix group name in udev rule (saned->scanner)
- Call udev_reload in pkg_post{rm,inst}

Closes: https://bugs.gentoo.org/876772
Closes: https://bugs.gentoo.org/859619
Closes: https://bugs.gentoo.org/849590
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sane-backends/files/66-saned.rules-r1|   2 +
 .../sane-backends-1.1.1-configure-clang16.patch|  43 +++
 .../files/sane-backends-1.1.1-musl.patch   |  34 ++
 media-gfx/sane-backends/files/saned_at.service-r1  |  18 +
 .../sane-backends/sane-backends-1.1.1-r5.ebuild| 376 +
 5 files changed, 473 insertions(+)

diff --git a/media-gfx/sane-backends/files/66-saned.rules-r1 
b/media-gfx/sane-backends/files/66-saned.rules-r1
new file mode 100644
index ..4e1fe9507eae
--- /dev/null
+++ b/media-gfx/sane-backends/files/66-saned.rules-r1
@@ -0,0 +1,2 @@
+# udev rule for saned (SANE scanning daemon) to be able to write on usb port
+ENV{libsane_matched}=="yes", ENV{DEVNAME}!="", RUN+="/bin/setfacl -m 
g:scanner:rw $env{DEVNAME}"

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.1.1-configure-clang16.patch 
b/media-gfx/sane-backends/files/sane-backends-1.1.1-configure-clang16.patch
new file mode 100644
index ..cc8a48b18b67
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.1.1-configure-clang16.patch
@@ -0,0 +1,43 @@
+https://gitlab.com/sane-project/backends/-/merge_requests/763
+
+From 300b460970f538ab515835f14650785e88808a8f Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 4 Nov 2022 04:04:46 +
+Subject: [PATCH] acinclude.m4: fix -Wimplicit-function-declaration
+
+-Wimplicit-function-declaration will become an error by default
+in Clang 16.
+
+Fixes errors like:
+```
+error: call to undeclared library function 'exit' with type 'void (int) 
__attribute__((noreturn))'; ISO C99 and later do not support implicit function 
declarations [-Werror,-Wimplicit-function-declaration]
+```
+
+Signed-off-by: Sam James 
+--- a/acinclude.m4
 b/acinclude.m4
+@@ -471,6 +471,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
+   if test "$ipv6" != "no" ; then
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+   #define INET6
++  #include 
+   #include 
+   #include  ]], [[
+/* AF_INET6 available check */
+@@ -492,6 +493,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
+ AC_MSG_CHECKING([whether struct sockaddr_storage has an ss_family member])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+   #define INET6
++  #include 
+   #include 
+   #include  ]], [[
+   /* test if the ss_family member exists in struct sockaddr_storage */
+@@ -504,6 +506,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
+ ], [
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+   #define INET6
++  #include 
+   #include 
+   #include  ]], [[
+   /* test if the __ss_family member exists in struct 
sockaddr_storage */
+GitLab

diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch 
b/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch
new file mode 100644
index ..8aebb50672a1
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch
@@ -0,0 +1,34 @@
+https://gitlab.com/sane-project/backends/-/commit/12560890a6e298091bd63b8093a35604416eb92a
+
+From 12560890a6e298091bd63b8093a35604416eb92a Mon Sep 17 00:00:00 2001
+From: David Ward 
+Date: Thu, 21 Apr 2022 23:37:33 -0400
+Subject: [PATCH] Fix header file used for poll()
+
+POSIX specifies the header to include is , not .
+This results in a compiler warning with musl libc (on Alpine Linux).
+--- a/configure.ac
 b/configure.ac
+@@ -202,7 +202,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
+ sys/time.h sys/shm.h sys/ipc.h sys/scanio.h os2.h \
+ sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
+-dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h sys/poll.h \
++dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h poll.h \
+ windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\
+ netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h)
+ AC_CHECK_HEADERS([asm/io.h],,,[#include ])
+--- a/frontend/saned.c
 b/frontend/saned.c
+@@ -84,8 +84,8 @@
+ 
+ #include "lgetopt.h"
+ 
+-#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
+-# include 
++#if defined(HAVE_POLL_H) && defined(HAVE_POLL)
++# include 
+ #else
+ /*
+  * This replacement poll() using select() is only

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

2022-11-03 Thread Sam James

commit: 1ed286d1a7256205061253ffe58df0fc2a48f8ae
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  4 03:58:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  4 03:58:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed286d1

media-gfx/sane-backends: fix tests w/ gcc 12

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

 .../files/sane-backends-1.1.1-gcc12-tests.patch| 78 ++
 .../sane-backends/sane-backends-1.1.1-r4.ebuild|  1 +
 2 files changed, 79 insertions(+)

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch 
b/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch
new file mode 100644
index ..25a1e4db265e
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch
@@ -0,0 +1,78 @@
+https://bugs.gentoo.org/840137
+https://gitlab.com/sane-project/backends/-/commit/6b99447f5b12758ff015b5c360a6dcbcf9b0a72d
+https://gitlab.com/sane-project/backends/-/issues/597
+https://gitlab.com/sane-project/backends/-/issues/557
+
+From edfc90450ee06149537fadb3095ba4b215c5c4fa Mon Sep 17 00:00:00 2001
+From: Ralph Little 
+Date: Sun, 2 Oct 2022 18:14:25 -0700
+Subject: [PATCH] genesys: corrections to include file order.
+
+minigtest.h has items that require the definitions in tests_printers.h.
+Pre-GCC-12, this didn't seem to matter but GCC12 seems to have a
+problem with this and requires the template definitions to have already
+appeared.
+--- a/testsuite/backend/genesys/minigtest.cpp
 b/testsuite/backend/genesys/minigtest.cpp
+@@ -18,10 +18,10 @@
+along with this program.  If not, see .
+ */
+ 
+-#include "minigtest.h"
+-
+ #define DEBUG_DECLARE_ONLY
+ 
++#include "minigtest.h"
++
+ size_t s_num_successes = 0;
+ size_t s_num_failures = 0;
+ 
+--- a/testsuite/backend/genesys/tests_image.cpp
 b/testsuite/backend/genesys/tests_image.cpp
+@@ -21,8 +21,8 @@
+ #define DEBUG_DECLARE_ONLY
+ 
+ #include "tests.h"
+-#include "minigtest.h"
+ #include "tests_printers.h"
++#include "minigtest.h"
+ 
+ #include "../../../backend/genesys/image.h"
+ #include "../../../backend/genesys/image_pipeline.h"
+--- a/testsuite/backend/genesys/tests_image_pipeline.cpp
 b/testsuite/backend/genesys/tests_image_pipeline.cpp
+@@ -21,8 +21,8 @@
+ #define DEBUG_DECLARE_ONLY
+ 
+ #include "tests.h"
+-#include "minigtest.h"
+ #include "tests_printers.h"
++#include "minigtest.h"
+ 
+ #include "../../../backend/genesys/image_pipeline.h"
+ 
+--- a/testsuite/backend/genesys/tests_motor.cpp
 b/testsuite/backend/genesys/tests_motor.cpp
+@@ -21,8 +21,8 @@
+ #define DEBUG_DECLARE_ONLY
+ 
+ #include "tests.h"
+-#include "minigtest.h"
+ #include "tests_printers.h"
++#include "minigtest.h"
+ 
+ #include "../../../backend/genesys/low.h"
+ #include "../../../backend/genesys/enums.h"
+--- a/testsuite/backend/genesys/tests_utilities.cpp
 b/testsuite/backend/genesys/tests_utilities.cpp
+@@ -21,8 +21,8 @@
+ #define DEBUG_DECLARE_ONLY
+ 
+ #include "tests.h"
+-#include "minigtest.h"
+ #include "tests_printers.h"
++#include "minigtest.h"
+ 
+ #include "../../../backend/genesys/utilities.h"
+ 
+GitLab

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild
index 6bff44a1f891..e34fadb86e95 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild
@@ -182,6 +182,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
# https://gitlab.com/sane-project/backends/-/merge_requests/688
"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch
+   "${FILESDIR}"/${P}-gcc12-tests.patch
 )
 
 MULTILIB_CHOST_TOOLS=(

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

2022-07-23 Thread Sam James

commit: 944c03b52aa91c92471b3fe992daf8e58344adbb
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 00:58:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 00:59:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944c03b5

media-gfx/sane-backends: use libjpeg-turbo

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

 ...-backends-1.1.1-r3.ebuild => sane-backends-1.1.1-r4.ebuild} | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r3.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild
similarity index 96%
rename from media-gfx/sane-backends/sane-backends-1.1.1-r3.ebuild
rename to media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild
index 7c8590732dc8..6bff44a1f891 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild
@@ -136,14 +136,14 @@ RDEPEND="
acct-user/saned
gphoto2? (
>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
)
sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+   sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
sane_backends_dell1600n_net? (
>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
)
sane_backends_escl? (
app-text/poppler[cairo]
@@ -156,7 +156,7 @@ RDEPEND="
)
sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
snmp? ( net-analyzer/net-snmp:0= )
systemd? ( sys-apps/systemd:0= )
usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/, profiles/desc/

2022-07-23 Thread Sam James

commit: 2fd7c60a1a549421fe84871a5718aa7645200257
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 00:24:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 00:25:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd7c60a

media-gfx/sane-backends: add epsonds backend

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

 .../sane-backends/sane-backends-1.1.1-r3.ebuild| 366 +
 profiles/desc/sane_backends.desc   |   1 +
 2 files changed, 367 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r3.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r3.ebuild
new file mode 100644
index ..7c8590732dc8
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r3.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   epsonds
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-user/saned
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dell1600n_net? (
+   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_escl? (
+   app-text/poppler[cairo]
+   || (
+   net-dns/avahi[dbus]
+   net-dns/avahi[gtk]
+   )
+   net-dns/avahi[${MULTILIB_USEDEP}]
+   net-misc/curl[${MULTILIB_USEDEP}]
+   )
+   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   snmp? ( net-analyzer/net-snmp:0= )
+   systemd? (

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

2022-04-17 Thread Sam James

commit: 24aa55dea52e68e4598c4216258030894bf04e31
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 18:57:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 19:00:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24aa55de

media-gfx/sane-backends: drop 1.0.31-r2, 1.0.32, 1.1.1, 1.1.1-r1

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

 media-gfx/sane-backends/Manifest   |   2 -
 .../files/sane-backends-1.0.31-autoconf-2.70.patch |  93 --
 .../sane-backends-1.0.31-backend_pot_input.patch   |  33 --
 .../sane-backends-1.0.31-udev_rules_update.patch   |  55 
 .../sane-backends/sane-backends-1.0.31-r2.ebuild   | 360 
 .../sane-backends/sane-backends-1.0.32.ebuild  | 353 
 .../sane-backends/sane-backends-1.1.1-r1.ebuild| 363 -
 media-gfx/sane-backends/sane-backends-1.1.1.ebuild | 353 
 8 files changed, 1612 deletions(-)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 0d95dbf24774..1c5f2c1f96df 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,3 +1 @@
-DIST backends-1.0.31.tar.gz 5731445 BLAKE2B 
d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298
 SHA512 
d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
-DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 
8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83
 SHA512 
416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
 DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 
02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473
 SHA512 
25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch 
b/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
deleted file mode 100644
index f1fe4765bdd5..
--- a/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 445b5bd7e19245c08de6a0e669dd9211d2597bfa Mon Sep 17 00:00:00 2001
-From: Olaf Meeuwissen 
-Date: Fri, 1 Jan 2021 15:53:11 +0900
-Subject: [PATCH] Drop use of obsoleted autoconf AC_HEADER_STDC macro.  Fixes
- #409
-
-Use of the STDC_HEADER pre-processor macro that the autoconf macro
-used to define has been removed.  Conditionalized code is now used
-unconditionally.  This should be fine as the macro checks for ANSI
-C, i.e. C89 (ISO C90), compliant headers.  We already require C99.

- acinclude.m4|  3 ---
- lib/md5.c   | 10 ++
- sanei/sanei_pa4s2.c |  8 +++-
- sanei/sanei_pp.c|  8 +++-
- 4 files changed, 8 insertions(+), 21 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index e10f8ceb2..9393278c2 100644
 a/acinclude.m4
-+++ b/acinclude.m4
-@@ -73,9 +73,6 @@ AC_DEFUN([SANE_CHECK_MISSING_HEADERS],
-   if test "${ac_cv_header_unistd_h}" != "yes" ; then
- MISSING_HEADERS="${MISSING_HEADERS}\"unistd.h\" "
-   fi
--  if test "${ac_cv_header_stdc}" != "yes" ; then
--MISSING_HEADERS="${MISSING_HEADERS}\"ANSI C headers\" "
--  fi
-   if test "${MISSING_HEADERS}" != "" ; then
- echo "*** The following essential header files couldn't be found:"
- echo "*** ${MISSING_HEADERS}"
-diff --git a/lib/md5.c b/lib/md5.c
-index 923a17c78..009c6d9a0 100644
 a/lib/md5.c
-+++ b/lib/md5.c
-@@ -26,14 +26,8 @@
- 
- #include 
- 
--#if STDC_HEADERS || defined _LIBC
--# include 
--# include 
--#else
--# ifndef HAVE_MEMCPY
--#  define memcpy(d, s, n) bcopy ((s), (d), (n))
--# endif
--#endif
-+#include 
-+#include 
- 
- #include "md5.h"
- 
-diff --git a/sanei/sanei_pa4s2.c b/sanei/sanei_pa4s2.c
-index b1d95fe02..5365151fd 100644
 a/sanei/sanei_pa4s2.c
-+++ b/sanei/sanei_pa4s2.c
-@@ -150,11 +150,9 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
- 
- #endif /* NDEBUG */
- 
--#if defined(STDC_HEADERS)
--# include 
--# include 
--# include 
--#endif
-+#include 
-+#include 
-+#include 
- #if defined(HAVE_STRING_H)
- # include 
- #elif defined(HAVE_STRINGS_H)
-diff --git a/sanei/sanei_pp.c b/sanei/sanei_pp.c
-index 3077342e4..752945a89 100644
 a/sanei/sanei_pp.c
-+++ b/sanei/sanei_pp.c
-@@ -135,11 +135,9 @@ inb( u_long port )
- #include "../include/sane/sanei_debug.h"
- #include "../include/sane/sanei_pp.h"
- 
--#if defined(STDC_HEADERS)
--# include 
--# include 
--# include 
--#endif
-+#include 
-+#include 
-+#include 
- #if defined(HAVE_STRING_H)
- # include 
- #elif defined(HAVE_STRINGS_H)
--- 
-GitLab
-

diff

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

2022-03-12 Thread Arthur Zamarin

commit: 12ace15d9c3518c4d56d214ff81b96a723935bf4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 09:34:50 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 09:34:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ace15d

media-gfx/sane-backends: Stabilize 1.1.1-r2 sparc, #833898

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index d34027327891..80b22961182a 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-03-10 Thread Jakov Smolić

commit: 348cb4e36bbdf861ca3cc0bdcd2616546dbb9728
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Mar 10 09:08:35 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar 10 09:08:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348cb4e3

media-gfx/sane-backends: Stabilize 1.1.1-r2 x86, #833898

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index aeab27727b24..d34027327891 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-03-05 Thread Sam James

commit: d615063ea1f866516702495127ede8d15a4b36fe
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  6 07:58:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  6 07:58:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d615063e

media-gfx/sane-backends: Stabilize 1.1.1-r2 arm, #833898

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

 media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index 1b35ff233f60..aeab27727b24 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-03-05 Thread Sam James

commit: 5d73b421dc35638e4c73b8921b7f4332d011cb2c
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  6 07:44:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  6 07:44:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d73b421

media-gfx/sane-backends: Stabilize 1.1.1-r2 arm64, #833898

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

 media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index c317d453be34..1b35ff233f60 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-02-22 Thread Jakov Smolić

commit: d311f6ab2d0b7c275f7b172e6e6667f771a6274b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Feb 22 19:35:13 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb 22 19:35:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d311f6ab

media-gfx/sane-backends: Stabilize 1.1.1-r2 amd64, #833898

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index ad537cc0ff0e..c317d453be34 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-02-22 Thread Sam James

commit: 80dc9d6b8de39419ab268945b1cc66ee6cc72d77
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 22 19:24:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 22 19:24:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80dc9d6b

media-gfx/sane-backends: Stabilize 1.1.1-r2 ppc64, #833898

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

 media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index 7773e3b83413..ad537cc0ff0e 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-02-22 Thread Sam James

commit: 701fcbf64430960f3f528981eec28c389b6b4b49
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 22 19:24:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 22 19:24:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701fcbf6

media-gfx/sane-backends: Stabilize 1.1.1-r2 ppc, #833898

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

 media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index 010ba000e55f..7773e3b83413 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-02-13 Thread Jakov Smolić

commit: 8b82810e66b470430b84c494a3c8cc90e8473d27
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Feb 13 23:40:56 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Feb 13 23:40:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b82810e

media-gfx/sane-backends: Stabilize 1.0.32 x86, #829924

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index 151b7623b2af..a1fde1572b8b 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2022-01-29 Thread Pacho Ramos

commit: 2d6b57e2a291f675341c026a67e452db1ea15227
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 29 08:42:23 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 29 08:42:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6b57e2

media-gfx/sane-backends: Fix crash in genesys driver

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 .../sane-backends-1.1.1-genesys-gl845-crash.patch  |  12 +
 .../sane-backends/sane-backends-1.1.1-r2.ebuild| 365 +
 2 files changed, 377 insertions(+)

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch 
b/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch
new file mode 100644
index ..f63a8e2100b9
--- /dev/null
+++ 
b/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch
@@ -0,0 +1,12 @@
+diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
+index 9552fa9..c95de7b 100644
+--- a/backend/genesys/genesys.cpp
 b/backend/genesys/genesys.cpp
+@@ -367,6 +367,7 @@ void 
sanei_genesys_create_default_gamma_table(Genesys_Device* dev,
+ }
+ max = size - 1;
+ } else if (dev->model->asic_type == AsicType::GL124 ||
++   dev->model->asic_type == AsicType::GL845 ||
+dev->model->asic_type == AsicType::GL846 ||
+dev->model->asic_type == AsicType::GL847) {
+ size = 257;

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
new file mode 100644
index ..010ba000e55f
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-user/saned
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? (

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

2022-01-22 Thread Pacho Ramos

commit: 15b01aed0650b4f7621558ca101573caae398297
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 22 11:19:47 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 22 11:20:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b01aed

media-gfx/sane-backends: Avoid scanner group usage

scanner group usage ends up breaking cups printing due to changing
permissions and owners of devices in an uncontrolled way (#644636)

Follow CUPS upstream suggestion to generate udev rules as other
distributions (Fedora or Arch, for example) to avoid this issue.
https://github.com/OpenPrinting/cups/issues/314
https://gitlab.com/sane-project/backends/-/issues/546
https://wiki.gentoo.org/wiki/Printing#USB_Printer_is_not_detected

Bug: https://bugs.gentoo.org/644636
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/sane-backends/files/66-saned.rules   |   2 +
 .../sane-backends/sane-backends-1.1.1-r1.ebuild| 363 +
 2 files changed, 365 insertions(+)

diff --git a/media-gfx/sane-backends/files/66-saned.rules 
b/media-gfx/sane-backends/files/66-saned.rules
new file mode 100644
index ..3c9ec85d4822
--- /dev/null
+++ b/media-gfx/sane-backends/files/66-saned.rules
@@ -0,0 +1,2 @@
+# udev rule for saned (SANE scanning daemon) to be able to write on usb port
+ENV{libsane_matched}=="yes", ENV{DEVNAME}!="", RUN+="/usr/bin/setfacl -m 
g:saned:rw $env{DEVNAME}"

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild
new file mode 100644
index ..fd756b73c128
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-user/saned
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? (

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

2022-01-22 Thread Pacho Ramos

commit: 5b29ea90441b509844072c85bf34cc0b2d95803f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 22 10:25:26 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 22 10:25:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b29ea90

media-gfx/sane-backends: Bump to 1.1.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/sane-backends/Manifest   |   1 +
 media-gfx/sane-backends/sane-backends-1.1.1.ebuild | 353 +
 2 files changed, 354 insertions(+)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 7d1b5d8608bb..0d95dbf24774 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,2 +1,3 @@
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B 
d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298
 SHA512 
d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
 DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 
8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83
 SHA512 
416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
+DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 
02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473
 SHA512 
25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d

diff --git a/media-gfx/sane-backends/sane-backends-1.1.1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.1.1.ebuild
new file mode 100644
index ..0453269675fb
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-group/scanner
+   acct-user/saned
+   gphoto2? (
+

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

2022-01-15 Thread Joonas Niilola

commit: d1e79161723a89ce96bf8995425b7bb00c4f67cc
Author: Thomas Bettler  gmail  com>
AuthorDate: Mon Dec 27 10:27:19 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 15 09:31:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e79161

media-gfx/sane-backends: add python 3.10

Closes: https://bugs.gentoo.org/830085
Closes: https://github.com/gentoo/gentoo/pull/23540
Signed-off-by: Thomas Bettler  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index d88f04928455..151b7623b2af 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 # python-any-r1 required for a script in
 # backends/pixma/scripts/

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

2021-12-25 Thread Sam James

commit: 924e52a4b00c661a653be785dd72b7bc35202bd7
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Dec 25 09:47:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 25 10:20:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924e52a4

media-gfx/sane-backends: stable 1.0.32 for sparc, bug #829924

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index 007349e5a44a..d88f04928455 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-12-24 Thread Arthur Zamarin

commit: 071ab6df39d6e2b29581e7d228cc741284993731
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 24 19:32:37 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 24 19:32:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071ab6df

media-gfx/sane-backends: Stabilize 1.0.32 arm64, #829924

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index c09ffea97490..007349e5a44a 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-12-24 Thread Arthur Zamarin

commit: 12b7b7d5e49b13694696a58c44b345ec6da79fa4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 24 16:02:53 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 24 16:02:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b7b7d5

media-gfx/sane-backends: Stabilize 1.0.32 ppc64, #829924

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index a68a9b0f7f9a..c09ffea97490 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-12-24 Thread Arthur Zamarin

commit: 5710533f99f22b38204403467cc4409454e4cabd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 24 16:01:25 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 24 16:01:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5710533f

media-gfx/sane-backends: Stabilize 1.0.32 ppc, #829924

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index b606177be709..a68a9b0f7f9a 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-12-24 Thread Arthur Zamarin

commit: 264f20ed9db552c7638850a38f0b7ce9eb7f2642
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 24 16:01:02 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 24 16:01:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264f20ed

media-gfx/sane-backends: Stabilize 1.0.32 arm, #829924

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index c7bf3d62a5af..b606177be709 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-12-24 Thread Jakov Smolić

commit: f053289e9bdb59dc2872f7abf3b925365d7a060d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Dec 24 13:50:56 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Dec 24 13:50:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f053289e

media-gfx/sane-backends: Stabilize 1.0.32 amd64, #829924

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index 8b3d4b7763ca..c7bf3d62a5af 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-11-25 Thread Jason A. Donenfeld

commit: 4fc443e8c721684eca19b1f44f015d711198da8f
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Thu Nov 25 13:44:55 2021 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Nov 25 13:44:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc443e8

media-gfx/sane-backends: recommend sane-airscan

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jason A. Donenfeld  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.32.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index 36bb18f0a982..8b3d4b7763ca 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -337,6 +337,7 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
+   optfeature "Network scanner backend" media-gfx/sane-airscan
optfeature "Epson-specific backend" media-gfx/iscan
optfeature "HP-specific backend" net-print/hplip

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

2021-10-19 Thread Sam James

commit: 708719b2b0f6c899950e6da443a60d306601cd81
Author: Guillaume Castagnino  xwing  info>
AuthorDate: Mon Oct 18 19:13:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 20 01:09:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708719b2

media-gfx/sane-backends: bump to 1.0.32

* fix tarball source
(https://gitlab.com/sane-project/backends/-/issues/248)
* remove patches not needed anymore

Signed-off-by: Guillaume Castagnino  xwing.info>
Closes: https://bugs.gentoo.org/818838
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/22628
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sane-backends/Manifest   |   1 +
 .../sane-backends/sane-backends-1.0.32.ebuild  | 352 +
 2 files changed, 353 insertions(+)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 789686c7720..7d1b5d8608b 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1 +1,2 @@
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B 
d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298
 SHA512 
d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
+DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 
8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83
 SHA512 
416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
new file mode 100644
index 000..36bb18f0a98
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/${P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-group/scanner
+   acct-user/saned
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+

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

2021-08-02 Thread Marek Szuba

commit: 96cb0309f87aba839e658f25fa5911f7dc4f51a9
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug  2 09:19:20 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug  2 12:33:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96cb0309

media-gfx/sane-backends: keyword 1.0.31-r2 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
index 0e3cb32ecc8..fd7cd87c600 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 # python-any-r1 required for a script in
 # backends/pixma/scripts/
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-04-24 Thread Andreas Sturmlechner

commit: 190f87bfa432f11fbc2bdefd290c9ad878e116ca
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 24 15:46:01 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 24 15:48:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190f87bf

media-gfx/sane-backends: Drop 1.0.31 (r0), user.eclass--

Bug: https://bugs.gentoo.org/781326
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../sane-backends/sane-backends-1.0.31.ebuild  | 365 -
 1 file changed, 365 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
deleted file mode 100644
index d315d3ef741..000
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev user
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-   abaton
-   agfafocus
-   apple
-   artec
-   artec_eplus48u
-   as6e
-   avision
-   bh
-   canon
-   canon630u
-   canon_dr
-   canon_lide70
-   canon_pp
-   cardscan
-   coolscan
-   coolscan2
-   coolscan3
-   dc210
-   dc240
-   dc25
-   dell1600n_net
-   dmc
-   epjitsu
-   epson
-   epson2
-   escl
-   fujitsu
-   genesys
-   gt68xx
-   hp
-   hp3500
-   hp3900
-   hp4200
-   hp5400
-   hp5590
-   hpljm1005
-   hpsj5s
-   hs2p
-   ibm
-   kodak
-   kodakaio
-   kvs1025
-   kvs20xx
-   kvs40xx
-   leo
-   lexmark
-   ma1509
-   magicolor
-   matsushita
-   microtek
-   microtek2
-   mustek
-   mustek_pp
-   mustek_usb
-   mustek_usb2
-   nec
-   net
-   niash
-   p5
-   pie
-   pieusb
-   pixma
-   plustek
-   plustek_pp
-   pnm
-   qcam
-   ricoh
-   ricoh2
-   rts8891
-   s9036
-   sceptre
-   sharp
-   sm3600
-   sm3840
-   snapscan
-   sp15c
-   st400
-   stv680
-   tamarack
-   teco1
-   teco2
-   teco3
-   test
-   u12
-   umax
-   umax1220u
-   umax_pp
-   xerox_mfp
-)
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-   case ${GBACKEND} in
-   # Disable backends that require parallel ports as no one has those 
anymore.
-   canon_pp|hpsj5s|mustek_pp|\
-   pnm|mustek_usb2|kvs40xx)
-   IUSE+=" sane_backends_${GBACKEND}"
-   ;;
-   *)
-   IUSE+=" +sane_backends_${GBACKEND}"
-   esac
-done
-
-REQUIRED_USE="
-   sane_backends_escl? ( zeroconf )
-   sane_backends_kvs40xx? ( threads )
-   sane_backends_mustek_usb2? ( threads )
-"
-
-MY_PN="${PN//sane-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/;
-SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-   gphoto2? (
-   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dell1600n_net? (
-   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_escl? (
-   app-text/poppler[cairo]
-   || (
-   net-dns/avahi[dbus]
-   net-dns/avahi[gtk]
-   net-dns/avahi[gtk2]
-   )
-   net-dns/avahi[${MULTILIB_USEDEP}]
-   net-misc/curl[${MULTILIB_USEDEP}]
-   )
-   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   snmp? (

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

2021-04-24 Thread Andreas Sturmlechner

commit: 9392355deeb49c69937d2f53682eccb7053702b5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr  5 09:06:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 24 15:48:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9392355d

media-gfx/sane-backends: Drop net-dns/avahi[gtk2]

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{sane-backends-1.0.31-r1.ebuild => sane-backends-1.0.31-r2.ebuild}   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
similarity index 99%
rename from media-gfx/sane-backends/sane-backends-1.0.31-r1.ebuild
rename to media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
index 7893ea1a7be..b245efafa9c 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
@@ -153,7 +153,6 @@ RDEPEND="
|| (
net-dns/avahi[dbus]
net-dns/avahi[gtk]
-   net-dns/avahi[gtk2]
)
net-dns/avahi[${MULTILIB_USEDEP}]
net-misc/curl[${MULTILIB_USEDEP}]

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

2021-04-24 Thread Andreas Sturmlechner

commit: 0ad361ff2f586c17aeff51d8e6afb6aa0703e563
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 24 15:45:05 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 24 15:48:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad361ff

media-gfx/sane-backends: Rollover stable keywords to 1.0.31-r2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
index b245efafa9c..0e3cb32ecc8 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-04-11 Thread Conrad Kostecki

commit: 5291156d13761c95a3c02a544297623bbe132c6d
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr 11 20:20:07 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr 11 20:52:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5291156d

media-gfx/sane-backends: migrate to GLEP 81

Closes: https://bugs.gentoo.org/781326
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../sane-backends/sane-backends-1.0.31-r1.ebuild   | 361 +
 1 file changed, 361 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31-r1.ebuild
new file mode 100644
index 000..7893ea1a7be
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.31-r1.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_lide70
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pieusb
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+MY_PN="${PN//sane-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   acct-group/scanner
+   acct-user/saned
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dell1600n_net? (
+   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_escl? (
+   app-text/poppler[cairo]
+   || (
+   net-dns/avahi[dbus]
+   net-dns/avahi[gtk]
+   net-dns/avahi[gtk2]
+   )
+   net-dns/avahi[${MULTILIB_USEDEP}]
+   net-misc/curl[${MULTILIB_USEDEP}]
+   )
+   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_pixma? (

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

2021-04-05 Thread Andreas Sturmlechner

commit: 13e43411abc6f410a4d227395767d8886d107fa3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr  5 09:07:10 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr  5 09:12:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e43411

media-gfx/sane-backends: Drop 1.0.30-r2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/sane-backends/Manifest   |   1 -
 .../sane-backends-1.0.30-bigendian-depth.patch |  14 -
 ...ne-backends-1.0.30-missing-stdint-include.patch |  14 -
 .../sane-backends/sane-backends-1.0.30-r2.ebuild   | 350 -
 4 files changed, 379 deletions(-)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index ab68444f748..789686c7720 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,2 +1 @@
-DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 
139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5
 SHA512 
19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B 
d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298
 SHA512 
d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch 
b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
deleted file mode 100644
index bac06593b9e..000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Correct overlooked bigendian case.  This has been fixed upstream in a different
-way since the 1.0.30 release.
-
 a/backend/genesys/low.cpp
-+++ b/backend/genesys/low.cpp
-@@ -539,7 +539,7 @@
- }
- 
- #ifdef WORDS_BIGENDIAN
--if (depth == 16) {
-+if (session.params.depth == 16) {
- dev->pipeline.push_node();
- }
- #endif

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
 
b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
deleted file mode 100644
index 14c97ae95bf..000
--- 
a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://gitlab.com/sane-project/backends/-/issues/314
-https://gitlab.com/sane-project/backends/-/commit/6bb87fdf1f3dc190cfc4b7d64b0c8c8c3d10151b.diff
 a/sanei/sanei_usb.c
-+++ b/sanei/sanei_usb.c
-@@ -48,6 +48,9 @@
- 
- #include "../include/sane/config.h"
- 
-+#ifdef HAVE_STDINT_H
-+# include 
-+#endif
- #include 
- #include 
- #include 

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
deleted file mode 100644
index 58731276dda..000
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal optfeature systemd 
toolchain-funcs udev user
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-   abaton
-   agfafocus
-   apple
-   artec
-   artec_eplus48u
-   as6e
-   avision
-   bh
-   canon
-   canon630u
-   canon_dr
-   canon_pp
-   cardscan
-   coolscan
-   coolscan2
-   coolscan3
-   dc210
-   dc240
-   dc25
-   dell1600n_net
-   dmc
-   epjitsu
-   epson
-   epson2
-   escl
-   fujitsu
-   genesys
-   gt68xx
-   hp
-   hp3500
-   hp3900
-   hp4200
-   hp5400
-   hp5590
-   hpljm1005
-   hpsj5s
-   hs2p
-   ibm
-   kodak
-   kodakaio
-   kvs1025
-   kvs20xx
-   kvs40xx
-   leo
-   lexmark
-   ma1509
-   magicolor
-   matsushita
-   microtek
-   microtek2
-   mustek
-   mustek_pp
-   mustek_usb
-   mustek_usb2
-   nec
-   net
-   niash
-   p5
-   pie
-   pixma
-   plustek
-   plustek_pp
-   pnm
-   qcam
-   ricoh
-   ricoh2
-   rts8891
-   s9036
-   sceptre
-   sharp
-   sm3600
-   sm3840
-   snapscan
-   sp15c
-   st400
-   stv680
-   tamarack
-   teco1
-   teco2
-   teco3
-   test
-   u12
-   umax
-   umax1220u
-   umax_pp
-   xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for

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

2021-03-30 Thread Thomas Deutschmann

commit: 6654988ba3283452517e0fb29b9e5afada097bce
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar 30 16:16:04 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar 30 16:16:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6654988b

media-gfx/sane-backends: x86 stable (bug #771231)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 621a5997d9b..0590455f10a 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-03-19 Thread Mikle Kolyada

commit: df91d374b8baaeb4a28f519a87dc8ed23d49071a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Mar 19 18:12:16 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Mar 19 18:12:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df91d374

media-gfx/sane-backends: Stabilize 1.0.31 amd64, #771231

Signed-off-by: Mikle Kolyada  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 3e2a0e58518..621a5997d9b 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-03-14 Thread Sam James

commit: 5278ef4a71ee7ce6628862fafc8216fd1cef5b12
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 03:51:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 03:51:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5278ef4a

media-gfx/sane-backends: Stabilize 1.0.31 arm, #771231

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

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 8d35afddfd2..d8a28a87886 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-03-14 Thread Sam James

commit: 5d3417fd1f94e7223ee65cd9324770e342f80a37
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 14 22:11:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 14 22:11:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3417fd

media-gfx/sane-backends: Stabilize 1.0.31 ppc, #771231

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

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 78b2356d0b2..8d35afddfd2 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-03-14 Thread Sam James

commit: 1e59c7bc31222a6d8a8f33da8849dc3e58b6d0bc
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 14 22:10:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 14 22:10:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e59c7bc

media-gfx/sane-backends: Stabilize 1.0.31 ppc64, #771231

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

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 9f7f6b79402..78b2356d0b2 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-03-14 Thread Sam James

commit: 6600d0f5ab7909d8a6c970acb060ec8432f2d028
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 14 22:02:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 14 22:02:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6600d0f5

media-gfx/sane-backends: Stabilize 1.0.31 arm64, #771231

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

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index f222da2527c..9f7f6b79402 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2021-01-29 Thread Lars Wendler

commit: 13139e37b007d32a4715b77dc7213459a75d33a5
Author: Michael Cook  mackal  net>
AuthorDate: Fri Jan 29 12:57:23 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 29 12:57:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13139e37

media-gfx/sane-backends: Don't enable escl backend for non-native ABI

Closes: https://bugs.gentoo.org/765379
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index acb6d8ba149..c8b16df1f93 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -231,9 +231,10 @@ multilib_src_configure() {
 
use gphoto2 && lbackends="gphoto2"
use v4l && lbackends+=" v4l"
+   use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
local backend
for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-   if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] 
; then
+   if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] 
&& [[ "${backend}" != escl ]] ; then
lbackends+=" ${backend}"
fi
done

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

2021-01-13 Thread Lars Wendler

commit: 7d09842f4db2651a779797177ec6f842a2964d1e
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jan 14 07:51:19 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jan 14 07:51:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d09842f

media-gfx/sane-backends: Another attempt to fix poppler-glib issue

Bug: https://bugs.gentoo.org/765379
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 27c595dd123..acb6d8ba149 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -242,7 +242,7 @@ multilib_src_configure() {
$(use_with usb)
$(multilib_native_use_with snmp)
 
-   $(multilib_native_usex sane_backends_escl --with-poppler-glib 
'')
+   $(multilib_native_use_with sane_backends_escl poppler-glib)
# you can only enable this backend, not disable it...
$(usex sane_backends_pnm --enable-pnm-backend '')
$(usex sane_backends_mustek_pp --enable-parport-directio '')

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

2021-01-13 Thread Lars Wendler

commit: ff087acb69c4915a994b05f88502ef72c1c10e45
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 19:01:37 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 19:01:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff087acb

media-gfx/sane-backends: Only enable poppler-glib for native ABI

Bug: https://bugs.gentoo.org/765202
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 0c25d0ee829..27c595dd123 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -242,7 +242,7 @@ multilib_src_configure() {
$(use_with usb)
$(multilib_native_use_with snmp)
 
-   $(usex sane_backends_escl --with-poppler-glib '')
+   $(multilib_native_usex sane_backends_escl --with-poppler-glib 
'')
# you can only enable this backend, not disable it...
$(usex sane_backends_pnm --enable-pnm-backend '')
$(usex sane_backends_mustek_pp --enable-parport-directio '')

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

2021-01-13 Thread Lars Wendler

commit: 735fdc02942c9c3cec54d686ecdfaec58515c0c5
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 09:33:02 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 09:33:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735fdc02

media-gfx/sane-backends: Depend on app-text/poppler[cairo]

Closes: https://bugs.gentoo.org/765202
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 7624d2646d0..0c25d0ee829 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -147,7 +147,7 @@ RDEPEND="
>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
)
sane_backends_escl? (
-   app-text/poppler
+   app-text/poppler[cairo]
|| (
net-dns/avahi[dbus]
net-dns/avahi[gtk]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/, profiles/desc/

2021-01-13 Thread Lars Wendler

commit: 8e3f3b28101468af3e316aea02dafd5d54b2aadc
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 08:26:27 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 08:28:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3f3b28

media-gfx/sane-backends: escl backend required app-text-poppler

Added canon_lide70 backend

Closes: https://bugs.gentoo.org/765187
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 3 +++
 profiles/desc/sane_backends.desc| 1 +
 2 files changed, 4 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index 1e3fa2cc147..7624d2646d0 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -23,6 +23,7 @@ IUSE_SANE_BACKENDS=(
canon
canon630u
canon_dr
+   canon_lide70
canon_pp
cardscan
coolscan
@@ -146,6 +147,7 @@ RDEPEND="
>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
)
sane_backends_escl? (
+   app-text/poppler
|| (
net-dns/avahi[dbus]
net-dns/avahi[gtk]
@@ -240,6 +242,7 @@ multilib_src_configure() {
$(use_with usb)
$(multilib_native_use_with snmp)
 
+   $(usex sane_backends_escl --with-poppler-glib '')
# you can only enable this backend, not disable it...
$(usex sane_backends_pnm --enable-pnm-backend '')
$(usex sane_backends_mustek_pp --enable-parport-directio '')

diff --git a/profiles/desc/sane_backends.desc b/profiles/desc/sane_backends.desc
index b602cf9dd10..3596b4cf2e4 100644
--- a/profiles/desc/sane_backends.desc
+++ b/profiles/desc/sane_backends.desc
@@ -16,6 +16,7 @@ bh - SANE_BACKENDS setting for building the bh backend
 canon - SANE_BACKENDS setting for building the canon backend
 canon630u - SANE_BACKENDS setting for building the canon630u backend
 canon_dr - SANE_BACKENDS setting for building the canon_dr backend
+canon_lide70 - SANE_BACKENDS setting for building the canon_lide70 backend
 canon_pp - SANE_BACKENDS setting for building the canon_pp backend
 cardscan - SANE_BACKENDS setting for building the cardscan backend
 coolscan - SANE_BACKENDS setting for building the coolscan backend

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

2021-01-12 Thread Lars Wendler

commit: 42ce65a25ea3a37db92b73da90b3e73e46eabeb3
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 01:58:12 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 01:58:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ce65a2

media-gfx/sane-backends: Moved PYTHON_DEPS to BDEPEND

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.31.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index abf6a807651..1e3fa2cc147 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 
 # python-any-r1 required for a script in
-# backends/pixma/scripts/ 
+# backends/pixma/scripts/
 inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 
systemd toolchain-funcs udev user
 
 # gphoto and v4l are handled by their usual USE flags.
@@ -166,11 +166,11 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-   ${PYHTON_DEPS}
dev-libs/libxml2
v4l? ( sys-kernel/linux-headers )
 "
 BDEPEND="
+   ${PYTHON_DEPS}
sys-devel/autoconf-archive
sys-devel/gettext
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/files/, media-gfx/sane-backends/, profiles/desc/

2021-01-12 Thread Lars Wendler

commit: dcbeb65befc813a87bc9f0d45adefb5fa954f196
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 01:19:43 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 01:21:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbeb65b

media-gfx/sane-backends: Bump to version 1.0.31

- Fixed build with autoconf-2.70 (#750374)
- Added support for pieusb backend (#744703)
- Added python-any-r1 eclass because the auto-generated gitlab
  tarballs we use require to generate some files with a shipped
  python script
- Removed user LDFLAGS from pkgconfig files
- Converted some variables into arrays
- Minor ebuild overhaul

Closes: https://bugs.gentoo.org/744703
Closes: https://bugs.gentoo.org/750374
Closes: https://bugs.gentoo.org/759982
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-gfx/sane-backends/Manifest   |   1 +
 .../files/sane-backends-1.0.31-autoconf-2.70.patch |  93 ++
 .../sane-backends-1.0.31-backend_pot_input.patch   |  33 ++
 .../sane-backends-1.0.31-udev_rules_update.patch   |  55 
 .../sane-backends/sane-backends-1.0.31.ebuild  | 362 +
 profiles/desc/sane_backends.desc   |   1 +
 6 files changed, 545 insertions(+)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 4a1266cd003..ab68444f748 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1 +1,2 @@
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 
139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5
 SHA512 
19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
+DIST backends-1.0.31.tar.gz 5731445 BLAKE2B 
d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298
 SHA512 
d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch 
b/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
new file mode 100644
index 000..f1fe4765bdd
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
@@ -0,0 +1,93 @@
+From 445b5bd7e19245c08de6a0e669dd9211d2597bfa Mon Sep 17 00:00:00 2001
+From: Olaf Meeuwissen 
+Date: Fri, 1 Jan 2021 15:53:11 +0900
+Subject: [PATCH] Drop use of obsoleted autoconf AC_HEADER_STDC macro.  Fixes
+ #409
+
+Use of the STDC_HEADER pre-processor macro that the autoconf macro
+used to define has been removed.  Conditionalized code is now used
+unconditionally.  This should be fine as the macro checks for ANSI
+C, i.e. C89 (ISO C90), compliant headers.  We already require C99.
+---
+ acinclude.m4|  3 ---
+ lib/md5.c   | 10 ++
+ sanei/sanei_pa4s2.c |  8 +++-
+ sanei/sanei_pp.c|  8 +++-
+ 4 files changed, 8 insertions(+), 21 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index e10f8ceb2..9393278c2 100644
+--- a/acinclude.m4
 b/acinclude.m4
+@@ -73,9 +73,6 @@ AC_DEFUN([SANE_CHECK_MISSING_HEADERS],
+   if test "${ac_cv_header_unistd_h}" != "yes" ; then
+ MISSING_HEADERS="${MISSING_HEADERS}\"unistd.h\" "
+   fi
+-  if test "${ac_cv_header_stdc}" != "yes" ; then
+-MISSING_HEADERS="${MISSING_HEADERS}\"ANSI C headers\" "
+-  fi
+   if test "${MISSING_HEADERS}" != "" ; then
+ echo "*** The following essential header files couldn't be found:"
+ echo "*** ${MISSING_HEADERS}"
+diff --git a/lib/md5.c b/lib/md5.c
+index 923a17c78..009c6d9a0 100644
+--- a/lib/md5.c
 b/lib/md5.c
+@@ -26,14 +26,8 @@
+ 
+ #include 
+ 
+-#if STDC_HEADERS || defined _LIBC
+-# include 
+-# include 
+-#else
+-# ifndef HAVE_MEMCPY
+-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+-# endif
+-#endif
++#include 
++#include 
+ 
+ #include "md5.h"
+ 
+diff --git a/sanei/sanei_pa4s2.c b/sanei/sanei_pa4s2.c
+index b1d95fe02..5365151fd 100644
+--- a/sanei/sanei_pa4s2.c
 b/sanei/sanei_pa4s2.c
+@@ -150,11 +150,9 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
+ 
+ #endif /* NDEBUG */
+ 
+-#if defined(STDC_HEADERS)
+-# include 
+-# include 
+-# include 
+-#endif
++#include 
++#include 
++#include 
+ #if defined(HAVE_STRING_H)
+ # include 
+ #elif defined(HAVE_STRINGS_H)
+diff --git a/sanei/sanei_pp.c b/sanei/sanei_pp.c
+index 3077342e4..752945a89 100644
+--- a/sanei/sanei_pp.c
 b/sanei/sanei_pp.c
+@@ -135,11 +135,9 @@ inb( u_long port )
+ #include "../include/sane/sanei_debug.h"
+ #include "../include/sane/sanei_pp.h"
+ 
+-#if defined(STDC_HEADERS)
+-# include 
+-# include 
+-# include 
+-#endif
++#include 
++#include 
++#include 
+ #if defined(HAVE_STRING_H)
+ # include 
+ #elif defined(HAVE_STRINGS_H)
+-- 
+GitLab
+

diff --git

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

2020-09-17 Thread Sam James

commit: 619a6b6164660089f7dee5fcb6ea484f7bcff72b
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 17 23:20:15 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 17 23:20:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619a6b61

media-gfx/sane-backends: security cleanup

Bug: https://bugs.gentoo.org/729312
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sane-backends/Manifest   |   1 -
 .../sane-backends-1.0.27-canon-lide-100.patch  |  17 -
 .../files/sane-backends-1.0.27-network.patch   |  42 ---
 .../sane-backends-1.0.27-revert-samsung.patch  | 406 -
 ...ne-backends-1.0.27-uninitialized-variable.patch |  25 --
 .../sane-backends/sane-backends-1.0.27-r3.ebuild   | 344 -
 6 files changed, 835 deletions(-)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 1e5f15e24b2..4a1266cd003 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,2 +1 @@
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 
139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5
 SHA512 
19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
-DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 
90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456
 SHA512 
c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch 
b/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch
deleted file mode 100644
index 504f9e666e6..000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up sane-backends-1.0.27/backend/genesys.c.canon-lide-100 
sane-backends-1.0.27/backend/genesys.c
 sane-backends-1.0.27/backend/genesys.c.canon-lide-100  2018-02-01 
10:37:26.160044539 +0100
-+++ sane-backends-1.0.27/backend/genesys.c 2018-02-01 10:45:44.616653277 
+0100
-@@ -2070,11 +2070,9 @@ genesys_white_shading_calibration (Genes
-   dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE);
-   dev->model->cmd_set->set_motor_power (dev->calib_reg, motor);
- 
--  /* if needed, go back before doin next scan, by using rewind, registers and
--   * slopes table are kept intact from previous scan */
--  if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && 
dev->model->cmd_set->rewind)
-+  if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK)
- {
--  status = dev->model->cmd_set->rewind (dev);
-+  status = dev->model->cmd_set->slow_back_home (dev, SANE_TRUE);
- }
- 
-   status =

diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch 
b/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch
deleted file mode 100644
index 2605ea83578..000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
-index a57d7c7..d0a1e92 100644
 a/sanei/sanei_tcp.c
-+++ b/sanei/sanei_tcp.c
-@@ -45,6 +45,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef HAVE_WINSOCK2_H
- #include 
-@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
- ssize_t
- sanei_tcp_read(int fd, u_char * buf, int count)
- {
--ssize_t bytes_recv = 0, rc = 1;
-+ssize_t bytes_recv = 0, rc = 1;
-+  int retry = 5;
- 
-   while (bytes_recv < count && rc > 0)
-   {
-   rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
-+  DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
-   if (rc > 0)
- bytes_recv += rc;
--
-+  else {
-+  if ( errno == EAGAIN && retry-- ) {
-+  DBG(1, "%s: waiting  %d\n", __FUNCTION__, 
retry);
-+  /* wait for max 1s */
-+  struct timespec req;
-+  struct timespec rem;
-+  req.tv_sec = 0;
-+  req.tv_nsec= 1;
-+  nanosleep(, );  
-+  rc = 1;
-+  }
-+  }
-   }
-   return bytes_recv;
- }

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch 
b/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
deleted file mode 100644
index af3e141a010..000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-From

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

2020-09-02 Thread Sergei Trofimovich

commit: ecce9f7bd8bc4b95307cfe03cb756f97d5e95ef9
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Sep  2 19:54:47 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep  2 21:03:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecce9f7b

media-gfx/sane-backends: drop to ~hppa

Package-Manager: Portage-3.0.4, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index b2767d69d40..3470233904f 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -122,7 +122,7 @@ 
SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz;
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )

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

2020-08-29 Thread Thomas Deutschmann

commit: 86121e9a860e737adac306778afa8f1cfdb510d0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Aug 29 17:53:03 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Aug 29 17:56:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86121e9a

media-gfx/sane-backends: x86 stable (bug #729312)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index adeb389d709..2b959ff201c 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2020-07-19 Thread Joonas Niilola

commit: 53320292a68d54764d072670814448a3c0f3ff8d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jul 19 10:06:49 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jul 19 10:43:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53320292

media-gfx/sane-backends: fix build issue with escl backend, #733186

 - escl backend requires avahi-client.pc.

Closes: https://bugs.gentoo.org/733186
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index 4c2b751299b..adeb389d709 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -140,6 +140,11 @@ RDEPEND="
>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
)
sane_backends_escl? (
+   || (
+   net-dns/avahi[dbus]
+   net-dns/avahi[gtk]
+   net-dns/avahi[gtk2]
+   )
net-dns/avahi[${MULTILIB_USEDEP}]
net-misc/curl[${MULTILIB_USEDEP}]
)

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

2020-07-11 Thread Sam James

commit: ea346ab15ef9b8cadd028294658a46993c1203fb
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 11 18:19:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 11 18:21:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea346ab1

media-gfx/sane-backends: sparc stable (bug #729312)

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

 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index d5fc05889b5..db8a58be400 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2020-07-10 Thread Sam James

commit: 5b082cfd38a90b7f3ddf18e077fbfeac3d5c197e
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 10 13:22:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 10 13:22:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b082cfd

media-gfx/sane-backends: arm stable (bug #729312)

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

 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index 9ec9f076d3b..d5fc05889b5 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2020-07-06 Thread Mart Raudsepp

commit: e553e7b748a47ea49daf49848f6734986bb9c8f4
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Mon Jul  6 02:03:25 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jul  6 11:27:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e553e7b7

media-gfx/sane-backends: arm64 stable (bug #729312)

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index 49a82d81cd8..9ec9f076d3b 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2020-07-06 Thread Sergei Trofimovich

commit: eb6daadb4b6243f775ee40b4d8330ce9d7f24a38
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jul  6 07:18:06 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 07:18:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6daadb

media-gfx/sane-backends: stable 1.0.30-r2 for ppc64

stable wrt bug #729312

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index 1e87272bf5f..49a82d81cd8 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2020-07-06 Thread Sergei Trofimovich

commit: d4f027bac13455c35605a35c4a8c918fbfb1e2e6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jul  6 06:59:53 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 07:02:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f027ba

media-gfx/sane-backends: stable 1.0.30-r2 for ppc

stable wrt bug #729312

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index d81a991ad81..1e87272bf5f 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ 
SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="

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

2020-06-28 Thread Jeroen Roovers

commit: 49491819885af7f659dafe3a116ada80fbcfe1d7
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 28 08:23:11 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 28 08:24:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49491819

media-gfx/sane-backends: Fix genesys backend on bigendian

Fixes a compile failure on HPPA (and other BE architectures):

backend/genesys/low.cpp:542:9: error: ‘depth’ was not declared in this
scope

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Bug: https://bugs.gentoo.org/729312
Signed-off-by: Jeroen Roovers  gentoo.org>

 .../files/sane-backends-1.0.30-bigendian-depth.patch   | 14 ++
 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch 
b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
new file mode 100644
index 000..bac06593b9e
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
@@ -0,0 +1,14 @@
+Correct overlooked bigendian case.  This has been fixed upstream in a different
+way since the 1.0.30 release.
+
+--- a/backend/genesys/low.cpp
 b/backend/genesys/low.cpp
+@@ -539,7 +539,7 @@
+ }
+ 
+ #ifdef WORDS_BIGENDIAN
+-if (depth == 16) {
++if (session.params.depth == 16) {
+ dev->pipeline.push_node();
+ }
+ #endif

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index e7eb2d4d7dd..d81a991ad81 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -168,7 +168,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
"${FILESDIR}"/${P}-missing-stdint-include.patch
-   "${FILESDIR}"/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
+   "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+   "${FILESDIR}"/${PN}-1.0.30-bigendian-depth.patch
 )
 
 S="${WORKDIR}/${MY_P}"

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

2020-06-28 Thread Joonas Niilola

commit: 117940f3721bb3530b37048e81d34c864b117c61
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jun 28 07:39:53 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 28 07:40:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117940f3

media-gfx/sane-backends: remove old 1.0.30-r1

Signed-off-by: Joonas Niilola  gentoo.org>

 .../sane-backends/sane-backends-1.0.30-r1.ebuild   | 337 -
 1 file changed, 337 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild
deleted file mode 100644
index 2748eaef313..000
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs 
udev user
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-   abaton
-   agfafocus
-   apple
-   artec
-   artec_eplus48u
-   as6e
-   avision
-   bh
-   canon
-   canon630u
-   canon_dr
-   canon_pp
-   cardscan
-   coolscan
-   coolscan2
-   coolscan3
-   dc210
-   dc240
-   dc25
-   dell1600n_net
-   dmc
-   epjitsu
-   epson
-   epson2
-   escl
-   fujitsu
-   genesys
-   gt68xx
-   hp
-   hp3500
-   hp3900
-   hp4200
-   hp5400
-   hp5590
-   hpljm1005
-   hpsj5s
-   hs2p
-   ibm
-   kodak
-   kodakaio
-   kvs1025
-   kvs20xx
-   kvs40xx
-   leo
-   lexmark
-   ma1509
-   magicolor
-   matsushita
-   microtek
-   microtek2
-   mustek
-   mustek_pp
-   mustek_usb
-   mustek_usb2
-   nec
-   net
-   niash
-   p5
-   pie
-   pixma
-   plustek
-   plustek_pp
-   pnm
-   qcam
-   ricoh
-   rts8891
-   s9036
-   sceptre
-   sharp
-   sm3600
-   sm3840
-   snapscan
-   sp15c
-   st400
-   stv680
-   tamarack
-   teco1
-   teco2
-   teco3
-   test
-   u12
-   umax
-   umax1220u
-   umax_pp
-   xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS}; do
-   case ${GBACKEND} in
-   # Disable backends that require parallel ports as no one has those 
anymore.
-   canon_pp|hpsj5s|mustek_pp|\
-   pnm|mustek_usb2|kvs40xx)
-   IUSE+=" sane_backends_${GBACKEND}"
-   ;;
-   *)
-   IUSE+=" +sane_backends_${GBACKEND}"
-   esac
-done
-
-REQUIRED_USE="
-   sane_backends_escl? ( zeroconf )
-   sane_backends_kvs40xx? ( threads )
-   sane_backends_mustek_usb2? ( threads )
-"
-
-MY_PN=${PN//sane-/}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/;
-SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-   gphoto2? (
-   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dell1600n_net? (
-   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_escl? ( net-misc/curl )
-   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   snmp? ( net-analyzer/net-snmp:0= )
-   systemd? ( sys-apps/systemd:0= )
-   usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-   v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-   xinetd? ( sys-apps/xinetd )
-   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-   dev-libs/libxml2
-   v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-   "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-   "${FILESDIR}"/${P}-missing-stdint-include.patch
-   "${FILESDIR}"/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
-)
-

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

2020-06-28 Thread Joonas Niilola

commit: a4f54515916bb0fb696fb3cbf7632573e1651d60
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sat Jun 27 05:21:55 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 28 07:40:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f54515

media-gfx/sane-backends: add ricoh2 backend, fix IUSE defaults, etc

Changes:
* Add the ricoh2 backend

* Set +zeroconf by default, to avoid a REQUIRED_USE choice
  being required out of the box. The other backends with
  a REQUIRED_USE are disabled by default.

  We could switch to turning off escl by default instead,
  if defaulting to zeroconf is unfavourable.

* Switch escl dep to be multilib, and add
  missing avahi dependency.

* Add pixma libjpeg dep, which was referenced in
  the ChangeLog for 1.0.28.

Bug: https://bugs.gentoo.org/729312
Closes: https://bugs.gentoo.org/729850
Closes: https://bugs.gentoo.org/729808
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/16447
Signed-off-by: Joonas Niilola  gentoo.org>

 .../sane-backends/sane-backends-1.0.30-r2.ebuild   | 345 +
 1 file changed, 345 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
new file mode 100644
index 000..e7eb2d4d7dd
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs 
udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   ricoh2
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp"
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+MY_PN=${PN//sane-/}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see 
https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dell1600n_net? (
+   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_escl? (
+   net-dns/avahi[${MULTILIB_USEDEP}]
+   net-misc/curl[${MULTILIB_USEDEP}]
+   )
+

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

2020-06-27 Thread Joonas Niilola

commit: 35386c3761b3885f4ae1f6b8c07c06867435e982
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jun 27 08:14:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jun 27 08:14:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35386c37

media-gfx/sane-backends: update variable in 1.0.30

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild
index 7b10feb9770..2748eaef313 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild
@@ -200,7 +200,7 @@ multilib_src_configure() {
local lbackends=" "
 
use gphoto2 && lbackends="gphoto2"
-   use v4l && lbackends="${BACKENDS} v4l"
+   use v4l && lbackends="${lbackends} v4l"
for backend in ${IUSE_SANE_BACKENDS}; do
if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
lbackends="${lbackends} ${backend}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/files/, profiles/desc/, media-gfx/sane-backends/

2020-06-27 Thread Joonas Niilola

commit: e3c85c63495281670e30996a1f4804346253e515
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jun 27 06:17:14 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jun 27 06:18:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c85c63

media-gfx/sane-backends: address QA issues, add missing backend to .30

Signed-off-by: Joonas Niilola  gentoo.org>

 ...backends-1.0.30-add_hpaio_epkowa_dll.conf.patch |  11 +
 .../sane-backends/sane-backends-1.0.30-r1.ebuild   | 337 +
 profiles/desc/sane_backends.desc   |   1 +
 3 files changed, 349 insertions(+)

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
 
b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
new file mode 100644
index 000..b92e14b6779
--- /dev/null
+++ 
b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
@@ -0,0 +1,11 @@
+diff -Naur backends-1.0.30/backend/dll.conf.in 
backends-1.0.30-r1/backend/dll.conf.in
+--- backends-1.0.30/backend/dll.conf.in2020-05-17 14:16:28.0 
+0300
 backends-1.0.30-r1/backend/dll.conf.in 2020-06-27 08:24:18.378856341 
+0300
+@@ -98,3 +98,7 @@
+ #umax_pp
+ v4l
+ xerox_mfp
++# Add support for the HP-specific backend.  Needs net-print/hplip installed.
++hpaio
++# Add support for the Epson-specific backend.  Needs media-gfx/iscan 
installed.
++epkowa

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild
new file mode 100644
index 000..7b10feb9770
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r1.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs 
udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   escl
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp"
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS}; do
+   case ${GBACKEND} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm|mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${GBACKEND}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${GBACKEND}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_escl? ( zeroconf )
+   sane_backends_kvs40xx? ( threads )
+   sane_backends_mustek_usb2? ( threads )
+"
+
+MY_PN=${PN//sane-/}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/;
+SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   gphoto2? (
+   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+   sane_backends_dell1600n_net? (
+   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+   )
+

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

2020-06-27 Thread Joonas Niilola

commit: a0e49052d0e68eaf771d08e34dbe88e341d16eda
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jun 27 06:17:53 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jun 27 06:18:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e49052

media-gfx/sane-backends: remove old 1.0.30

Signed-off-by: Joonas Niilola  gentoo.org>

 .../sane-backends/sane-backends-1.0.30.ebuild  | 344 -
 1 file changed, 344 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30.ebuild
deleted file mode 100644
index 19095de1445..000
--- a/media-gfx/sane-backends/sane-backends-1.0.30.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs 
udev user
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-   abaton
-   agfafocus
-   apple
-   artec
-   artec_eplus48u
-   as6e
-   avision
-   bh
-   canon
-   canon630u
-   canon_dr
-   canon_pp
-   cardscan
-   coolscan
-   coolscan2
-   coolscan3
-   dc210
-   dc240
-   dc25
-   dell1600n_net
-   dmc
-   epjitsu
-   epson
-   epson2
-   fujitsu
-   genesys
-   gt68xx
-   hp
-   hp3500
-   hp3900
-   hp4200
-   hp5400
-   hp5590
-   hpljm1005
-   hpsj5s
-   hs2p
-   ibm
-   kodak
-   kodakaio
-   kvs1025
-   kvs20xx
-   kvs40xx
-   leo
-   lexmark
-   ma1509
-   magicolor
-   matsushita
-   microtek
-   microtek2
-   mustek
-   mustek_pp
-   mustek_usb
-   mustek_usb2
-   nec
-   net
-   niash
-   p5
-   pie
-   pixma
-   plustek
-   plustek_pp
-   pnm
-   qcam
-   ricoh
-   rts8891
-   s9036
-   sceptre
-   sharp
-   sm3600
-   sm3840
-   snapscan
-   sp15c
-   st400
-   stv680
-   tamarack
-   teco1
-   teco2
-   teco3
-   test
-   u12
-   umax
-   umax1220u
-   umax_pp
-   xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
-
-for backend in ${IUSE_SANE_BACKENDS}; do
-   case ${backend} in
-   # Disable backends that require parallel ports as no one has those 
anymore.
-   canon_pp|hpsj5s|mustek_pp|\
-   pnm)
-   IUSE+=" -sane_backends_${backend}"
-   ;;
-   mustek_usb2|kvs40xx)
-   IUSE+=" sane_backends_${backend}"
-   ;;
-   *)
-   IUSE+=" +sane_backends_${backend}"
-   esac
-done
-
-REQUIRED_USE="
-   sane_backends_mustek_usb2? ( threads )
-   sane_backends_kvs40xx? ( threads )
-"
-
-MY_PN=${PN//sane-/}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/;
-SRC_URI="https://gitlab.com/sane-project/${MY_PN}/-/archive/${PV}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dell1600n_net? (
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-   gphoto2? (
-   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   )
-   v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-   xinetd? ( sys-apps/xinetd )
-   snmp? ( net-analyzer/net-snmp:0= )
-   systemd? ( sys-apps/systemd:0= )
-   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-   v4l? ( sys-kernel/linux-headers )
-   >=sys-devel/gettext-0.18.1
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-   "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-   "${FILESDIR}"/${P}-missing-stdint-include.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-   /usr/bin/sane-config
-)
-
-pkg_setup() {
-   enewgroup scanner
-   enewuser saned -1 -1 -1 scanner

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

2020-06-26 Thread Thomas Deutschmann

commit: 2359950077b026cc6bbe861b1126f5d34b6eac45
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Mon Jun 22 21:42:47 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jun 26 22:34:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23599500

media-gfx/sane-backends: security bump to 1.0.30

Closes: https://bugs.gentoo.org/691204
Bug: https://bugs.gentoo.org/729312
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/16384
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/sane-backends/Manifest   |   1 +
 ...ne-backends-1.0.30-missing-stdint-include.patch |  14 +
 .../sane-backends/sane-backends-1.0.30.ebuild  | 344 +
 3 files changed, 359 insertions(+)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 44566ad3544..1e5f15e24b2 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1 +1,2 @@
+DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 
139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5
 SHA512 
19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 
90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456
 SHA512 
c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5

diff --git 
a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
 
b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
new file mode 100644
index 000..14c97ae95bf
--- /dev/null
+++ 
b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
@@ -0,0 +1,14 @@
+https://gitlab.com/sane-project/backends/-/issues/314
+https://gitlab.com/sane-project/backends/-/commit/6bb87fdf1f3dc190cfc4b7d64b0c8c8c3d10151b.diff
+--- a/sanei/sanei_usb.c
 b/sanei/sanei_usb.c
+@@ -48,6 +48,9 @@
+ 
+ #include "../include/sane/config.h"
+ 
++#ifdef HAVE_STDINT_H
++# include 
++#endif
+ #include 
+ #include 
+ #include 

diff --git a/media-gfx/sane-backends/sane-backends-1.0.30.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.30.ebuild
new file mode 100644
index 000..19095de1445
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.30.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs 
udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+   abaton
+   agfafocus
+   apple
+   artec
+   artec_eplus48u
+   as6e
+   avision
+   bh
+   canon
+   canon630u
+   canon_dr
+   canon_pp
+   cardscan
+   coolscan
+   coolscan2
+   coolscan3
+   dc210
+   dc240
+   dc25
+   dell1600n_net
+   dmc
+   epjitsu
+   epson
+   epson2
+   fujitsu
+   genesys
+   gt68xx
+   hp
+   hp3500
+   hp3900
+   hp4200
+   hp5400
+   hp5590
+   hpljm1005
+   hpsj5s
+   hs2p
+   ibm
+   kodak
+   kodakaio
+   kvs1025
+   kvs20xx
+   kvs40xx
+   leo
+   lexmark
+   ma1509
+   magicolor
+   matsushita
+   microtek
+   microtek2
+   mustek
+   mustek_pp
+   mustek_usb
+   mustek_usb2
+   nec
+   net
+   niash
+   p5
+   pie
+   pixma
+   plustek
+   plustek_pp
+   pnm
+   qcam
+   ricoh
+   rts8891
+   s9036
+   sceptre
+   sharp
+   sm3600
+   sm3840
+   snapscan
+   sp15c
+   st400
+   stv680
+   tamarack
+   teco1
+   teco2
+   teco3
+   test
+   u12
+   umax
+   umax1220u
+   umax_pp
+   xerox_mfp"
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
+
+for backend in ${IUSE_SANE_BACKENDS}; do
+   case ${backend} in
+   # Disable backends that require parallel ports as no one has those 
anymore.
+   canon_pp|hpsj5s|mustek_pp|\
+   pnm)
+   IUSE+=" -sane_backends_${backend}"
+   ;;
+   mustek_usb2|kvs40xx)
+   IUSE+=" sane_backends_${backend}"
+   ;;
+   *)
+   IUSE+=" +sane_backends_${backend}"
+   esac
+done
+
+REQUIRED_USE="
+   sane_backends_mustek_usb2? ( threads )
+   sane_backends_kvs40xx? ( threads )
+"
+
+MY_PN=${PN//sane-/}
+MY_P="${MY_PN}-${PV}"
+

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

2020-02-16 Thread David Seifert

commit: aaa22115306ee489066cf2e16959c9ad4e7e8395
Author: David Seifert  gentoo  org>
AuthorDate: Sun Feb 16 20:23:42 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Feb 16 20:23:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa22115

media-gfx/sane-backends: [QA] inherit eutils.eclass directly

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index 3f1a9bbf3db..149f3fdc347 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user
+inherit eutils flag-o-matic multilib-minimal systemd toolchain-funcs udev user
 
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.

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

2019-06-02 Thread Pacho Ramos

commit: dbe06956b71382a5ff712c52cf3c7a44e2bf9e93
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun  2 15:00:20 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun  2 15:00:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbe06956

media-gfx/sane-backends: Make repoman more happy

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index f93db841553..597f5de4437 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -235,10 +235,10 @@ multilib_src_configure() {
fi
 
# relative path must be used for tests to work properly
-# All distributions pass --disable-locking because /var/lock/sane/ 
would be a world-writable directory
-# --without-api-spec to not automagically depend on tons of stuff
-# that break in many ways, bug #636202, #668232, #668350
-# People can refer to the "Programmer's Documentation" at 
http://www.sane-project.org/docs.html
+   # All distributions pass --disable-locking because /var/lock/sane/ 
would be a world-writable directory
+   # --without-api-spec to not automagically depend on tons of stuff
+   # that break in many ways, bug #636202, #668232, #668350
+   # People can refer to the "Programmer's Documentation" at 
http://www.sane-project.org/docs.html
ECONF_SOURCE=${S} \
SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
BACKENDS="${BACKENDS}" \

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

2019-06-02 Thread Pacho Ramos

commit: 95a65f55acf95520b5dad46b3f7db11235a23579
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun  2 15:00:45 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun  2 15:00:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a65f55

media-gfx/sane-backends: Drop old

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Pacho Ramos  gentoo.org>

 .../sane-backends/sane-backends-1.0.27-r1.ebuild   | 340 -
 1 file changed, 340 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
deleted file mode 100644
index d69b29324a2..000
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user 
xdg-utils
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-   abaton
-   agfafocus
-   apple
-   artec
-   artec_eplus48u
-   as6e
-   avision
-   bh
-   canon
-   canon630u
-   canon_dr
-   canon_pp
-   cardscan
-   coolscan
-   coolscan2
-   coolscan3
-   dc210
-   dc240
-   dc25
-   dell1600n_net
-   dmc
-   epjitsu
-   epson
-   epson2
-   fujitsu
-   genesys
-   gt68xx
-   hp
-   hp3500
-   hp3900
-   hp4200
-   hp5400
-   hp5590
-   hpljm1005
-   hpsj5s
-   hs2p
-   ibm
-   kodak
-   kodakaio
-   kvs1025
-   kvs20xx
-   kvs40xx
-   leo
-   lexmark
-   ma1509
-   magicolor
-   matsushita
-   microtek
-   microtek2
-   mustek
-   mustek_pp
-   mustek_usb
-   mustek_usb2
-   nec
-   net
-   niash
-   p5
-   pie
-   pixma
-   plustek
-   plustek_pp
-   pnm
-   qcam
-   ricoh
-   rts8891
-   s9036
-   sceptre
-   sharp
-   sm3600
-   sm3840
-   snapscan
-   sp15c
-   st400
-   stv680
-   tamarack
-   teco1
-   teco2
-   teco3
-   test
-   u12
-   umax
-   umax1220u
-   umax_pp
-   xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
-
-for backend in ${IUSE_SANE_BACKENDS}; do
-   case ${backend} in
-   # Disable backends that require parallel ports as no one has those 
anymore.
-   canon_pp|hpsj5s|mustek_pp|\
-   pnm)
-   IUSE+=" -sane_backends_${backend}"
-   ;;
-   mustek_usb2|kvs40xx)
-   IUSE+=" sane_backends_${backend}"
-   ;;
-   *)
-   IUSE+=" +sane_backends_${backend}"
-   esac
-done
-
-REQUIRED_USE="
-   sane_backends_mustek_usb2? ( threads )
-   sane_backends_kvs40xx? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/;
-MY_P="${P}"
-FRS_ID="4224"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz;
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-   sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-   sane_backends_dell1600n_net? (
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-   )
-   sane_backends_canon_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_hpsj5s? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   sane_backends_mustek_pp? ( 
>=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-   usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-   gphoto2? (
-   >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-   >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-   )
-   v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-   xinetd? ( sys-apps/xinetd )
-   snmp? ( net-analyzer/net-snmp )
-   systemd? ( sys-apps/systemd:0= )
-   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-   v4l? ( sys-kernel/linux-headers )
-   >=sys-devel/gettext-0.18.1
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-   !> backend/dll.conf.in <<-EOF
-   # Add support for the HP-specific backend.  Needs net-print/hplip 
installed.
-   hpaio
-   # Add support for the Epson-specific backend.  Needs media-gfx/iscan 
installed.
-

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

2019-06-02 Thread Pacho Ramos

commit: 672a2d6df751ab1688092fafa7d595fb80d8b139
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun  2 14:58:38 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun  2 14:58:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=672a2d6d

media-gfx/sane-backends: Needs to be rebuilt with net-snmp subslot bumps

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index 0b6bfaf0ec2..f93db841553 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
)
v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
xinetd? ( sys-apps/xinetd )
-   snmp? ( net-analyzer/net-snmp )
+   snmp? ( net-analyzer/net-snmp:0= )
systemd? ( sys-apps/systemd:0= )
zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "

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

2019-03-05 Thread Sergei Trofimovich

commit: 9a684076542b58c6241555d84cc8ce7ce59b2678
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Mar  5 19:33:44 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Mar  5 21:17:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a684076

media-gfx/sane-backends: stable 1.0.27-r3 for hppa, bug #676310

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index adbe847d22e..0b6bfaf0ec2 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -122,7 +122,7 @@ 
SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz;
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )

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

2019-02-16 Thread Pacho Ramos

commit: 7547bfd2bf25f36c62e3c99c05c8ac7cb6ca5f36
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Feb 16 08:54:57 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Feb 16 08:55:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7547bfd2

media-gfx/sane-backends: Fix position of the comments

Closes: https://bugs.gentoo.org/677602
Package-Manager: Portage-2.3.58, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Pacho Ramos  gentoo.org>

 ...e-backends-1.0.27-r2.ebuild => sane-backends-1.0.27-r3.ebuild} | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
similarity index 95%
rename from media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
rename to media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index e05d94fee84..adbe847d22e 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -235,13 +235,13 @@ multilib_src_configure() {
fi
 
# relative path must be used for tests to work properly
+# All distributions pass --disable-locking because /var/lock/sane/ 
would be a world-writable directory
+# --without-api-spec to not automagically depend on tons of stuff
+# that break in many ways, bug #636202, #668232, #668350
+# People can refer to the "Programmer's Documentation" at 
http://www.sane-project.org/docs.html
ECONF_SOURCE=${S} \
SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
BACKENDS="${BACKENDS}" \
-   # All distributions pass --disable-locking because /var/lock/sane/ 
would be a world-writable directory
-   # --without-api-spec to not automagically depend on tons of stuff
-   # that break in many ways, bug #636202, #668232, #668350
-   # People can refer to the "Programmer's Documentation" at 
http://www.sane-project.org/docs.html
econf \
--disable-locking \
--without-api-spec \

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

2019-02-07 Thread Mikle Kolyada

commit: a379bf742881eebc573a8a5de8170b142473e6e3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Feb  7 17:02:36 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Feb  7 17:02:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a379bf74

media-gfx/sane-backends: amd64 stable wrt bug #676310

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
index cd73ce37a21..e05d94fee84 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
@@ -122,7 +122,7 @@ 
SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz;
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )

1 2 >

1 - 100 of 145 matches

Mail list logo