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

[Amy Liffey]

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
-}