* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2016-06-27 16:26 Ulrich Müller
0 siblings, 0 replies; 38+ messages in thread
From: Ulrich Müller @ 2016-06-27 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 390344153d3f0871e3160ce581373290a519a19f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 15:55:35 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 16:25:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39034415
media-gfx/iscan: Migrate from LINGUAS to L10N.
Package-Manager: portage-2.3.0
media-gfx/iscan/iscan-2.26.2.ebuild | 8 ++++----
media-gfx/iscan/iscan-2.29.1.5.ebuild | 12 ++++++------
media-gfx/iscan/iscan-2.30.1.1.ebuild | 12 ++++++------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/media-gfx/iscan/iscan-2.26.2.ebuild b/media-gfx/iscan/iscan-2.26.2.ebuild
index 4bab8ff..edf91b9 100644
--- a/media-gfx/iscan/iscan-2.26.2.ebuild
+++ b/media-gfx/iscan/iscan-2.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -32,7 +32,7 @@ SRC_URI="http://linux.avasys.jp/drivers/iscan/${PV}/${PN}_${PV}-${SRC_REV}.tar.g
LICENSE="GPL-2 AVASYS"
SLOT="0"
-IUSE="X gimp jpeg png tiff doc"
+IUSE="X gimp jpeg png tiff doc l10n_ja"
IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
@@ -64,7 +64,7 @@ src_prepare() {
local i
# convert japanese docs to UTF-8
- if use linguas_ja; then
+ if use l10n_ja; then
for i in {NEWS,README}.ja non-free/*.ja.txt; do
if [ -f "${i}" ]; then
echo ">>> Converting ${i} to UTF-8"
@@ -113,7 +113,7 @@ src_install() {
# install docs
dodoc AUTHORS NEWS README
- use linguas_ja && dodoc NEWS.ja README.ja
+ use l10n_ja && dodoc NEWS.ja README.ja
# install sane config
insinto /etc/sane.d
diff --git a/media-gfx/iscan/iscan-2.29.1.5.ebuild b/media-gfx/iscan/iscan-2.29.1.5.ebuild
index 08f246d..4134dba 100644
--- a/media-gfx/iscan/iscan-2.29.1.5.ebuild
+++ b/media-gfx/iscan/iscan-2.29.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,12 +31,12 @@ DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
SRC_URI="https://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz
doc? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- linguas_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+ l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
)"
LICENSE="GPL-2 AVASYS"
SLOT="0"
-IUSE="X gimp jpeg png tiff doc"
+IUSE="X gimp jpeg png tiff doc l10n_ja"
IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
@@ -70,7 +70,7 @@ src_prepare() {
local i
# convert japanese docs to UTF-8
- if use linguas_ja; then
+ if use l10n_ja; then
for i in {NEWS,README}.ja non-free/*.ja.txt; do
if [ -f "${i}" ]; then
echo ">>> Converting ${i} to UTF-8"
@@ -119,7 +119,7 @@ src_install() {
# install docs
dodoc AUTHORS NEWS README
- use linguas_ja && dodoc NEWS.ja README.ja
+ use l10n_ja && dodoc NEWS.ja README.ja
# install sane config
insinto /etc/sane.d
@@ -128,7 +128,7 @@ src_install() {
# install extra docs
if use doc; then
insinto /usr/share/doc/${PF}
- if use linguas_ja; then
+ if use l10n_ja; then
doins "${DISTDIR}/${MY_DOC}_j.pdf"
else
doins "${DISTDIR}/${MY_DOC}_e.pdf"
diff --git a/media-gfx/iscan/iscan-2.30.1.1.ebuild b/media-gfx/iscan/iscan-2.30.1.1.ebuild
index 24861f4..2b5e22b 100644
--- a/media-gfx/iscan/iscan-2.30.1.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,12 +36,12 @@ SRC_URI="
https://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz
doc? (
https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- linguas_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+ l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
)"
LICENSE="GPL-2 AVASYS"
SLOT="0"
-IUSE="X doc gimp jpeg png tiff"
+IUSE="X doc gimp jpeg png tiff l10n_ja"
IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
@@ -79,7 +79,7 @@ src_prepare() {
local i
# convert japanese docs to UTF-8
- if use linguas_ja; then
+ if use l10n_ja; then
for i in {NEWS,README}.ja non-free/*.ja.txt; do
if [ -f "${i}" ]; then
echo ">>> Converting ${i} to UTF-8"
@@ -125,7 +125,7 @@ src_install() {
# install docs
dodoc AUTHORS NEWS README
- use linguas_ja && dodoc NEWS.ja README.ja
+ use l10n_ja && dodoc NEWS.ja README.ja
# install sane config
insinto /etc/sane.d
@@ -134,7 +134,7 @@ src_install() {
# install extra docs
if use doc; then
insinto /usr/share/doc/${PF}
- if use linguas_ja; then
+ if use l10n_ja; then
doins "${DISTDIR}/${MY_DOC}_j.pdf"
else
doins "${DISTDIR}/${MY_DOC}_e.pdf"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2017-08-06 8:33 Amy Liffey
0 siblings, 0 replies; 38+ messages in thread
From: Amy Liffey @ 2017-08-06 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 2217356ca72979a1a2ea476c122d30e56aea7dc8
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 08:32:40 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 08:32:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2217356c
media-gfx/iscan: remove old deprecated eapi
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-gfx/iscan/Manifest | 3 -
media-gfx/iscan/iscan-2.26.2.ebuild | 163 --------------------------------
media-gfx/iscan/iscan-2.29.1.5.ebuild | 173 ----------------------------------
3 files changed, 339 deletions(-)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 20af742cb44..f1c23fac83d 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,6 +1,3 @@
-DIST iscan_2.26.2-1.tar.gz 1106921 SHA256 e528070f588fe6166c321610dcdeed6c7cf8110152303fdbf03240e68a593659 SHA512 82655969a8c0a7006d03d570158219f036cf5fb3fd645088177cedf52c2e30325e85c888c254d8342997ac3ac70b943402a4922cc95f66820a640ed572fd55fb WHIRLPOOL ad905f9cd8ff497f0821fa60d6b44e23e9010f7c5bdccb2fd13f7be50dd7853461da21dd515490d75914c3153e81764f244909411aa227e2df29c389a1910897
-DIST iscan_2.29.1-5.tar.gz 1217266 SHA256 7198b5fb081bd1b6dd3747ca645c9d36ab1fef03970803145ea3d31d2c1fffb4 SHA512 945dbe0e55670b9172a455f8c067e3175aae88eff79a900fc1d5221c2246f06daadae16673e6a7bd6a0e00f6fc810ed16d5d1f6c7e93237d64dbd1f81416e20e WHIRLPOOL ea9cd332fbbe1f20a843dc45fb1b7edca617b127440f78938c399f763f70d32951a61069b5313c1d9e5fc6e534d9c7b32e15b9fa9638c2521a0bcfe9851d145a
DIST iscan_2.30.1-1.tar.gz 1217985 SHA256 79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426 SHA512 0562be739b637ee78a5bf2612e7b148de60709c32550742383b76750688d48e42834acbe050c5f2fad26bd9063c9faff425bf906dcebc3e4160d17cd5481850a WHIRLPOOL f3492bff532779987aa8b47f8bb4a1a16164c3d77386d7906dc6b2c6a606b25bcdb4d15766971f8e9bb5b23c4522a3b601e4198212e8fddd54f75f046dda85ef
-DIST userg_revL_e.pdf 574224 SHA256 e68a45d600f702311d10a0e13d42c5b32036df172e8f07728604291b823ec876 SHA512 59cb65ed90913669a4f69fffbdd8dcd1965eabad482f08302c384e9aa75252acfe68470f66ae8ac29cc2b4d109d9395115b9723fbd9cbcb31d2847c55fcc4c18 WHIRLPOOL 082cbf872e43604c4359ed7388aa2cd2519aead961187230a1232592b3952161c850fb4c060a787aefbd4bc58c2853a1489c0144687afadd45e65affcad04289
DIST userg_revQ_e.pdf 627189 SHA256 7f40dfb94bf747a5059c17cba21e72e2485226ea41655453d010b46ed96e8a1c SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc WHIRLPOOL f1497a87ad9b991a05a7a93ff5603944b1cadf00b5162498ff4c0ff1d85615de922324ee5574d0f8540e2d44fc2dede2a25157e562633f51b75eb8e4d4e56dc2
DIST userg_revQ_j.pdf 734920 SHA256 22d29bd17fe8c5772cdcdfb5201eff54eeaadebe3c94563ee4fcfc04579a1c4d SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90 WHIRLPOOL 0f567a4d3543ea0df1d49e92211ba3811a03f200f828d4348eb00bb695df915ae75001faec52d616ff98d4da617ef6cfe95795ece33eeb114b0378892294647e
diff --git a/media-gfx/iscan/iscan-2.26.2.ebuild b/media-gfx/iscan/iscan-2.26.2.ebuild
deleted file mode 100644
index 955a242615f..00000000000
--- a/media-gfx/iscan/iscan-2.26.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic autotools
-
-SRC_REV="1" # revision used by upstream
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
-SRC_URI="http://linux.avasys.jp/drivers/iscan/${PV}/${PN}_${PV}-${SRC_REV}.tar.gz
- doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X gimp jpeg png tiff doc l10n_ja"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="media-gfx/iscan-data
- media-gfx/sane-backends
- virtual/udev
- virtual/libusb:0
- X? (
- x11-libs/gtk+:2
- gimp? ( media-gfx/gimp )
- png? ( media-libs/libpng )
- jpeg? ( virtual/jpeg )
- tiff? ( media-libs/tiff )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( sys-devel/gettext )"
-
-src_prepare() {
- local i
-
- # convert japanese docs to UTF-8
- if use l10n_ja; then
- for i in {NEWS,README}.ja non-free/*.ja.txt; do
- if [ -f "${i}" ]; then
- echo ">>> Converting ${i} to UTF-8"
- iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- fi
- done
- fi
-
- # disable checks for gtk+
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
- fi
-
- epatch "${FILESDIR}"/iscan-2.25.0-drop-ltdl.patch
- epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
- epatch "${FILESDIR}"/iscan-2.26.2-libpng15.patch
- epatch "${FILESDIR}"/iscan-2.26.2-png-libs.patch
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -D_GNU_SOURCE # needed for 'strndup'
- local myconf="--enable-dependency-reduction"
-
- if use X; then
- myconf="${myconf}
- --enable-frontend
- $(use_enable gimp)
- $(use_enable jpeg)
- $(use_enable png)
- $(use_enable tiff)"
- else
- myconf="${myconf}
- --disable-frontend --disable-gimp
- --disable-jpeg --disable-png --disable-tiff"
- fi
-
- econf --disable-static ${myconf}
-}
-
-src_install() {
- local MY_LIB="/usr/$(get_libdir)"
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # install docs
- dodoc AUTHORS NEWS README
- use l10n_ja && dodoc NEWS.ja README.ja
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # install extra docs
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins "${DISTDIR}/userg_revL_e.pdf"
- fi
-
- # link iscan so it is seen as a plugin in gimp
- if use X && use gimp; then
- local plugindir
- if [ -x /usr/bin/gimptool ]; then
- plugindir="$(gimptool --gimpplugindir)/plug-ins"
- elif [ -x /usr/bin/gimptool-2.0 ]; then
- plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
- else
- die "Can't find GIMP plugin directory."
- fi
- dodir "${plugindir}"
- dosym /usr/bin/iscan "${plugindir}"
- fi
-
- # install desktop entry
- if use X; then
- make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
- fi
-}
-
-pkg_postinst() {
- local i
- local DLL_CONF="/etc/sane.d/dll.conf"
- local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
- elog
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF}
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
diff --git a/media-gfx/iscan/iscan-2.29.1.5.ebuild b/media-gfx/iscan/iscan-2.29.1.5.ebuild
deleted file mode 100644
index addce2f4a76..00000000000
--- a/media-gfx/iscan/iscan-2.29.1.5.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic autotools versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="~amd64 ~x86"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz
- doc? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X gimp jpeg png tiff doc l10n_ja"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="media-gfx/iscan-data
- media-gfx/sane-backends
- virtual/udev
- virtual/libusb:0
- X? (
- x11-libs/gtk+:2
- gimp? ( media-gfx/gimp )
- png? ( media-libs/libpng )
- jpeg? ( virtual/jpeg )
- tiff? ( media-libs/tiff )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- local i
-
- # convert japanese docs to UTF-8
- if use l10n_ja; then
- for i in {NEWS,README}.ja non-free/*.ja.txt; do
- if [ -f "${i}" ]; then
- echo ">>> Converting ${i} to UTF-8"
- iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- fi
- done
- fi
-
- # disable checks for gtk+
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
- fi
-
- epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
- epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- epatch "${FILESDIR}"/iscan-2.29.1-png-libs.patch
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- local myconf="--enable-dependency-reduction"
-
- if use X; then
- myconf="${myconf}
- --enable-frontend
- $(use_enable gimp)
- $(use_enable jpeg)
- $(use_enable png)
- $(use_enable tiff)"
- else
- myconf="${myconf}
- --disable-frontend --disable-gimp
- --disable-jpeg --disable-png --disable-tiff"
- fi
-
- econf --disable-static ${myconf}
-}
-
-src_install() {
- local MY_LIB="/usr/$(get_libdir)"
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # install docs
- dodoc AUTHORS NEWS README
- use l10n_ja && dodoc NEWS.ja README.ja
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # install extra docs
- if use doc; then
- insinto /usr/share/doc/${PF}
- if use l10n_ja; then
- doins "${DISTDIR}/${MY_DOC}_j.pdf"
- else
- doins "${DISTDIR}/${MY_DOC}_e.pdf"
- fi
- fi
-
- # link iscan so it is seen as a plugin in gimp
- if use X && use gimp; then
- local plugindir
- if [ -x /usr/bin/gimptool ]; then
- plugindir="$(gimptool --gimpplugindir)/plug-ins"
- elif [ -x /usr/bin/gimptool-2.0 ]; then
- plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
- else
- die "Can't find GIMP plugin directory."
- fi
- dodir "${plugindir}"
- dosym /usr/bin/iscan "${plugindir}"/iscan
- fi
-
- # install desktop entry
- if use X; then
- make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
- fi
-}
-
-pkg_postinst() {
- local i
- local DLL_CONF="/etc/sane.d/dll.conf"
- local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
- elog
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF}
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2017-09-30 3:57 Michael Palimaka
0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2017-09-30 3:57 UTC (permalink / raw
To: gentoo-commits
commit: 9fb1675267b21ba5a4028fcefd85356f0294fd34
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 03:57:08 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 03:57:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb16752
media-gfx/iscan: stabilise 2.30.2.2 for amd64/x86
Closes: https://bugs.gentoo.org/632376
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-gfx/iscan/iscan-2.30.2.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/iscan/iscan-2.30.2.2.ebuild b/media-gfx/iscan/iscan-2.30.2.2.ebuild
index 81ed7d13b55..d956e4fc1b2 100644
--- a/media-gfx/iscan/iscan-2.30.2.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,7 @@ inherit eutils flag-o-matic autotools versionator
# TODO:
# (re)add closed-source binary modules which are needed for some scanners.
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
MY_PV="$(get_version_component_range 1-3)"
MY_PVR="$(replace_version_separator 3 -)"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2018-01-05 22:02 Ulrich Müller
0 siblings, 0 replies; 38+ messages in thread
From: Ulrich Müller @ 2018-01-05 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 0beb38332bdd398117c33aa79310b5f750b1cc1d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 20:42:00 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 22:00:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0beb3833
media-gfx/iscan: Remove linguas_* from IUSE.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/iscan/iscan-2.30.1.1.ebuild | 5 +----
media-gfx/iscan/iscan-2.30.2.2.ebuild | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/media-gfx/iscan/iscan-2.30.1.1.ebuild b/media-gfx/iscan/iscan-2.30.1.1.ebuild
index dc0a72b55cd..1eed08b0673 100644
--- a/media-gfx/iscan/iscan-2.30.1.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -41,9 +41,6 @@ LICENSE="GPL-2 AVASYS"
SLOT="0"
IUSE="X doc gimp jpeg png tiff l10n_ja"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
REQUIRED_USE="gimp? ( X )
jpeg? ( X )
diff --git a/media-gfx/iscan/iscan-2.30.2.2.ebuild b/media-gfx/iscan/iscan-2.30.2.2.ebuild
index d956e4fc1b2..3cf3ccb4a96 100644
--- a/media-gfx/iscan/iscan-2.30.2.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -37,9 +37,6 @@ LICENSE="GPL-2 AVASYS"
SLOT="0"
IUSE="X doc gimp jpeg png tiff l10n_ja"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
REQUIRED_USE="gimp? ( X )
jpeg? ( X )
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2018-01-20 19:23 Amy Liffey
0 siblings, 0 replies; 38+ messages in thread
From: Amy Liffey @ 2018-01-20 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 45baad102f6d0e3ee282826bb972c358fcb8660f
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 19:21:21 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 19:23:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45baad10
media-gfx/iscan: remove old
Closes: https://bugs.gentoo.org/593412
Package-Manager: Portage-2.3.13, Repoman-2.3.3
media-gfx/iscan/Manifest | 1 -
media-gfx/iscan/iscan-2.30.1.1.ebuild | 176 ----------------------------------
2 files changed, 177 deletions(-)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 4d0ac39d794..46f06c795e1 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,3 @@
-DIST iscan_2.30.1-1.tar.gz 1217985 BLAKE2B a469b455566bb249044d1cc7994d233393139756135f2fec0b91325fe0f793eeb90df0fe5b512766993d480b5b2e1b2360067bf3b44ff9132c3bc61baac91133 SHA512 0562be739b637ee78a5bf2612e7b148de60709c32550742383b76750688d48e42834acbe050c5f2fad26bd9063c9faff425bf906dcebc3e4160d17cd5481850a
DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-2.30.1.1.ebuild b/media-gfx/iscan/iscan-2.30.1.1.ebuild
deleted file mode 100644
index 1eed08b0673..00000000000
--- a/media-gfx/iscan/iscan-2.30.1.1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="amd64 x86"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-# Use a gentoo hosted url since upstream uses a session based url that causes the
-# files to no longer be available after the session expires.
-SRC_URI="
- https://dev.gentoo.org/~idella4/tarballs/${PN}_${MY_PVR}.tar.gz
- https://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz
- doc? (
- https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X doc gimp jpeg png tiff l10n_ja"
-
-REQUIRED_USE="gimp? ( X )
- jpeg? ( X )
- png? ( X )
- tiff? ( X )"
-
-QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
- media-gfx/iscan-data
- media-gfx/sane-backends
- virtual/udev
- virtual/libusb:1
- X? ( x11-libs/gtk+:2 )
- gimp? ( media-gfx/gimp )
- jpeg? ( virtual/jpeg:= )
- png? ( media-libs/libpng:= )
- tiff? ( media-libs/tiff:= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- local i
-
- # convert japanese docs to UTF-8
- if use l10n_ja; then
- for i in {NEWS,README}.ja non-free/*.ja.txt; do
- if [ -f "${i}" ]; then
- echo ">>> Converting ${i} to UTF-8"
- iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- fi
- done
- fi
-
- # disable checks for gtk+
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
- fi
-
- epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- epatch "${FILESDIR}"/iscan-2.29.1-png-libs.patch
- epatch "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- # Fix selector box bug 388073
- replace-flags "-O[0-9s]" "-O1"
-
- local myconf=(
- --enable-dependency-reduction
- --disable-static
- $(use_enable X frontend)
- $(use_enable gimp)
- $(use_enable jpeg)
- $(use_enable png)
- $(use_enable tiff)
- )
- econf ${myconf[@]}
-}
-
-src_install() {
- local MY_LIB="/usr/$(get_libdir)"
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # install docs
- dodoc AUTHORS NEWS README
- use l10n_ja && dodoc NEWS.ja README.ja
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # install extra docs
- if use doc; then
- insinto /usr/share/doc/${PF}
- if use l10n_ja; then
- doins "${DISTDIR}/${MY_DOC}_j.pdf"
- else
- doins "${DISTDIR}/${MY_DOC}_e.pdf"
- fi
- fi
-
- # link iscan so it is seen as a plugin in gimp
- if use X && use gimp; then
- local plugindir
- if [ -x /usr/bin/gimptool ]; then
- plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- elif [ -x /usr/bin/gimptool-2.0 ]; then
- plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- else
- die "Can't find GIMP plugin directory."
- fi
- dodir "${plugindir}"
- dosym /usr/bin/iscan "${plugindir}"/iscan
- fi
-
- # install desktop entry
- if use X; then
- make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
- fi
-}
-
-pkg_postinst() {
- local i
- local DLL_CONF="/etc/sane.d/dll.conf"
- local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
- elog
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF}
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2019-01-06 17:04 Andreas Sturmlechner
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-01-06 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 5888a6820d4cc8eb08a8f288451300c75ea08dcb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 14:34:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 17:03:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5888a682
media-gfx/iscan: 2.30.3.1 version bump
Closes: https://bugs.gentoo.org/674674
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 +
media-gfx/iscan/iscan-2.30.3.1.ebuild | 138 ++++++++++++++++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 46f06c795e1..8b76d3a3995 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,3 +1,4 @@
DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
+DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
new file mode 100644
index 00000000000..84029550db4
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_DOC="userg_revQ"
+inherit autotools desktop flag-o-matic
+
+# HINTS:
+# -> non-free modules are x86 and amd64 only
+# -> iscan frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
+# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# iscan doesn't compile w/o libusb, this should be fixed somehow.
+
+# TODO:
+# (re)add closed-source binary modules which are needed for some scanners.
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz
+ doc? (
+ https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
+ l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+ )"
+
+LICENSE="GPL-2 AVASYS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gimp l10n_ja X"
+
+REQUIRED_USE="gimp? ( X )"
+
+DEPEND="
+ dev-libs/libxml2
+ media-gfx/sane-backends
+ virtual/libusb:1
+ virtual/udev
+ gimp? ( media-gfx/gimp )
+ X? (
+ dev-libs/glib:2
+ media-libs/libpng:=
+ media-libs/tiff:=
+ virtual/jpeg:=
+ x11-libs/gtk+:2
+ )
+"
+RDEPEND="${DEPEND}
+ media-gfx/iscan-data
+"
+BDEPEND="
+ virtual/pkgconfig
+ X? ( sys-devel/gettext )
+"
+
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+ "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
+ "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
+ "${FILESDIR}"/iscan-2.29.1-png-libs.patch
+ "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
+ "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
+)
+
+QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
+src_prepare() {
+ default
+
+ if ! use X; then
+ sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
+ -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -D_GNU_SOURCE # needed for 'strndup'
+ replace-flags "-O[0-9s]" "-O1" # fix selector box bug 388073
+
+ local myeconfargs=(
+ --enable-dependency-reduction
+ --disable-static
+ $(use_enable gimp)
+ $(use_enable X frontend)
+ $(use_enable X jpeg)
+ $(use_enable X png)
+ $(use_enable X tiff)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ use l10n_ja && DOCS+=( {NEWS,README}.ja )
+ use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" )
+ default
+
+ # install sane config
+ insinto /etc/sane.d
+ doins backend/epkowa.conf
+
+ # link iscan so it is seen as a plugin in gimp
+ if use gimp; then
+ local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+ dodir "${plugindir}"
+ dosym /usr/bin/iscan "${plugindir}"/iscan
+ fi
+
+ use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
+}
+
+pkg_postinst() {
+ local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
+ local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
+
+ if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
+ elog "Please edit ${EPKOWA_CONF} to suit your needs."
+ elif grep -q "\<epkowa\>" ${DLL_CONF}; then
+ elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
+ elog "Then edit ${EPKOWA_CONF} to suit your needs."
+ else
+ echo "epkowa" >> ${DLL_CONF} || die
+ elog "A new entry 'epkowa' was added to ${DLL_CONF}"
+ elog "Please edit ${EPKOWA_CONF} to suit your needs."
+ fi
+}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2019-04-06 16:07 Mikle Kolyada
0 siblings, 0 replies; 38+ messages in thread
From: Mikle Kolyada @ 2019-04-06 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 4e2cb16c216db3cc3c189b531b94071bb90e5779
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 6 16:07:34 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 6 16:07:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2cb16c
media-gfx/iscan: amd64 stable wrt bug #676962
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
media-gfx/iscan/iscan-2.30.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index 66591b118f0..39e701ef377 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
LICENSE="GPL-2 AVASYS"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc gimp l10n_ja X"
REQUIRED_USE="gimp? ( X )"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2019-06-05 7:46 Agostino Sarubbo
0 siblings, 0 replies; 38+ messages in thread
From: Agostino Sarubbo @ 2019-06-05 7:46 UTC (permalink / raw
To: gentoo-commits
commit: 0091ea07cf37a7f9db268124731d93b14031b25c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 07:45:46 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 07:45:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0091ea07
media-gfx/iscan: x86 stable wrt bug #676962
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"
media-gfx/iscan/iscan-2.30.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index 39e701ef377..bc1a2e5b8a0 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
LICENSE="GPL-2 AVASYS"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc gimp l10n_ja X"
REQUIRED_USE="gimp? ( X )"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2019-06-05 9:19 Andreas Sturmlechner
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-06-05 9:19 UTC (permalink / raw
To: gentoo-commits
commit: d081da5fba84475797db1f8227587a1777f34bca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 09:02:56 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 09:19:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d081da5f
media-gfx/iscan: Drop 2.30.2.2*
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 -
media-gfx/iscan/iscan-2.30.2.2-r1.ebuild | 166 -----------------------------
media-gfx/iscan/iscan-2.30.2.2.ebuild | 174 -------------------------------
3 files changed, 341 deletions(-)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 8b76d3a3995..94b2fb3de0d 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,3 @@
-DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
deleted file mode 100644
index be96146638b..00000000000
--- a/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop flag-o-matic versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
- doc? (
- https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc gimp jpeg png tiff l10n_ja"
-REQUIRED_USE="gimp? ( X )
- jpeg? ( X )
- png? ( X )
- tiff? ( X )"
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
- media-gfx/iscan-data
- media-gfx/sane-backends
- virtual/udev
- virtual/libusb:1
- X? ( x11-libs/gtk+:2 )
- gimp? ( media-gfx/gimp )
- jpeg? ( virtual/jpeg:= )
- png? ( media-libs/libpng:= )
- tiff? ( media-libs/tiff:= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- "${FILESDIR}"/iscan-2.29.1-png-libs.patch
- "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
- "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
-)
-
-QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-src_prepare() {
- local i
-
- # convert japanese docs to UTF-8
- if use l10n_ja; then
- for i in {NEWS,README}.ja non-free/*.ja.txt; do
- if [[ -f ${i} ]]; then
- elog ">>> Converting ${i} to UTF-8"
- iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- fi
- done
- fi
-
- # disable checks for gtk+
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
- fi
-
- default
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- # Fix selector box bug 388073
- replace-flags "-O[0-9s]" "-O1"
-
- local myconf=(
- --enable-dependency-reduction
- --disable-static
- $(use_enable X frontend)
- $(use_enable gimp)
- $(use_enable jpeg)
- $(use_enable png)
- $(use_enable tiff)
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- local MY_LIB="${EPREFIX}/usr/$(get_libdir)"
- emake DESTDIR="${D}" install
-
- # install docs
- dodoc AUTHORS NEWS README
- use l10n_ja && dodoc NEWS.ja README.ja
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # install extra docs
- use doc && dodoc "${DISTDIR}"/${MY_DOC}_$(usex l10n_ja j e).pdf
-
- # link iscan so it is seen as a plugin in gimp
- if use X && use gimp; then
- local plugindir
- if [[ -x ${EPREFIX}/usr/bin/gimptool ]]; then
- plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- elif [[ -x ${EPREFIX}/usr/bin/gimptool-2.0 ]]; then
- plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- else
- die "Can't find GIMP plugin directory."
- fi
- dodir "${plugindir}"
- dosym /usr/bin/iscan "${plugindir}"/iscan
- fi
-
- # install desktop entry
- if use X; then
- make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
- fi
-}
-
-pkg_postinst() {
- local i
- local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
- local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
-
- elog
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF} || die
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
diff --git a/media-gfx/iscan/iscan-2.30.2.2.ebuild b/media-gfx/iscan/iscan-2.30.2.2.ebuild
deleted file mode 100644
index 3cf3ccb4a96..00000000000
--- a/media-gfx/iscan/iscan-2.30.2.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="amd64 x86"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
- doc? (
- https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X doc gimp jpeg png tiff l10n_ja"
-
-REQUIRED_USE="gimp? ( X )
- jpeg? ( X )
- png? ( X )
- tiff? ( X )"
-
-QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
- media-gfx/iscan-data
- media-gfx/sane-backends
- virtual/udev
- virtual/libusb:1
- X? ( x11-libs/gtk+:2 )
- gimp? ( media-gfx/gimp )
- jpeg? ( virtual/jpeg:= )
- png? ( media-libs/libpng:= )
- tiff? ( media-libs/tiff:= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- eapply_user
- local i
-
- # convert japanese docs to UTF-8
- if use l10n_ja; then
- for i in {NEWS,README}.ja non-free/*.ja.txt; do
- if [ -f "${i}" ]; then
- echo ">>> Converting ${i} to UTF-8"
- iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- fi
- done
- fi
-
- # disable checks for gtk+
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
- fi
-
- epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- epatch "${FILESDIR}"/iscan-2.29.1-png-libs.patch
- epatch "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
- epatch "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- # Fix selector box bug 388073
- replace-flags "-O[0-9s]" "-O1"
-
- local myconf=(
- --enable-dependency-reduction
- --disable-static
- $(use_enable X frontend)
- $(use_enable gimp)
- $(use_enable jpeg)
- $(use_enable png)
- $(use_enable tiff)
- )
- econf ${myconf[@]}
-}
-
-src_install() {
- local MY_LIB="/usr/$(get_libdir)"
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # install docs
- dodoc AUTHORS NEWS README
- use l10n_ja && dodoc NEWS.ja README.ja
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # install extra docs
- if use doc; then
- insinto /usr/share/doc/${PF}
- if use l10n_ja; then
- doins "${DISTDIR}/${MY_DOC}_j.pdf"
- else
- doins "${DISTDIR}/${MY_DOC}_e.pdf"
- fi
- fi
-
- # link iscan so it is seen as a plugin in gimp
- if use X && use gimp; then
- local plugindir
- if [ -x /usr/bin/gimptool ]; then
- plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- elif [ -x /usr/bin/gimptool-2.0 ]; then
- plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- else
- die "Can't find GIMP plugin directory."
- fi
- dodir "${plugindir}"
- dosym /usr/bin/iscan "${plugindir}"/iscan
- fi
-
- # install desktop entry
- if use X; then
- make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
- fi
-}
-
-pkg_postinst() {
- local i
- local DLL_CONF="/etc/sane.d/dll.conf"
- local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
- elog
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF}
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2019-11-20 6:03 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2019-11-20 6:03 UTC (permalink / raw
To: gentoo-commits
commit: 676396715b909dc72320cb5adddac3ea654fb76b
Author: Matthew Schultz <mattsch <AT> gmail <DOT> com>
AuthorDate: Mon Nov 11 05:17:56 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 06:03:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67639671
media-gfx/iscan: Removed ${ED} for PMS-compliant package managers.
Closes: https://bugs.gentoo.org/699498
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Matthew Schultz <mattsch <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13607
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/iscan-2.30.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index a82b27d06c6..90d8c1c878c 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -126,7 +126,7 @@ src_install() {
done
if [[ "/plug-ins" != "${gimpplugindir}" ]]; then
dodir ${gimpplugindir}
- dosym "${ED%/}"/usr/bin/iscan "${gimpplugindir}"/iscan
+ dosym $(realpath -s --relative-to="${gimpplugindir}" "${EPREFIX}/usr/bin/iscan" || die) "${gimpplugindir}"/iscan
else
ewarn "No idea where to find the gimp plugin directory"
fi
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2019-12-16 9:39 Michał Górny
0 siblings, 0 replies; 38+ messages in thread
From: Michał Górny @ 2019-12-16 9:39 UTC (permalink / raw
To: gentoo-commits
commit: bafaf294160c9435ae474ba551e2e5744c0423e2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 09:38:34 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 09:39:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bafaf294
media-gfx/iscan: Remove humongous relative symlink hack
The gimp plugin directory path is predictable, we do not need to call
realpath for it.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-gfx/iscan/iscan-2.30.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index 90d8c1c878c..4be72d18128 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -126,7 +126,7 @@ src_install() {
done
if [[ "/plug-ins" != "${gimpplugindir}" ]]; then
dodir ${gimpplugindir}
- dosym $(realpath -s --relative-to="${gimpplugindir}" "${EPREFIX}/usr/bin/iscan" || die) "${gimpplugindir}"/iscan
+ dosym ../../../../bin/iscan "${gimpplugindir}"/iscan
else
ewarn "No idea where to find the gimp plugin directory"
fi
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2019-12-27 23:00 Andreas K. Hüttel
0 siblings, 0 replies; 38+ messages in thread
From: Andreas K. Hüttel @ 2019-12-27 23:00 UTC (permalink / raw
To: gentoo-commits
commit: 407dd984406bb2881da27451a082758717d36010
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 23:00:12 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 23:00:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=407dd984
media-gfx/iscan: Biggish version bump
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 +
media-gfx/iscan/iscan-3.61.0.ebuild | 52 +++++++++++++++++++++++++++++++++++++
media-gfx/iscan/metadata.xml | 7 +++++
3 files changed, 60 insertions(+)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index abaf00fa7ad..5f2423696c5 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,3 +1,4 @@
+DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
new file mode 100644
index 00000000000..3fe05c6da65
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.61.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="EPSON Image Scan v3 for Linux"
+HOMEPAGE="http://support.epson.net/linux/en/imagescanv3.php"
+
+SRC_URI="http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3+"
+
+SLOT="0"
+
+IUSE="graphicsmagick gui imagemagick"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ dev-libs/boost:=
+ media-gfx/sane-backends
+ media-libs/tiff
+ virtual/libusb:1
+ virtual/jpeg
+ gui? ( dev-cpp/gtkmm:= )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:= )
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+ )
+"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+
+src_configure() {
+ econf \
+ $(use_with gui gtkmm) \
+ --with-jpeg \
+ $(use_with imagemagick magick) \
+ $(use_with imagemagick magick-pp) \
+ --with-tiff \
+ --with-sane \
+ --with-boost=yes
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
+ elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
+}
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 4a9a095daf7..2cdaa48ed71 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -9,6 +9,10 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <maintainer type="person">
+ <email>dilfridge@gentoo.org</email>
+ <name>Andreas K. Hüttel (only during xmas vacations)</name>
+ </maintainer>
<longdescription lang="en">
Image Scan! is a graphical scanner utility for people that do not need all
the bells and whistles provided by several of the other utilities out there
@@ -16,4 +20,7 @@
scanners and all-in-ones. However, the scanner driver it provides can
be used by any other SANE standard compliant scanner utility.
</longdescription>
+ <use>
+ <flag name="gui">Builds gtk-based minimal scan GUI</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-01-12 11:14 David Seifert
0 siblings, 0 replies; 38+ messages in thread
From: David Seifert @ 2020-01-12 11:14 UTC (permalink / raw
To: gentoo-commits
commit: dfb03cc751572e3b49fa4e413dccddff140b71e1
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 11:13:17 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 11:13:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb03cc7
media-gfx/iscan: Remove local USE="gui"
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-gfx/iscan/metadata.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 2cdaa48ed71..1548b9bbd49 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -20,7 +20,4 @@
scanners and all-in-ones. However, the scanner driver it provides can
be used by any other SANE standard compliant scanner utility.
</longdescription>
- <use>
- <flag name="gui">Builds gtk-based minimal scan GUI</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-01-28 8:24 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2020-01-28 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 424244f40caa9ea31378327d07998986b5af7952
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 08:07:25 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 08:24:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424244f4
media-gfx/iscan: fix AbsoluteSymlink CI issue
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/iscan-2.30.3.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index bc1a2e5b8a0..4421e8e4018 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -116,7 +116,7 @@ src_install() {
if use gimp; then
local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
dodir "${plugindir}"
- dosym "${ED}"/usr/bin/iscan "${plugindir}"/iscan
+ dosym ../../../../bin/iscan "${plugindir}"/iscan
fi
use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-03-25 14:17 Agostino Sarubbo
0 siblings, 0 replies; 38+ messages in thread
From: Agostino Sarubbo @ 2020-03-25 14:17 UTC (permalink / raw
To: gentoo-commits
commit: f3c236f0e9d9f0a8e438b6a21a89d00f1a10bb41
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 14:14:11 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 14:17:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c236f0
media-gfx/iscan: amd64 stable wrt bug #714180
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-gfx/iscan/iscan-2.30.4.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index 4be72d18128..25040c838c9 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
LICENSE="GPL-2 AVASYS"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc gimp l10n_ja nls X"
REQUIRED_USE="gimp? ( X )"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-03-25 15:42 Agostino Sarubbo
0 siblings, 0 replies; 38+ messages in thread
From: Agostino Sarubbo @ 2020-03-25 15:42 UTC (permalink / raw
To: gentoo-commits
commit: a3731869d5e1694419b1048455daa308844faefe
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 15:41:02 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 15:42:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3731869
media-gfx/iscan: x86 stable wrt bug #714180
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-gfx/iscan/iscan-2.30.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index 25040c838c9..b4014ba2ccb 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
LICENSE="GPL-2 AVASYS"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc gimp l10n_ja nls X"
REQUIRED_USE="gimp? ( X )"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-03-25 18:20 Andreas Sturmlechner
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-03-25 18:20 UTC (permalink / raw
To: gentoo-commits
commit: cc43ea08f7c5b635348772ab21ca7285f58aff70
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 15:59:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 18:20:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc43ea08
media-gfx/iscan: Drop 2.30.3.1
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 -
media-gfx/iscan/iscan-2.30.3.1.ebuild | 139 ----------------------------------
2 files changed, 140 deletions(-)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 5f2423696c5..90c14e22643 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,5 +1,4 @@
DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
-DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
deleted file mode 100644
index 4421e8e4018..00000000000
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_DOC="userg_revQ"
-inherit autotools desktop flag-o-matic
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz
- doc? (
- https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gimp l10n_ja X"
-
-REQUIRED_USE="gimp? ( X )"
-
-DEPEND="
- dev-libs/libxml2
- media-gfx/sane-backends
- virtual/libusb:1
- virtual/udev
- gimp? ( media-gfx/gimp )
- X? (
- dev-libs/glib:2
- media-libs/libpng:=
- media-libs/tiff:=
- virtual/jpeg:=
- x11-libs/gtk+:2
- )
-"
-RDEPEND="${DEPEND}
- media-gfx/iscan-data
-"
-BDEPEND="
- virtual/pkgconfig
- X? ( sys-devel/gettext )
-"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
- "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- "${FILESDIR}"/iscan-2.29.1-png-libs.patch
- "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
- "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
- "${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
-)
-
-QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-src_prepare() {
- default
-
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- replace-flags "-O[0-9s]" "-O1" # fix selector box bug 388073
-
- local myeconfargs=(
- --enable-dependency-reduction
- --disable-static
- $(use_enable gimp)
- $(use_enable X frontend)
- $(use_enable X jpeg)
- $(use_enable X png)
- $(use_enable X tiff)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- use l10n_ja && DOCS+=( {NEWS,README}.ja )
- use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" )
- default
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # link iscan so it is seen as a plugin in gimp
- if use gimp; then
- local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
- dodir "${plugindir}"
- dosym ../../../../bin/iscan "${plugindir}"/iscan
- fi
-
- use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-}
-
-pkg_postinst() {
- local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
- local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
-
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF} || die
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-03-28 13:22 Andreas K. Hüttel
0 siblings, 0 replies; 38+ messages in thread
From: Andreas K. Hüttel @ 2020-03-28 13:22 UTC (permalink / raw
To: gentoo-commits
commit: 9767b3210d2ce8aec2ef48911736c0b85b3fd802
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 13:21:50 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 13:21:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9767b321
media-gfx/iscan: Depend on imagemagick[cxx], bug 713554
Closes: https://bugs.gentoo.org/713554
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
media-gfx/iscan/iscan-3.61.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
index 8d372ec8a73..7947405c941 100644
--- a/media-gfx/iscan/iscan-3.61.0.ebuild
+++ b/media-gfx/iscan/iscan-3.61.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="
virtual/jpeg
gui? ( dev-cpp/gtkmm:= )
imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:= )
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:= )
)
"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-04-13 7:42 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2020-04-13 7:42 UTC (permalink / raw
To: gentoo-commits
commit: d7ced0bef8202106ea8a401b8693397c139c1fca
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Fri Mar 20 16:54:59 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 07:41:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ced0be
media-gfx/iscan: take maintainership
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://github.com/gentoo/gentoo/pull/14907
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 1548b9bbd49..7267accada6 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -13,6 +13,10 @@
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Hüttel (only during xmas vacations)</name>
</maintainer>
+ <maintainer type="person">
+ <email>marcin.deranek@slonko.net</email>
+ <name>Marcin Deranek</name>
+ </maintainer>
<longdescription lang="en">
Image Scan! is a graphical scanner utility for people that do not need all
the bells and whistles provided by several of the other utilities out there
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-04-13 7:42 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2020-04-13 7:42 UTC (permalink / raw
To: gentoo-commits
commit: fa1150d2cd23ec945e0d71c105d132b98ea3524a
Author: Marcin Deranek <marcin.deranek <AT> slonko <DOT> net>
AuthorDate: Mon Mar 9 17:54:37 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 07:41:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1150d2
media-gfx/iscan: version bump to 3.62.0
Closes: https://bugs.gentoo.org/711866
Bug: https://bugs.gentoo.org/713554
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 +
media-gfx/iscan/iscan-3.62.0.ebuild | 85 +++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 90c14e22643..6ae81763e14 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,5 @@
DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
+DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
new file mode 100644
index 00000000000..2a2c97d1512
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic udev xdg-utils
+
+DESCRIPTION="EPSON Image Scan v3 for Linux"
+HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
+SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="graphicsmagick gui"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ dev-libs/boost:=
+ media-gfx/sane-backends
+ media-libs/tiff
+ virtual/jpeg
+ virtual/libusb:1
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ gui? ( dev-cpp/gtkmm:2.4 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
+ "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
+)
+
+src_prepare() {
+ default
+
+ # Remove vendored libraries
+ rm -r upstream/boost || die
+ # Workaround for deprecation warnings:
+ # https://gitlab.com/utsushi/utsushi/issues/90
+ sed -e 's|-Werror||g' -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # Workaround for:
+ # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
+ append-ldflags $(no-as-needed)
+ local myconf=(
+ $(use_with gui gtkmm)
+ --enable-sane-config
+ --enable-udev-config
+ --with-boost=yes
+ --with-jpeg
+ --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
+ --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
+ --with-sane
+ --with-tiff
+ --with-udev-confdir="$(get_udevdir)"
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ dodoc lib/devices.conf
+ find "${ED}" -name '*.la' -delete || die
+ if use gui; then
+ newicon -s scalable doc/icon.svg "${PN}".svg
+ make_desktop_entry utsushi "Image Scan"
+ fi
+}
+
+pkg_postinst() {
+ use gui && xdg_icon_cache_update
+ elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
+ elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
+}
+
+pkg_postrm() {
+ use gui && xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-04-13 7:42 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2020-04-13 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 89b9e8e17bdea666f3f56e0e2b30d62cd5a77cb2
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 06:39:20 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 07:41:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b9e8e1
media-gfx/iscan: reorder metadata.xml
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/metadata.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 7267accada6..a2f44b0c80f 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -5,6 +5,10 @@
<email>mattsch@gmail.com</email>
<name>Matthew Schultz</name>
</maintainer>
+ <maintainer type="person">
+ <email>marcin.deranek@slonko.net</email>
+ <name>Marcin Deranek</name>
+ </maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
@@ -13,10 +17,6 @@
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Hüttel (only during xmas vacations)</name>
</maintainer>
- <maintainer type="person">
- <email>marcin.deranek@slonko.net</email>
- <name>Marcin Deranek</name>
- </maintainer>
<longdescription lang="en">
Image Scan! is a graphical scanner utility for people that do not need all
the bells and whistles provided by several of the other utilities out there
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-04-22 21:52 Andreas Sturmlechner
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-04-22 21:52 UTC (permalink / raw
To: gentoo-commits
commit: 689f7f8bbb93707452b450cede77e1b64b2c3e06
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 21:50:31 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 21:51:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689f7f8b
media-gfx/iscan: Drop 3.61.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 -
media-gfx/iscan/iscan-3.61.0.ebuild | 53 -------------------------------------
2 files changed, 54 deletions(-)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 6ae81763e14..858c9d2c1c7 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,3 @@
-DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
deleted file mode 100644
index 7947405c941..00000000000
--- a/media-gfx/iscan/iscan-3.61.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="EPSON Image Scan v3 for Linux"
-HOMEPAGE="http://support.epson.net/linux/en/imagescanv3.php"
-SRC_URI="http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="graphicsmagick gui imagemagick"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- dev-libs/boost:=
- media-gfx/sane-backends
- media-libs/tiff
- virtual/libusb:1
- virtual/jpeg
- gui? ( dev-cpp/gtkmm:= )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ijg-libjpeg.patch
- "${FILESDIR}"/${P}-imagemagick-7.patch
-)
-
-src_configure() {
- econf \
- $(use_with gui gtkmm) \
- --with-jpeg \
- $(use_with imagemagick magick) \
- $(use_with imagemagick magick-pp) \
- --with-tiff \
- --with-sane \
- --with-boost=yes
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-
- elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
- elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-04-22 21:52 Andreas Sturmlechner
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-04-22 21:52 UTC (permalink / raw
To: gentoo-commits
commit: db54238cd4a8dbc98988d89c0d2cd6a1be7bb80b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 21:51:20 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 21:51:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db54238c
media-gfx/iscan: Drop proxied maintainer by request
Bug: https://bugs.gentoo.org/716776
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index a2f44b0c80f..650852b4e4f 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mattsch@gmail.com</email>
- <name>Matthew Schultz</name>
- </maintainer>
<maintainer type="person">
<email>marcin.deranek@slonko.net</email>
<name>Marcin Deranek</name>
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-05-17 11:29 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2020-05-17 11:29 UTC (permalink / raw
To: gentoo-commits
commit: af193fac765bd4ba736fcf2485cec3100c02be74
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Sun May 10 20:20:47 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 17 11:28:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af193fac
media-gfx/iscan: Be more specific about ignoring warnings
Closes: https://bugs.gentoo.org/711416
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://github.com/gentoo/gentoo/pull/15741
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/iscan-3.62.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index f01a67d2417..7f8e4fae37b 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
rm -r upstream/boost || die
# Workaround for deprecation warnings:
# https://gitlab.com/utsushi/utsushi/issues/90
- sed -e 's|-Werror||g' -i configure.ac || die
+ sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
eautoreconf
}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-07-16 14:39 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2020-07-16 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 72080b86d2e93f9d9ec984ad2df0bc456e8c4918
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Tue May 19 16:38:46 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:38:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72080b86
media-gfx/iscan: Explicitly use pthreads so we can use gold linker
Closes: https://bugs.gentoo.org/720994
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://github.com/gentoo/gentoo/pull/15879
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/iscan-3.62.0.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index 7f8e4fae37b..92b60678600 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -51,6 +51,8 @@ src_configure() {
# Workaround for:
# /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
append-ldflags $(no-as-needed)
+ # https://bugs.gentoo.org/720994
+ append-ldflags -pthread
local myconf=(
$(use_with gui gtkmm)
--enable-sane-config
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-08-15 9:30 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2020-08-15 9:30 UTC (permalink / raw
To: gentoo-commits
commit: 98b29a041d6b796b885a2cc31297f1e07f4e69cb
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 08:18:43 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 09:29:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b29a04
media-gfx/iscan: add media-fonts/dejavu as test dep for 3.63
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/iscan-3.63.0.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
index 38ffdbed8e3..7a56c9f5704 100644
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ b/media-gfx/iscan/iscan-3.63.0.ebuild
@@ -27,7 +27,10 @@ RDEPEND="
"
# Disable opencl as during reorient.utr test it produces inconsistent results
DEPEND="${RDEPEND}
- test? ( app-text/tesseract[training,-opencl] )
+ test? (
+ app-text/tesseract[training,-opencl]
+ media-fonts/dejavu
+ )
"
RESTRICT="!test? ( test )"
S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-09-13 21:55 Sam James
0 siblings, 0 replies; 38+ messages in thread
From: Sam James @ 2020-09-13 21:55 UTC (permalink / raw
To: gentoo-commits
commit: d7feb60a9b28e2e88a4a0e5e2672d99c72fe7c06
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Sun Aug 16 12:45:35 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 21:55:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7feb60a
media-gfx/iscan: Add missing use flag dependencies
Closes: https://bugs.gentoo.org/737298
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/iscan/iscan-3.63.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
index 7a56c9f5704..3d5f0e15b00 100644
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ b/media-gfx/iscan/iscan-3.63.0.ebuild
@@ -28,8 +28,9 @@ RDEPEND="
# Disable opencl as during reorient.utr test it produces inconsistent results
DEPEND="${RDEPEND}
test? (
- app-text/tesseract[training,-opencl]
+ app-text/tesseract[png,tiff,training,-opencl]
media-fonts/dejavu
+ virtual/imagemagick-tools[png,tiff]
)
"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-11-08 12:02 Sam James
0 siblings, 0 replies; 38+ messages in thread
From: Sam James @ 2020-11-08 12:02 UTC (permalink / raw
To: gentoo-commits
commit: d5ab04b014faf8bcc52aba1b41f00717b89a854a
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Nov 4 23:09:35 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 11:53:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ab04b0
media=gfx/iscan: switch media-gfx/gimp-2.10 to SLOT="0/2"
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/iscan/{iscan-2.30.4.2.ebuild => iscan-2.30.4.2-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
similarity index 99%
rename from media-gfx/iscan/iscan-2.30.4.2.ebuild
rename to media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
index b4014ba2ccb..333d41b9b1c 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
media-gfx/sane-backends
virtual/libusb:1
virtual/udev
- gimp? ( media-gfx/gimp:2 )
+ gimp? ( media-gfx/gimp:0/2 )
X? (
dev-libs/glib:2
media-libs/libpng:=
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2020-11-20 20:40 Andreas Sturmlechner
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-11-20 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 740a462626545890e164d9044911c6e712da56f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 20:24:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 20:39:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740a4626
media-gfx/iscan: Drop 3.62.0
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 -
media-gfx/iscan/iscan-3.62.0.ebuild | 89 -------------------------------------
2 files changed, 90 deletions(-)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 20ecfd545e7..740a69344d0 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,3 @@
-DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
deleted file mode 100644
index 92b60678600..00000000000
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic udev xdg-utils
-
-DESCRIPTION="EPSON Image Scan v3 for Linux"
-HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
-SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="graphicsmagick gui"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- dev-libs/boost:=
- media-gfx/sane-backends
- media-libs/tiff
- virtual/jpeg
- virtual/libusb:1
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- gui? ( dev-cpp/gtkmm:2.4 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
- "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
- "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
- "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
-)
-
-src_prepare() {
- default
-
- # Remove vendored libraries
- rm -r upstream/boost || die
- # Workaround for deprecation warnings:
- # https://gitlab.com/utsushi/utsushi/issues/90
- sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- # Workaround for:
- # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
- append-ldflags $(no-as-needed)
- # https://bugs.gentoo.org/720994
- append-ldflags -pthread
- local myconf=(
- $(use_with gui gtkmm)
- --enable-sane-config
- --enable-udev-config
- --with-boost=yes
- --with-jpeg
- --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
- --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
- --with-sane
- --with-tiff
- --with-udev-confdir="$(get_udevdir)"
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- dodoc lib/devices.conf
- find "${ED}" -name '*.la' -delete || die
- if use gui; then
- newicon -s scalable doc/icon.svg "${PN}".svg
- make_desktop_entry utsushi "Image Scan"
- fi
-}
-
-pkg_postinst() {
- use gui && xdg_icon_cache_update
- elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
- elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
-}
-
-pkg_postrm() {
- use gui && xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2021-02-03 11:19 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2021-02-03 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 185fd492191736dc6d1171f482a25aef48d6664f
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Thu Jan 28 12:21:07 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 11:19:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185fd492
media-gfx/iscan: Version bump to 3.65
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://github.com/gentoo/gentoo/pull/19244
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 +
media-gfx/iscan/iscan-3.65.0.ebuild | 103 ++++++++++++++++++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 740a69344d0..7067adf48f6 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,5 @@
DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
+DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
new file mode 100644
index 00000000000..f143a547464
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic udev xdg-utils
+
+DESCRIPTION="EPSON Image Scan v3 for Linux"
+HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
+SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="graphicsmagick gui test"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ dev-libs/boost:=
+ media-gfx/sane-backends
+ media-libs/tiff
+ virtual/jpeg
+ virtual/libusb:1
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ gui? ( dev-cpp/gtkmm:2.4 )
+"
+# Disable opencl as during reorient.utr test it produces inconsistent results
+DEPEND="${RDEPEND}
+ test? (
+ app-text/tesseract[png,tiff,training,-opencl]
+ media-fonts/dejavu
+ virtual/imagemagick-tools[png,tiff]
+ )
+"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
+ "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
+ "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
+ "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
+ "${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch
+ "${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
+ "${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
+ "${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
+ "${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
+)
+
+src_prepare() {
+ default
+
+ # Remove vendored libraries
+ rm -r upstream/boost || die
+ # Workaround for deprecation warnings:
+ # https://gitlab.com/utsushi/utsushi/issues/90
+ sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
+ # Disable check-soname test
+ sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die
+ eautoreconf
+}
+
+src_configure() {
+ # Workaround for:
+ # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
+ append-ldflags $(no-as-needed)
+ # https://bugs.gentoo.org/720994
+ append-ldflags -pthread
+ local myconf=(
+ $(use_with gui gtkmm)
+ --enable-sane-config
+ --enable-udev-config
+ --with-boost=yes
+ --with-jpeg
+ --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
+ --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
+ --with-sane
+ --with-tiff
+ --with-udev-confdir="$(get_udevdir)"
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ dodoc lib/devices.conf
+ find "${ED}" -name '*.la' -delete || die
+ if use gui; then
+ newicon -s scalable doc/icon.svg "${PN}".svg
+ make_desktop_entry utsushi "Image Scan"
+ fi
+}
+
+pkg_postinst() {
+ use gui && xdg_icon_cache_update
+ elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
+ elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
+}
+
+pkg_postrm() {
+ use gui && xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2021-12-06 8:01 Agostino Sarubbo
0 siblings, 0 replies; 38+ messages in thread
From: Agostino Sarubbo @ 2021-12-06 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 1557c53c89035606b8238e343cfb6210a685bf37
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 6 08:01:07 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec 6 08:01:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1557c53c
media-gfx/iscan: amd64 stable wrt bug #828362
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-gfx/iscan/iscan-3.65.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index f143a5474646..d33a5f40eeb2 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagesca
LICENSE="GPL-3+"
SLOT="0"
IUSE="graphicsmagick gui test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
BDEPEND="virtual/pkgconfig"
RDEPEND="
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2021-12-17 13:28 Andreas Sturmlechner
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2021-12-17 13:28 UTC (permalink / raw
To: gentoo-commits
commit: 236b29db74632c8b4058c63b7a8ce3b5c26ca926
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 17 13:25:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 13:28:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236b29db
media-gfx/iscan: Drop 3.63.0
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/Manifest | 1 -
media-gfx/iscan/iscan-3.63.0.ebuild | 103 ------------------------------------
2 files changed, 104 deletions(-)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 7067adf48f62..27a86c0e2217 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,3 @@
-DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
deleted file mode 100644
index aa9f572ec9db..000000000000
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic udev xdg-utils
-
-DESCRIPTION="EPSON Image Scan v3 for Linux"
-HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
-SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="graphicsmagick gui test"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- dev-libs/boost:=
- media-gfx/sane-backends
- media-libs/tiff
- virtual/jpeg
- virtual/libusb:1
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- gui? ( dev-cpp/gtkmm:2.4 )
-"
-# Disable opencl as during reorient.utr test it produces inconsistent results
-DEPEND="${RDEPEND}
- test? (
- app-text/tesseract[png,tiff,training,-opencl]
- media-fonts/dejavu
- virtual/imagemagick-tools[png,tiff]
- )
-"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
- "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
- "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
- "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
- "${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch
- "${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
- "${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
- "${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
- "${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
-)
-
-src_prepare() {
- default
-
- # Remove vendored libraries
- rm -r upstream/boost || die
- # Workaround for deprecation warnings:
- # https://gitlab.com/utsushi/utsushi/issues/90
- sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
- # Disable check-soname test
- sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- # Workaround for:
- # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
- append-ldflags $(no-as-needed)
- # https://bugs.gentoo.org/720994
- append-ldflags -pthread
- local myconf=(
- $(use_with gui gtkmm)
- --enable-sane-config
- --enable-udev-config
- --with-boost=yes
- --with-jpeg
- --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
- --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
- --with-sane
- --with-tiff
- --with-udev-confdir="$(get_udevdir)"
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- dodoc lib/devices.conf
- find "${ED}" -name '*.la' -delete || die
- if use gui; then
- newicon -s scalable doc/icon.svg "${PN}".svg
- make_desktop_entry utsushi "Image Scan"
- fi
-}
-
-pkg_postinst() {
- use gui && xdg_icon_cache_update
- elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
- elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
-}
-
-pkg_postrm() {
- use gui && xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2022-02-18 4:57 Sam James
0 siblings, 0 replies; 38+ messages in thread
From: Sam James @ 2022-02-18 4:57 UTC (permalink / raw
To: gentoo-commits
commit: 29090fa554961ee027996cd026184be5d13a9f73
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 04:55:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 04:56:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29090fa5
media-gfx/iscan: bump copyright year
See: 532d6cb41030f2c98b335f7ee56dfc6e1ddfb826
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/iscan/iscan-3.65.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index 38fb610ef483..4d767c95e653 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2022-08-17 16:18 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2022-08-17 16:18 UTC (permalink / raw
To: gentoo-commits
commit: a691073d59335830c3087f674ddd4a9f67d94c0c
Author: Marcin Deranek <marcin.deranek <AT> slonko <DOT> net>
AuthorDate: Sun Jul 24 11:28:20 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:17:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a691073d
media-gfx/iscan: Reload udev rules on (un)install
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://bugs.gentoo.org/859631
Closes: https://github.com/gentoo/gentoo/pull/26564
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/iscan-3.65.0.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index 4d767c95e653..e5b00fcd6f87 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -94,11 +94,13 @@ src_install() {
}
pkg_postinst() {
+ udev_reload
use gui && xdg_icon_cache_update
elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
}
pkg_postrm() {
+ udev_reload
use gui && xdg_icon_cache_update
}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2022-10-02 19:22 Andreas K. Hüttel
0 siblings, 0 replies; 38+ messages in thread
From: Andreas K. Hüttel @ 2022-10-02 19:22 UTC (permalink / raw
To: gentoo-commits
commit: 26ee9a796e897030d195f58efba5e7250a642e29
Author: Marcin Deranek <marcin.deranek <AT> slonko <DOT> net>
AuthorDate: Sun Sep 11 12:27:20 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 19:22:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ee9a79
media-gfx/iscan: Add missing dependency for tests
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://bugs.gentoo.org/869491
Closes: https://github.com/gentoo/gentoo/pull/27205
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/iscan/iscan-3.65.0.ebuild | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index e5b00fcd6f87..b47d4d45f4ae 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -14,7 +14,16 @@ SLOT="0"
IUSE="graphicsmagick gui test"
KEYWORDS="~amd64 ~x86"
-BDEPEND="virtual/pkgconfig"
+# Disable opencl as during reorient.utr test it produces inconsistent results
+BDEPEND="
+ virtual/pkgconfig
+ test? (
+ app-text/tesseract[png,tiff,training,-opencl]
+ dev-util/uncrustify
+ media-fonts/dejavu
+ virtual/imagemagick-tools[png,tiff]
+ )
+"
RDEPEND="
dev-libs/boost:=
media-gfx/sane-backends
@@ -25,14 +34,7 @@ RDEPEND="
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
gui? ( dev-cpp/gtkmm:2.4 )
"
-# Disable opencl as during reorient.utr test it produces inconsistent results
-DEPEND="${RDEPEND}
- test? (
- app-text/tesseract[png,tiff,training,-opencl]
- media-fonts/dejavu
- virtual/imagemagick-tools[png,tiff]
- )
-"
+DEPEND="${RDEPEND}"
RESTRICT="!test? ( test )"
S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2023-06-10 16:54 Andreas K. Hüttel
0 siblings, 0 replies; 38+ messages in thread
From: Andreas K. Hüttel @ 2023-06-10 16:54 UTC (permalink / raw
To: gentoo-commits
commit: 68854b56bbbc9a5d54529dfbb90c884afaa1c7d5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 16:53:26 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 16:54:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68854b56
media-gfx/iscan: drop myself as a maintainer
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/iscan/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 1f81ac0c1f55..1b0335cc0339 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -9,10 +9,6 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer type="person">
- <email>dilfridge@gentoo.org</email>
- <name>Andreas K. Hüttel (only during xmas vacations)</name>
- </maintainer>
<longdescription lang="en">
Image Scan! is a graphical scanner utility for people that do not need all
the bells and whistles provided by several of the other utilities out there
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2024-03-10 14:03 Joonas Niilola
0 siblings, 0 replies; 38+ messages in thread
From: Joonas Niilola @ 2024-03-10 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 365e40cdcc396d4944e8e9554b59b6c60377d0a6
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 14:03:18 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 14:03:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=365e40cd
media-gfx/iscan: drop to maintainer-needed
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/iscan/metadata.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 1b0335cc0339..da073556a520 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>marcin.deranek@slonko.net</email>
- <name>Marcin Deranek</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription lang="en">
Image Scan! is a graphical scanner utility for people that do not need all
the bells and whistles provided by several of the other utilities out there
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
@ 2024-04-05 15:27 Arthur Zamarin
0 siblings, 0 replies; 38+ messages in thread
From: Arthur Zamarin @ 2024-04-05 15:27 UTC (permalink / raw
To: gentoo-commits
commit: ef22fce76bdd3538e588b1c99cef1fdd187db85b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar 27 18:25:58 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 15:26:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef22fce7
media-gfx/iscan: add missing remote-id
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-gfx/iscan/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index da073556a520..0c4a31e7a4ac 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -9,4 +9,7 @@
scanners and all-in-ones. However, the scanner driver it provides can
be used by any other SANE standard compliant scanner utility.
</longdescription>
+ <upstream>
+ <remote-id type="gitlab">utsushi/utsushi</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 38+ messages in thread
end of thread, other threads:[~2024-04-05 15:27 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-13 21:55 [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-05 15:27 Arthur Zamarin
2024-03-10 14:03 Joonas Niilola
2023-06-10 16:54 Andreas K. Hüttel
2022-10-02 19:22 Andreas K. Hüttel
2022-08-17 16:18 Joonas Niilola
2022-02-18 4:57 Sam James
2021-12-17 13:28 Andreas Sturmlechner
2021-12-06 8:01 Agostino Sarubbo
2021-02-03 11:19 Joonas Niilola
2020-11-20 20:40 Andreas Sturmlechner
2020-11-08 12:02 Sam James
2020-08-15 9:30 Joonas Niilola
2020-07-16 14:39 Joonas Niilola
2020-05-17 11:29 Joonas Niilola
2020-04-22 21:52 Andreas Sturmlechner
2020-04-22 21:52 Andreas Sturmlechner
2020-04-13 7:42 Joonas Niilola
2020-04-13 7:42 Joonas Niilola
2020-04-13 7:42 Joonas Niilola
2020-03-28 13:22 Andreas K. Hüttel
2020-03-25 18:20 Andreas Sturmlechner
2020-03-25 15:42 Agostino Sarubbo
2020-03-25 14:17 Agostino Sarubbo
2020-01-28 8:24 Joonas Niilola
2020-01-12 11:14 David Seifert
2019-12-27 23:00 Andreas K. Hüttel
2019-12-16 9:39 Michał Górny
2019-11-20 6:03 Joonas Niilola
2019-06-05 9:19 Andreas Sturmlechner
2019-06-05 7:46 Agostino Sarubbo
2019-04-06 16:07 Mikle Kolyada
2019-01-06 17:04 Andreas Sturmlechner
2018-01-20 19:23 Amy Liffey
2018-01-05 22:02 Ulrich Müller
2017-09-30 3:57 Michael Palimaka
2017-08-06 8:33 Amy Liffey
2016-06-27 16:26 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox