gentoo resync : 23.12.2017

6 files changed, 0 insertions, 196 deletions

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index a95899a61a28..b64c21c21d07 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,13 +1,8 @@
-AUX iscan-2.25.0-drop-ltdl.patch 2121 BLAKE2B ef35b38f20000b1063950b56233505db5ea3a15cc7e5fee1de4ab8e37f07f20a7974757ae8b62921aca20aa7eb7a92941490ebeb008c430e942997c8cc17fc02 SHA512 9f279db992101a525e83b14e45c60840c8a546c70e6087dd4210c647bf9f6fe5bf22fb34402c31da4070089f7869bc59d8a4ab4b772d7efc8f2429b2791e503f
-AUX iscan-2.25.0-fix-g++-test.patch 523 BLAKE2B 91c18f6e403e7426c86a07e151223539c51ec6db808486df3c4320f586f0046b776c4e14f8fbf3375a2c921f172f22f42e080d262f4eb4fb22df784da2c4efe0 SHA512 3b0182d2023077b7d6339b594843a53fcba1cad6f45b5ad4596efcef214aac1170664e184f65e326cdc7a2ac3ce98340c72ca48eaf9e0ec34cfa0e8edfd6f840
-AUX iscan-2.26.2-libpng15.patch 1490 BLAKE2B 5c7956920c2294ab0c119dda1eb491176326e71cdc6f3345291a083f22fee4528c1f4a77148d9b46db49ca2dd8cbea391af57e88dbbe4213729350b4674e5765 SHA512 85adc14eeb8833e91e09bcc36488b773790ecc0b8889961380c330995e703345439b028572f94dbb50a59cb67ddff014257283d72dce0a42d4bd112d684b1c2a
-AUX iscan-2.26.2-png-libs.patch 1309 BLAKE2B d5bbfbabfaae9fc3702d092d236d7622ae6b81e2f146c9f15540d367ab22c73f41ac38e7f4477c566efd56d397961043f9eca49667d627b4925e8f0d5c7e48b1 SHA512 030e0072d9f70b690a5f0927fdcf7587bee1022d69b2672be27d893a224573c752bbb950f87cdd48a6eaac2cfbeca4dc7fc9a2e4f23fb49f3facee7f0f6d65a2
 AUX iscan-2.28.1.3+libpng-1.5.patch 1466 BLAKE2B 474069046d0ff5037bfdba4f7ab138cbc153b8cc0b1fb8fd8fa14ac55b5afe6dd3e3fc088aab83114c607a3ae6da72e90fc68abafea80b7008046cd40cb0db0f SHA512 914861963db02f1a330a7e2f90bfc545fb411d6a418567811452454ad14ff912f504beba8a30fa668e6e7e83aaf826cae142adf9433adf0d3e972e72e0147714
 AUX iscan-2.29.1-drop-ltdl.patch 2107 BLAKE2B ebb47c8148d3b1baaec17606bb85d98ed5b8c68ba79c1f8a3d165281a4b3d2514e13021de4d5806c4313308f297a4b876d6bb41515b79735a1e9cf9e44a8f7cb SHA512 593f9a8c7a85ed4e379553c63a75eec09965e803f2785456a4416895cb2d13048db8c7d731bd427cfb4049386a1270b676edad5cc92c354c7e2eaa4542d930dd
 AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9fda301a63b690cf4bba92dff2b559aeeaab8fcc9149bd4334f411e7f68aa514c986541eb99ced01bb14df7a141dd68 SHA512 ea2347e169118cfa2916f9ef3f0715d2322763715198714271fc611203a37cec5977ec0de5de0e737a5dd8cf223f2e23198faf52d79671b85173f4a02d3982c5
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
-AUX iscan-usb.sh 715 BLAKE2B 7ff35425cbf1611dc7ae71cc514491c6bacd4e3fe51bf8d1067ad6258d0249305627d6b5a384f82f62ee9243c3785ea704a30ff3af05ce8449223e06a7a971c7 SHA512 39762e587163658f6481bc16e75605aeee1251acc52cf51f0e9360c25298290fdd04140dd0e8863105bfafeb5dd69502b490972bf1bc2f3e2ade667e1f51cd35
 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
