version bump. solving bug #302624.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 252 insertions, 12 deletions

diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index dec16a052759..2da3b7ca5509 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/iscan
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.36 2010/03/09 11:33:46 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.37 2010/07/21 22:43:04 sbriesen Exp $
+
+*iscan-2.25.0 (21 Jul 2010)
+
+  21 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org> +iscan-2.25.0.ebuild,
+  +files/iscan-2.25.0-drop-ltdl.patch,
+  +files/iscan-2.25.0-fix-g++-test.patch:
+  version bump. solving bug #302624.
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org> iscan-2.11.0.ebuild:
   QA: When not using an absolute path, you MUST NOT use a file extension
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 245ac78faad8..50db929d3968 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,12 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX iscan-2.11.0-gcc43.patch 249 RMD160 8d10c5a4105f7ba520948fa5ff630c07907f0a2f SHA1 590bb8e964a8c920ef302e15264bc2ee9bc79ad9 SHA256 a5babcf81aa2023a15e8a58ae08e2b3c65d9ca9767ccd5796a67eaf75ed9cdbd
 AUX iscan-2.11.0-glibc210.patch 2888 RMD160 9d513dcb7f1740e2883167f604c2e0de495e544d SHA1 14d2ecb3ce79ae1edfa958a0d758f03a5026e2f6 SHA256 2082bb0dcb2591aca37331dae6f19983a5877261046b422f448586257b1b1f03
 AUX iscan-2.11.0-libltdl.patch 1102 RMD160 14ad9a6481a864e143ed977129d0f4258c08c555 SHA1 e30d0add39dceca98a3fa01ea3a1a478b2e61070 SHA256 501e4f8cb396da112bcf30051b8a8e8703c5f866a70ad757d019dea696ab3b48
 AUX iscan-2.21.0-drop-ltdl.patch 2092 RMD160 eab7fff1b17057bcc39032ce62f4260a24ce018e SHA1 ae5585ec8fbed551525b11c11526c44ea73e956d SHA256 1263f7d3165f822d821ad0961857ea67402e3199de9d88ac09e3b84052192c83
 AUX iscan-2.21.0-fix-g++-test.patch 523 RMD160 8844c0e26d99dff531496a8ce1f2a6e9ab7c7915 SHA1 fc31881a1cb3c0baddbee5115c870f3bf42842b2 SHA256 3a5e8fb2c765d20de0233592bf1c0c41a703c7c5e185228c613dcd5ac70b2339
 AUX iscan-2.21.0-noinst-stuff.patch 535 RMD160 84155f0f83e6cfd82e892234fe5ef1ae328022e2 SHA1 8d341a0548fb11874c0996d05a787e95794954d4 SHA256 a9b600f4891d3ff47ab1ab2efb5ae2afae1f00b6bf67040796b8ab4c35773ed6
+AUX iscan-2.25.0-drop-ltdl.patch 2121 RMD160 6be869f3dac12c136ed91593fcff712a6e6b5a56 SHA1 736d09325fef5153a9fa1173d8ed57c430fb91bf SHA256 690b675dc3ac242131809fc5bec79f7542be2165216aaa2da5f7f9e4a88aff47
+AUX iscan-2.25.0-fix-g++-test.patch 523 RMD160 8844c0e26d99dff531496a8ce1f2a6e9ab7c7915 SHA1 fc31881a1cb3c0baddbee5115c870f3bf42842b2 SHA256 3a5e8fb2c765d20de0233592bf1c0c41a703c7c5e185228c613dcd5ac70b2339
 AUX iscan-usb.sh 826 RMD160 ebf81c44b9e4f1f040a276e3f918662cd93a5f10 SHA1 90e0205dad199aeb87cfb89c7d89dd8737702001 SHA256 8ece8711de7ebfd7d9266e96d8cdf4c7bc12ad52ab212590162526d4af669798
 DIST iscan-plugin-cx4400-2.0.0-0.c2.i386.rpm 94530 RMD160 df07c891df3429d94676307ee61816fab9a7fc28 SHA1 08f4e8c7b74781fccad3d92ca6b4f42fe1fee3ba SHA256 c8c073679dad0febadb8a19cebd25676f2a5897f4e4a3f34ee2333f0513e3ba8
 DIST iscan-plugin-gt-7200-1.0.0-1.c2.i386.rpm 62336 RMD160 7862ae8f8e4362ba9535b9d492e742d9716da91d SHA1 708527915e9005139352308c2ad1a0c5c570fb17 SHA256 11789e2074670b1098cea9366b3e33bb72ce316c0ced6e09086f3a13eeccb86f
