diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/iscan | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/iscan')
-rw-r--r-- | media-gfx/iscan/Manifest | 6 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch | 64 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch | 13 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.26.2-libpng15.patch | 51 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.26.2-png-libs.patch | 37 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch | 48 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch | 64 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.29.1-png-libs.patch | 37 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.30.1-fix-g++-test.patch | 45 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-usb.sh | 27 | ||||
-rw-r--r-- | media-gfx/iscan/iscan-2.26.2.ebuild | 164 | ||||
-rw-r--r-- | media-gfx/iscan/iscan-2.29.1.5.ebuild | 174 | ||||
-rw-r--r-- | media-gfx/iscan/iscan-2.30.1.1.ebuild | 180 | ||||
-rw-r--r-- | media-gfx/iscan/metadata.xml | 16 |
14 files changed, 926 insertions, 0 deletions
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest new file mode 100644 index 000000000000..20af742cb44a --- /dev/null +++ b/media-gfx/iscan/Manifest @@ -0,0 +1,6 @@ +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/files/iscan-2.25.0-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch new file mode 100644 index 000000000000..8ac18defc007 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch @@ -0,0 +1,64 @@ +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 new file mode 100644 index 000000000000..23fa6edd76b4 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000000..1b89b735c23f --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch @@ -0,0 +1,51 @@ +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 new file mode 100644 index 000000000000..0866e604915a --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch @@ -0,0 +1,37 @@ +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-2.28.1.3+libpng-1.5.patch b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch new file mode 100644 index 000000000000..7205028d8248 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch @@ -0,0 +1,48 @@ +--- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100 +@@ -83,7 +83,12 @@ + #if HAVE_PNG_H + set_error_handler (_png, _info); + ++/* 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 (_header && !_footer && _png->num_rows == _png->flush_rows) ++#endif + { + lib->write_end (_png, _info); + _footer = true; +@@ -167,6 +172,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 +@@ -176,6 +184,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 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100 +@@ -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.29.1-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch new file mode 100644 index 000000000000..489f0c5cd71e --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch @@ -0,0 +1,64 @@ +diff -Naur iscan-2.29.1.orig/backend/Makefile.am iscan-2.29.1/backend/Makefile.am +--- iscan-2.29.1.orig/backend/Makefile.am 2012-06-11 23:33:33.000000000 -0500 ++++ iscan-2.29.1/backend/Makefile.am 2013-02-18 20:29:05.091814060 -0600 +@@ -58,7 +58,6 @@ + + libepkowa_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ +- $(LTDLINCL) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/non-free \ + $(XML_CFLAGS) \ +@@ -70,7 +69,7 @@ + -lm \ + $(XML_LIBS) \ + $(LIBUSB_1_0_LIBS) \ +- $(LIBLTDL) ++ -lltdl + libepkowa_la_SOURCES = \ + $(sane_backends_files) \ + ipc.c \ +diff -Naur iscan-2.29.1.orig/configure.ac iscan-2.29.1/configure.ac +--- iscan-2.29.1.orig/configure.ac 2012-06-11 23:33:34.000000000 -0500 ++++ iscan-2.29.1/configure.ac 2013-02-18 20:30:10.413311997 -0600 +@@ -266,13 +266,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.29.1.orig/frontend/Makefile.am iscan-2.29.1/frontend/Makefile.am +--- iscan-2.29.1.orig/frontend/Makefile.am 2012-06-11 23:33:33.000000000 -0500 ++++ iscan-2.29.1/frontend/Makefile.am 2013-02-18 20:30:38.764092975 -0600 +@@ -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.29.1.orig/lib/Makefile.am iscan-2.29.1/lib/Makefile.am +--- iscan-2.29.1.orig/lib/Makefile.am 2012-06-11 23:33:34.000000000 -0500 ++++ iscan-2.29.1/lib/Makefile.am 2013-02-18 20:30:58.852936051 -0600 +@@ -30,7 +30,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.29.1-png-libs.patch b/media-gfx/iscan/files/iscan-2.29.1-png-libs.patch new file mode 100644 index 000000000000..32de60a83899 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.29.1-png-libs.patch @@ -0,0 +1,37 @@ +diff -ur iscan-2.29.1/configure.ac iscan-2.29.1.new/configure.ac +--- iscan-2.29.1/configure.ac 2014-01-27 14:15:28.139043864 -0500 ++++ iscan-2.29.1.new/configure.ac 2014-01-27 14:17:10.608044736 -0500 +@@ -279,6 +279,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` \ +@@ -289,9 +292,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.29.1/frontend/Makefile.am iscan-2.29.1.new/frontend/Makefile.am +--- iscan-2.29.1/frontend/Makefile.am 2014-01-27 14:15:28.123043864 -0500 ++++ iscan-2.29.1.new/frontend/Makefile.am 2014-01-27 14:17:43.628045017 -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-2.30.1-fix-g++-test.patch b/media-gfx/iscan/files/iscan-2.30.1-fix-g++-test.patch new file mode 100644 index 000000000000..5a7f26eb4ca5 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.30.1-fix-g++-test.patch @@ -0,0 +1,45 @@ +Drop obsolete C++ ABI transistion code. +https://bugs.gentoo.org/549866 + + +--- a/configure.ac ++++ b/configure.ac +@@ -62,27 +62,6 @@ dnl checks for programs + + AC_PROG_CXX + +-# Transitionary check for the C++ ABI while we are switching provided +-# binaries from gcc-3.[23] to gcc-3.4 or later. Currently gcc-3.[23] +-# is still the official compiler version to use, but experimental bi- +-# naries are released with a ".c2" suffix. +-# The CXX_ABI for gcc-3.[23] is 102, btw. +-# Note that the PACKAGE_RELEASE for the gcc-3.4 or later packages has +-# 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 +- AC_MSG_CHECKING([C++ ABI version]) +- CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`" +- AC_MSG_RESULT([$CXX_ABI]) +- if test x"$CXX_ABI" = x1002; then +- PACKAGE_CXX_ABI=".c2" +- else +- PACKAGE_CXX_ABI="" +- fi +- AC_SUBST(PACKAGE_CXX_ABI) +-fi +- + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL +--- a/non-free/Makefile.am ++++ b/non-free/Makefile.am +@@ -65,7 +65,7 @@ $(NON_FREE_SOLIBS): + *) echo "unsupported architecture" 1>&2; \ + exit 1;; \ + esac; \ +- $(LN_S) $(srcdir)/libesmod-$${arch}$(PACKAGE_CXX_ABI).so $@ ++ $(LN_S) $(srcdir)/libesmod-$${arch}.c2.so $@ + + install-exec-local: $(NON_FREE_SOLIBS) + $(mkinstalldirs) $(DESTDIR)$(libdir) diff --git a/media-gfx/iscan/files/iscan-usb.sh b/media-gfx/iscan/files/iscan-usb.sh new file mode 100644 index 000000000000..e71bea4715c3 --- /dev/null +++ b/media-gfx/iscan/files/iscan-usb.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# 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 diff --git a/media-gfx/iscan/iscan-2.26.2.ebuild b/media-gfx/iscan/iscan-2.26.2.ebuild new file mode 100644 index 000000000000..4bab8ffd1a23 --- /dev/null +++ b/media-gfx/iscan/iscan-2.26.2.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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" +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 linguas_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 linguas_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 new file mode 100644 index 000000000000..bcbfdf0c4a44 --- /dev/null +++ b/media-gfx/iscan/iscan-2.29.1.5.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="http://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz + doc? ( http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf + linguas_ja? ( http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf ) + )" +LICENSE="GPL-2 AVASYS" +SLOT="0" + +IUSE="X gimp jpeg png tiff doc" +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 linguas_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 linguas_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 linguas_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 +} diff --git a/media-gfx/iscan/iscan-2.30.1.1.ebuild b/media-gfx/iscan/iscan-2.30.1.1.ebuild new file mode 100644 index 000000000000..bcd4154f350e --- /dev/null +++ b/media-gfx/iscan/iscan-2.30.1.1.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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=" + http://dev.gentoo.org/~idella4/tarballs/${PN}_${MY_PVR}.tar.gz + http://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz + doc? ( + http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf + linguas_ja? ( http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf ) + )" +LICENSE="GPL-2 AVASYS" +SLOT="0" + +IUSE="X doc gimp jpeg png tiff" +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 ) + 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 linguas_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 linguas_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 linguas_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 +} diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml new file mode 100644 index 000000000000..c36e6d4286c6 --- /dev/null +++ b/media-gfx/iscan/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>proxy-maintainers</herd> + <maintainer> + <email>mattsch@gmail.com</email> + <name>Matthew Schultz</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 + (xsane, QuiteInsane, Kooka). At the moment it only supports SEIKO EPSON + scanners and all-in-ones. However, the scanner driver it provides can + be used by any other SANE standard compliant scanner utility. + </longdescription> +</pkgmetadata> |