version bump. solving bug #302624.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 246 insertions, 1 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/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
+}