@@ -22,14 +21,10 @@ DIST iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm 163386 RMD160 aeb024f903c79d64cb79
 DIST iscan-plugin-gt-x770-2.1.0-0.c2.i386.rpm 166476 RMD160 123a686c2d5abcd2d319ee0ece5bd8df392d4b1a SHA1 86fa78bf728d6b21b6d2e8ad042ed0fb31798091 SHA256 04b1d6c13915a14b16721e2c36309f25b0155f3d9bb13eb1eca9b70161342fbd
 DIST iscan_2.11.0-1.tar.gz 1458880 RMD160 7ac5777d57afa2c0a76cac0808a3aaf7c354edf5 SHA1 a7fe77ded2f788a7bed6b0fa8377c43e6cf6e077 SHA256 ae0a72647acfa4cedc320e280014d3cdf8d61c0f4e2a7e941697cf2f36bed0a8
 DIST iscan_2.21.0-6.tar.gz 1075613 RMD160 63cf65faa154ff08c8245ed6ed894afdfd249043 SHA1 9bcf8d004390e9afc920874ef3b5e73607d0db49 SHA256 d5687a20443009cea15d4c158b10bbdffadfd5499fbcb7a902333340859da18b
+DIST iscan_2.25.0-1.tar.gz 1069240 RMD160 4ed7bf94113194a7092a2c0328b33d33b0dd002e SHA1 059810fc204cb2a343f0707d84e410ca187b95e1 SHA256 b729f8eebd64ea4877c015602449e18b9c10a4b65e09fa4e9273dbb26a2b5698
+DIST userg_revL_e.pdf 574224 RMD160 a2c8e17e436d009cf74b6ca6ac6b4c23ace2ce1e SHA1 c696f1a2a905f29ca83d8118f0ea34f5f77656d5 SHA256 e68a45d600f702311d10a0e13d42c5b32036df172e8f07728604291b823ec876
 EBUILD iscan-2.11.0.ebuild 9618 RMD160 8ff5a457c8c9c3157d876e7f7050bed947ab0b36 SHA1 9dc32867015f8c4ecf084b98501ffa72e2f160f4 SHA256 e24677265a2b76daa033e8cd8972c2d5561b18c121231c37cdb8efac0427b7f8
 EBUILD iscan-2.21.0.ebuild 5327 RMD160 2a34bb710cd6cff4e92c7207135518468d13f0aa SHA1 f2cee8eab7393f0011d759138a15afb845b564c2 SHA256 50daa9a27adb7631a2e43fb3028b6bb2d25565c334d4b48aa30bb7b59be7d5cf
-MISC ChangeLog 6552 RMD160 ce882e62d6fe96367b923d7ac1e8c51f3c99ad5a SHA1 fa18c5cb0b066127e927f9cf721f350c1305f7d7 SHA256 4b122d2eda3280985618394861a4c45a2933998a267f31faade7c62352262db8
+EBUILD iscan-2.25.0.ebuild 4280 RMD160 26f50b9e8f8d97180a0918513eb87b0be735cb43 SHA1 d6c7232767eb754cfdbf33135c094eb011bb64a6 SHA256 afed34aec74265d37a4fea2338c23b2de9ad9575d34bf5869e3bf1840d08f3e4
+MISC ChangeLog 6781 RMD160 7f1099fd8431bdc42bd386983e7ec4f56c4ed529 SHA1 485c3e8e33044d6b1be099edf0184a0cc40f52f1 SHA256 8ed595683ec077756575ecec9c85b9a4e4b53cece3113790a76dbc05061a177d
 MISC metadata.xml 674 RMD160 9337250d90495a96a34e5e3b6db2b5125f75e8cb SHA1 6405fc64d508b081a27c420828302dadd05fafe9 SHA256 9c1fe69dd2b3ba142164829a8725afdc1f573f597d4decd024d006c6321efe26
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuWMiAACgkQOypDUo0oQOpjSwCgyOcZLByAzUmaFD79Vb6loHSk
-e+oAnAkpFBJZyixNDm4ztUuqOqRO3ClG
-=n4Xm
------END PGP SIGNATURE-----
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/iscan-2.25.0.ebuild b/media-gfx/iscan/iscan-2.25.0.ebuild
new file mode 100644
index 000000000000..3a76412bf89b
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.25.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.25.0.ebuild,v 1.1 2010/07/21 22:43:04 sbriesen Exp $
+
+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_DT_HASH="${QA_PRESTRIPPED}"
+
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+RDEPEND="media-gfx/iscan-data
+	media-gfx/sane-backends
+	>=sys-fs/udev-103
+	>=dev-libs/libusb-0.1.12
+	X? (
+		>=x11-libs/gtk+-2.0
+		gimp? ( media-gfx/gimp )
+		png? ( media-libs/libpng )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+	)"
+
+DEPEND="${RDEPEND}
+	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}"/${P}-drop-ltdl.patch
+	epatch "${FILESDIR}"/${P}-fix-g++-test.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
+}