version bump, ebuild cleanup, added gcc3.2/3.3 support, solving bug #50043.

(Portage version: 2.1_pre4-r1)

4 files changed, 168 insertions, 2 deletions

diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index 7c75bdb90b63..a417f866e734 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/iscan
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.1 2005/11/24 23:50:53 sbriesen Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.2 2006/02/10 20:18:56 sbriesen Exp $
+
+*iscan-1.18.0 (10 Feb 2006)
+
+  10 Feb 2006; Stefan Briesenick <sbriesen@gentoo.org> +iscan-1.18.0.ebuild:
+  version bump, ebuild cleanup, added gcc3.2/3.3 support, solving bug #50043.
 
 *iscan-1.17.0 (24 Nov 2005)
 
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 8b9384d37563..d674a2d59def 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,18 @@
 MD5 9ef2fc109f8c5572eda57c3bf8efe968 ChangeLog 347
+RMD160 f54f8199af29c676e9eea260d482065869175d08 ChangeLog 347
+SHA256 c0cd10ebbf75589d3af923cb9a6fdd78144f876a1ac0bd68e7d8fce0792fd8f5 ChangeLog 347
 MD5 92332de64b20f65587282bcef809b9c7 files/digest-iscan-1.17.0 70
+RMD160 48c46d01967f8bc653e9ff4b214a6ea8b3769cd8 files/digest-iscan-1.17.0 70
+SHA256 02dbe36155811d53a973741916e0cc9f324a579f4c12bf357104da10aae7d0ba files/digest-iscan-1.17.0 70
+MD5 8cc7e25fcb1ca15146e7d3f32557775c files/digest-iscan-1.18.0 503
+RMD160 cb0d1edf0ae1152d4e749c6cae90b58c65d39814 files/digest-iscan-1.18.0 503
+SHA256 b7ba5ffdd7938df3405a41cccf7dfbfd04bcb19b3701e516255ab3c835f91ceb files/digest-iscan-1.18.0 503
 MD5 85ff53d3187214b4f8cf8efefbdaf0bf iscan-1.17.0.ebuild 2950
+RMD160 fd06ab75e8a80eb175a2a586a672f73ed001065b iscan-1.17.0.ebuild 2950
+SHA256 c872edd102d3ba1e869bda480125c5da66aa8326def59c6076e17cbd89258056 iscan-1.17.0.ebuild 2950
+MD5 cd7c2e00bc87b4d438102e0badf4ffd2 iscan-1.18.0.ebuild 3947
+RMD160 d6568345024cd7feecbec6a8688c577422ce35f0 iscan-1.18.0.ebuild 3947
+SHA256 2e5d2f3440f13ca79393d993910007d4d933dd38fc1375b9dcb35ad65e769f4c iscan-1.18.0.ebuild 3947
 MD5 ba682f5946d2063873acfa9c5390dfcb metadata.xml 674
