From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1094534-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 48568138335
for <garchives@archives.gentoo.org>; Wed, 5 Jun 2019 09:19:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DDB69E0A60;
Wed, 5 Jun 2019 09:19:15 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B50B3E0A60
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Jun 2019 09:19:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8FCB234574E
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Jun 2019 09:19:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B28D605
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Jun 2019 09:19:13 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1559726343.d081da5fba84475797db1f8227587a1777f34bca.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/iscan/Manifest media-gfx/iscan/iscan-2.30.2.2-r1.ebuild media-gfx/iscan/iscan-2.30.2.2.ebuild
X-VCS-Directories: media-gfx/iscan/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: d081da5fba84475797db1f8227587a1777f34bca
X-VCS-Branch: master
Date: Wed, 5 Jun 2019 09:19:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 301ec2ed-be9d-42b4-963a-8c79a41086c9
X-Archives-Hash: f56f0b75dac2b42d352d54bf0103b74c
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
-}