Already upstream

4 files changed, 0 insertions, 185 deletions

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
deleted file mode 100644
index 285211c..0000000
--- a/media-gfx/iscan/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX iscan-3.62.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
-AUX iscan-3.62.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
-DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
-EBUILD iscan-3.62.0.ebuild 2002 BLAKE2B 88a9be71d5af99b4f1dbe20fcf9c0836b645b6263847ff8bc6dfe0c977ec7fb959c6890993fb7e6058db4be02246272f65e2357009be6f1f9ee96f6a080f989b SHA512 c735593c62909e310d28f3b0316a047635648d8340f9fc0d1f4ddd1dd21cebe8a9cc2055257460b987b13866504422425a084818a653f63c68ea2ea090893f4c
diff --git a/media-gfx/iscan/files/iscan-3.62.0-ijg-libjpeg.patch b/media-gfx/iscan/files/iscan-3.62.0-ijg-libjpeg.patch
deleted file mode 100644
index 2625741..0000000
--- a/media-gfx/iscan/files/iscan-3.62.0-ijg-libjpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/filters/jpeg.cpp
-+++ b/filters/jpeg.cpp
-@@ -410,13 +410,13 @@
-   cinfo_.image_height = ctx_.height ();
- 
-   jpeg_set_defaults (&cinfo_);
--  jpeg_set_quality  (&cinfo_, quality_, true);
-+  jpeg_set_quality  (&cinfo_, quality_, TRUE);
- 
-   cinfo_.density_unit = 1;      // in dpi
-   cinfo_.X_density = ctx_.x_resolution ();
-   cinfo_.Y_density = ctx_.y_resolution ();
- 
--  jpeg_start_compress (&cinfo_, true);
-+  jpeg_start_compress (&cinfo_, TRUE);
- 
-   cache_ = new octet[ctx_.octets_per_line ()];
-   cache_size_ = ctx_.octets_per_line ();
-@@ -462,7 +462,7 @@
-   dmgr_.next_output_byte = jbuf_ + (jbuf_size_ - n);
-   dmgr_.free_in_buffer   = n;
- 
--  return true;
-+  return TRUE;
- }
- 
- void
-@@ -535,7 +535,7 @@
- 
-   //jpegデータの一部が分割されて送られてきても正常に動作するように変更
- 
--  return false;
-+  return FALSE;
- }
- 
- void
-@@ -580,7 +580,7 @@
- {
-   if (!header_done_)
-     {
--      if (JPEG_SUSPENDED == jpeg_read_header (&cinfo_, true))
-+      if (JPEG_SUSPENDED == jpeg_read_header (&cinfo_, TRUE))
-         {
-           log::trace ("jpeg_read_header suspended");
-           if (!reclaim_space ())
diff --git a/media-gfx/iscan/files/iscan-3.62.0-imagemagick-7.patch b/media-gfx/iscan/files/iscan-3.62.0-imagemagick-7.patch
deleted file mode 100644
index 9d345a2..0000000
--- a/media-gfx/iscan/files/iscan-3.62.0-imagemagick-7.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 222aa3e123ee771d8997f6931997e3143186e0d6 Mon Sep 17 00:00:00 2001
-From: sirjaren <sirjaren@gmail.com>
-Date: Tue, 20 Feb 2018 13:35:46 -0600
-Subject: [PATCH] media-gfx/utsushi: ImageMagick deskew/crop support
-
-Fixes to allow utsushi to be built with --magick-pp.  According to:
-  https://github.com/utsushi/utsushi/issues/43
-
-The API changes from ImageMagick 6 to 7 means build failures as there
-are old API's in use.  It seems, that these API's are not actually used
-(as in GraphicsMagick doesn't use them), so it may be ok to disable the
-checks for them in 'doc-locate.cpp'.
-
-This is not yet confirmed, but allows building and using deskew in my
-own testing.
----
- .../files/utsushi-9999-magick-pp.patch        | 33 ++++++++++
- 4 files changed, 111 insertions(+), 8 deletions(-)
- create mode 100644 media-gfx/utsushi/files/utsushi-9999-boost.patch
- create mode 100644 media-gfx/utsushi/files/utsushi-9999-magick-pp.patch
-
-diff --git a/filters/doc-locate.cpp b/filters/doc-locate.cpp
-index 4b09b29..4508274 100644
---- a/filters/doc-locate.cpp
-+++ b/filters/doc-locate.cpp
-@@ -260,17 +260,17 @@ public:
-     clone.rotate (deskew_angle ());
- 
-     Magick::Geometry rv = bbox (clone);
--    if (HAVE_IMAGE_MAGICK_PP)
--    {
--      if (clone.page ().xNegative ())
--        rv.xOff (rv.xOff () - clone.page ().xOff());
--      else
--        rv.xOff (rv.xOff () + clone.page ().xOff());
--      if (clone.page ().yNegative ())
--        rv.yOff (rv.yOff () - clone.page ().yOff());
--      else
--        rv.yOff (rv.yOff () + clone.page ().yOff());
--    }
-+    /*if (HAVE_IMAGE_MAGICK_PP)
-+     *{
-+     *  if (clone.page ().xNegative ())
-+     *    rv.xOff (rv.xOff () - clone.page ().xOff());
-+     *  else
-+     *    rv.xOff (rv.xOff () + clone.page ().xOff());
-+     *  if (clone.page ().yNegative ())
-+     *    rv.yOff (rv.yOff () - clone.page ().yOff());
-+     *  else
-+     *    rv.yOff (rv.yOff () + clone.page ().yOff());
-+    }*/
-     return scale (rv);
-   }
- 
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 dcd487b..0000000
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop 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}"/${P}-ijg-libjpeg.patch
-	"${FILESDIR}"/${P}-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
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_configure() {
-	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
-}