+RMD160 9337250d90495a96a34e5e3b6db2b5125f75e8cb metadata.xml 674
+SHA256 9c1fe69dd2b3ba142164829a8725afdc1f573f597d4decd024d006c6321efe26 metadata.xml 674
diff --git a/media-gfx/iscan/files/digest-iscan-1.18.0 b/media-gfx/iscan/files/digest-iscan-1.18.0
new file mode 100644
index 000000000000..ca377e53b425
--- /dev/null
+++ b/media-gfx/iscan/files/digest-iscan-1.18.0
@@ -0,0 +1,6 @@
+MD5 b2e4a845efd013ed89db5486f858fee4 iscan-1.18.0-1.c2.tar.gz 2086816
+RMD160 97210917f434240b71fafd0dd0778163e0499caf iscan-1.18.0-1.c2.tar.gz 2086816
+SHA256 b288e1dea02716e316b28388a859b24b4afd1d18fbb4e3dcb37efc6e5c300a36 iscan-1.18.0-1.c2.tar.gz 2086816
+MD5 3c8c791f2ac705b72344c1f533101a83 iscan-1.18.0-1.tar.gz 2042698
+RMD160 a967abb4626f7217428a6f8299945462df445f0a iscan-1.18.0-1.tar.gz 2042698
+SHA256 c6ffdcc61357cf4353e6086e2ddba24eeea6f7a62d2d66d32d1c2fc11cc6217a iscan-1.18.0-1.tar.gz 2042698
diff --git a/media-gfx/iscan/iscan-1.18.0.ebuild b/media-gfx/iscan/iscan-1.18.0.ebuild
new file mode 100644
index 000000000000..65cce61ea573
--- /dev/null
+++ b/media-gfx/iscan/iscan-1.18.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-1.18.0.ebuild,v 1.1 2006/02/10 20:18:56 sbriesen Exp $
+
+inherit eutils multilib toolchain-funcs
+
+SRC_GCC33="${P}-1.tar.gz"
+SRC_GCC34="${P}-1.c2.tar.gz"
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
+SRC_URI="http://lx1.avasys.jp/iscan/v${PV//./}/${SRC_GCC33}
+	http://lx1.avasys.jp/iscan/v${PV//./}/${SRC_GCC34}"
+LICENSE="GPL-2 x86? ( EAPL EPSON )"
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="X gimp unicode"
+
+# HINTS:
+# -> non-free modules are x86 only
+# -> isane frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-1.tar.gz    (for gcc 3.2/3.3)
+# -> ${P}-1.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# make jpeg/png optional. Problem is, that the
+# configure script ignores --disable-*, if the
+# corresponding lib is found on the system.
+
+DEPEND=">=dev-libs/libusb-0.1.6
+	media-gfx/sane-backends
+	media-libs/libpng
+	media-libs/jpeg
+	x86? (
+		X? (
+			sys-devel/gettext
+			>=x11-libs/gtk+-2.0
+			gimp? ( media-gfx/gimp )
+		)
+	)"
+
+pkg_setup() {
+	if ! use x86 && use X; then
+		ewarn "The iscan application needs CSS x86-only libs and"
+		ewarn "thus can't be built currently. You can still use"
+		ewarn "'xscanimage', 'xsane' or 'kooka' with sane-epkowa"
+		ewarn "backend. But some low-end scanners are also not"
+		ewarn "supported, because they need these x86 libs, too."
+	fi
+
+	# Select correct tarball for installed GCC. This is not a perfect
+	# solution and should be expanded to other working GCC versions.
+	einfo "GCC version: $(gcc-fullversion)"
+	case "$(gcc-version)" in
+		3.[23])
+			MY_A="${SRC_GCC33}";;
+		3.4)
+			MY_A="${SRC_GCC34}";;
+		*)
+			if use x86; then
+				die "Your GCC version is not supported. You need either 3.2, 3.3 or 3.4!"
+			else
+				MY_A="${SRC_GCC34}"  # fallback to GCC 3.4, should not harm.
+			fi;;
+	esac
+}
+
+src_unpack() {
+	unpack "${MY_A}"
+	cd "${S}"
+
+	if use unicode; then
+		einfo "Converting docs to UTF-8"
+		for i in {NEWS,README}.ja non-free/{EAPL,LICENSE.EPSON}.ja.txt; do
+			iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		done
+	fi
+
+	if ! ( use x86 && use X ); then  # disable iscan frontend
+		sed -i -e 's:^\([[:space:]]\)frontend[[:space:]]*\\:\1\\:g' \
+			-e 's:^\([[:space:]]\)po[[:space:]]*\\:\1\\:g' Makefile.in
+		sed -i -e 's:iscan.1::g' doc/Makefile.in
+	fi
+
+	if ! use x86; then  # disable non-free modules (x86-only)
+		sed -i -e 's:^\([[:space:]]\)non-free[[:space:]]*\\:\1\\:g' Makefile.in
+	fi
+}
+
+src_compile() {
+	econf --enable-jpeg --enable-png --with-pic || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# --disable-static doesn't work, so we just remove static lib
+	rm -f "${D}/usr/$(get_libdir)/sane/libsane-epkowa.a"
+
+	# install docs
+	dodoc AUTHORS {NEWS,README}*
+
+	# install hotplug stuff	
+	insinto /etc/hotplug/usb
+	exeinto /etc/hotplug/usb
+	doins utils/hotplug/iscan.usermap
+	doexe utils/hotplug/iscan-device
+
+	# install sane config
+	insinto /etc/sane.d
+	doins backend/epkowa.conf
+
+	# link iscan so it is seen as a plugin in gimp
+	if use x86 && 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 x86 && use X; then
+		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner.png
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Hint: to enable the backend, add 'epkowa' in /etc/sane.d/dll.conf"
+	einfo "Then edit /etc/sane.d/epkowa.conf to suit your needs."
+	einfo
+}