diff --git a/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch
deleted file mode 100644
index 8ac18defc007..000000000000
--- a/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur iscan-2.25.0.orig//backend/Makefile.am iscan-2.25.0/backend/Makefile.am
---- iscan-2.25.0.orig//backend/Makefile.am	2010-05-19 07:51:55.000000000 +0200
-+++ iscan-2.25.0/backend/Makefile.am	2010-07-21 22:49:08.579705272 +0200
-@@ -56,7 +56,6 @@
- 
- libepkowa_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS) \
--	$(LTDLINCL) \
- 	-I$(top_srcdir)/include \
- 	-I$(top_srcdir)/non-free \
- 	$(XML_CFLAGS) \
-@@ -66,7 +65,7 @@
- libepkowa_la_LIBADD = \
- 	-lm \
- 	$(XML_LIBS) \
--	$(LIBLTDL)
-+	-lltdl
- libepkowa_la_SOURCES = \
- 	$(sane_backends_files) \
- 	marshal.c \
-diff -Naur iscan-2.25.0.orig//configure.ac iscan-2.25.0/configure.ac
---- iscan-2.25.0.orig//configure.ac	2010-07-21 22:48:11.411332268 +0200
-+++ iscan-2.25.0/configure.ac	2010-07-21 22:49:58.918332411 +0200
-@@ -261,13 +261,10 @@
- dnl  The somewhat obscure LT_AC_PROG_SED is here to make sure that the
- dnl  SED environment variable gets set before it's used by the libtool
- dnl  machinery.  This works around buggy libtool versions.
--LT_AC_PROG_SED
--AC_LIBLTDL_INSTALLABLE
--AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
--AC_LIB_LTDL
--AC_SUBST(LTDLINCL)
--AC_SUBST(LIBLTDL)
-+AC_LTDL_SHLIBPATH
-+AC_LTDL_SHLIBEXT
-+AC_LTDL_SYSSEARCHPATH
- 
- 
- dnl  Graphic file format options
-diff -Naur iscan-2.25.0.orig//frontend/Makefile.am iscan-2.25.0/frontend/Makefile.am
---- iscan-2.25.0.orig//frontend/Makefile.am	2010-05-19 07:51:54.000000000 +0200
-+++ iscan-2.25.0/frontend/Makefile.am	2010-07-21 22:50:53.965581385 +0200
-@@ -34,7 +34,7 @@
- iscan_LDADD = \
- 	$(top_builddir)/lib/libimage-stream.la \
- 	-lsane \
--	@LIBLTDL@ \
-+	-lltdl \
- 	@GTK_LIBS@ \
- 	@GDK_IMLIB_LIBS@ \
- 	$(top_builddir)/non-free/libesmod.so
-diff -Naur iscan-2.25.0.orig//lib/Makefile.am iscan-2.25.0/lib/Makefile.am
---- iscan-2.25.0.orig//lib/Makefile.am	2010-05-19 07:51:56.000000000 +0200
-+++ iscan-2.25.0/lib/Makefile.am	2010-07-21 22:51:29.794329919 +0200
-@@ -29,7 +29,7 @@
- libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include
- libimage_stream_la_LDFLAGS = -static
- libimage_stream_la_LIBADD  = \
--	$(LIBLTDL) \
-+	-lltdl \
- 	$(top_builddir)/lib/pdf/libpdf.la
- libimage_stream_la_SOURCES = \
- 	$(libimage_stream_la_files)
diff --git a/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch b/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch
deleted file mode 100644
index 23fa6edd76b4..000000000000
--- a/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: iscan-2.21.0/configure.ac
-===================================================================
---- iscan-2.21.0.orig/configure.ac
-+++ iscan-2.21.0/configure.ac
-@@ -68,7 +68,7 @@ AC_PROG_CXX
- #  to be larger than that for the gcc-3.[23] packages (as long as both
- #  are distributed) for smooth upgrade paths.
- 
--if test x"$CXX" = xg++; then
-+if test "$GXX" = "yes"; then
-     AC_MSG_CHECKING([C++ ABI version])
-     CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`"
-     AC_MSG_RESULT([$CXX_ABI])
diff --git a/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch
deleted file mode 100644
index 1b89b735c23f..000000000000
--- a/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=383799#c13
-Upstream: http://www.avasys.jp/cgi-bin/lx/bbs/en/scanner-bbs/hyperbbs.cgi?mode=view;Code=5197
-
---- lib/pngstream.cc
-+++ lib/pngstream.cc
-@@ -76,7 +76,12 @@
-         set_error_handler (_png, _info);
- 
-         lib->write_flush (_png);
-+/* when not interlacing (ie, only one pass), number of rows is image height:  _v_sz */
-+#if PNG_LIBPNG_VER > 10499
-+        if (!_footer && _v_sz == lib->get_current_row_number(_png))
-+#else
-         if (!_footer && _png->num_rows == _png->flush_rows)
-+#endif
-           {
-             lib->write_end (_png, _info);
-             _footer = true;
-@@ -161,6 +166,9 @@
-     funcsym (write_row);
-     funcsym (write_flush);
-     funcsym (write_end);
-+#if PNG_LIBPNG_VER > 10499
-+    funcsym (get_current_row_number);
-+#endif
- 
-     if (lib->access_version_number
-         && lib->create_write_struct
-@@ -170,6 +178,9 @@
-         && lib->set_IHDR
-         && lib->set_pHYs
-         && lib->set_invert_mono
-+#if PNG_LIBPNG_VER > 10499
-+	&& lib->get_current_row_number
-+#endif
-         && lib->write_info
-         && lib->write_row
-         && lib->write_flush
---- lib/pngstream.hh
-+++ lib/pngstream.hh
-@@ -108,6 +108,10 @@
-                png_structp);
-       fundecl (void, write_end,
-                png_structp, png_infop);
-+#if PNG_LIBPNG_VER > 10499
-+      fundecl (png_uint_32, get_current_row_number,
-+               png_structp);
-+#endif
- #endif /* HAVE_PNG_H */
-     };
-     static png_lib_handle *lib;
diff --git a/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch b/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch
deleted file mode 100644
index 0866e604915a..000000000000
--- a/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur iscan-2.26.2/configure.ac iscan-2.26.2.new/configure.ac
---- iscan-2.26.2/configure.ac	2014-01-27 13:37:26.782024452 -0500
-+++ iscan-2.26.2.new/configure.ac	2014-01-27 13:36:47.738024120 -0500
-@@ -274,6 +274,9 @@
- 		  AC_HELP_STRING([--enable-$1],
- 				 [ensure support for the $3 file format]),
- 		  [if test "x$enable_$1" != xno; then
-+		      if test "x$4" != xno; then
-+		         PKG_CHECK_MODULES($3,[$4])
-+		      fi
- 		      iff_header="`echo $2 | $as_tr_sh`"
- 		      AC_CHECK_HEADERS([$2])
- 		      if test `eval echo '$ac_cv_header_'$iff_header` \
-@@ -284,9 +287,9 @@
- 		  [AC_CHECK_HEADERS([$2])])
-    ])
- 
--ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG)
--ISCAN_FILE_FORMAT(png,png.h,PNG)
--ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF)
-+ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,no)
-+ISCAN_FILE_FORMAT(png,png.h,PNG,libpng)
-+ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,no)
- 
- 
- dnl  Support for performance measurements.
-diff -ur iscan-2.26.2/frontend/Makefile.am iscan-2.26.2.new/frontend/Makefile.am
---- iscan-2.26.2/frontend/Makefile.am	2014-01-27 13:31:09.488021241 -0500
-+++ iscan-2.26.2.new/frontend/Makefile.am	2014-01-27 13:37:50.065024650 -0500
-@@ -37,6 +37,7 @@
- 	-lltdl \
- 	@GTK_LIBS@ \
- 	@GDK_IMLIB_LIBS@ \
-+	@PNG_LIBS@ \
- 	$(top_builddir)/non-free/libesmod.so
- iscan_SOURCES = \
- 	$(iscan_source_files)
diff --git a/media-gfx/iscan/files/iscan-usb.sh b/media-gfx/iscan/files/iscan-usb.sh
deleted file mode 100644
index 49430616e69e..000000000000
--- a/media-gfx/iscan/files/iscan-usb.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file is part of media-gfx/iscan
-#
-# This script changes the permissions and ownership of a USB device under
-# /proc/bus/usb to grant access to this device to users in the scanner group.
-#
-# Ownership is set to root:scanner, permissions are set to 0660.
-#
-# Arguments :
-# -----------
-# ACTION=[add|remove]
-# DEVNAME=/dev/bus/usb/BBB/DDD
-# SUBSYSTEM=usb_device
-
-OWNER="root"
-GROUP="scanner"
-PERMS="0660"
-
-DEVICE="${DEVNAME/dev/proc}"
-
-if [ "${ACTION}" = "add" -a "${SUBSYSTEM}" = "usb_device" -a -f "${DEVICE}" ]; then
-    chmod ${PERMS} "${DEVICE}" && chown ${OWNER}:${GROUP} "${DEVICE}"
-fi