version bump, ebuild cleanup + enhancements, adding GCC4.x support, solving bug #124875.

(Portage version: 2.1_pre7-r3)

4 files changed, 270 insertions, 1 deletions

diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index a417f866e734..5c0bc06e5e7e 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/iscan
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.3 2006/04/06 22:32:50 sbriesen Exp $
+
+*iscan-2.0.0 (06 Apr 2006)
+
+  06 Apr 2006; Stefan Briesenick <sbriesen@gentoo.org> +iscan-2.0.0.ebuild:
+  version bump, ebuild cleanup + enhancements, adding GCC4.x support, solving
+  bug #124875.
 
 *iscan-1.18.0 (10 Feb 2006)
 
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index b0fd544ff3ca..db5cdce3cf13 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -7,12 +7,18 @@ SHA256 02dbe36155811d53a973741916e0cc9f324a579f4c12bf357104da10aae7d0ba files/di
 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 b956f6ad2172bf914177a2a85c1eb6aa files/digest-iscan-2.0.0 4636
+RMD160 0b69b574199c1620a3416da692d44e4331cd6316 files/digest-iscan-2.0.0 4636
+SHA256 c0a7bec9ee5f9e449b3ba8acb4f4a05b7b3a7445b943e589fbe5f76e48827756 files/digest-iscan-2.0.0 4636
 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 e4476f666497c2fd71f869246530bd05 iscan-1.18.0.ebuild 3947
 RMD160 0d49f1611f9e8992af3abb99882469c7768a79b1 iscan-1.18.0.ebuild 3947
 SHA256 27a88a417f124048e703b20242198ef4488ecce47abced41af5eaf66c2488086 iscan-1.18.0.ebuild 3947
+MD5 588bf7e9c9857fc139376bf0903f00ca iscan-2.0.0.ebuild 6113
+RMD160 ffe953616e29516d0c8051fa223bc0cbea11d839 iscan-2.0.0.ebuild 6113
+SHA256 2236aaedbe516cfcfcf16e2322778212d736f188c1e32c01fc0d91f5d497f519 iscan-2.0.0.ebuild 6113
 MD5 ba682f5946d2063873acfa9c5390dfcb metadata.xml 674
 RMD160 9337250d90495a96a34e5e3b6db2b5125f75e8cb metadata.xml 674
 SHA256 9c1fe69dd2b3ba142164829a8725afdc1f573f597d4decd024d006c6321efe26 metadata.xml 674
diff --git a/media-gfx/iscan/files/digest-iscan-2.0.0 b/media-gfx/iscan/files/digest-iscan-2.0.0
new file mode 100644
index 000000000000..99eb0cfef43b
--- /dev/null
+++ b/media-gfx/iscan/files/digest-iscan-2.0.0
@@ -0,0 +1,48 @@
+MD5 0eee60d5be992fc82db60091934eeacc iscan-2.0.0-0.c2.tar.gz 1336373
+RMD160 c9de45c9e88fb438657d661e4e409cad23c80710 iscan-2.0.0-0.c2.tar.gz 1336373
+SHA256 9798354478141b45a65699ec529164a2063ecbbed47adbc3f94c094777d2973c iscan-2.0.0-0.c2.tar.gz 1336373
+MD5 a9fd56f754eeac51fcc403f09b1d606d iscan-2.0.0-0.tar.gz 1305871
+RMD160 3e5b3367042302bf2ca17e55ab4bf9615faddf94 iscan-2.0.0-0.tar.gz 1305871
+SHA256 3ff62354721f18b6666ed6b7ab97d0d79586ef29ff2d69ebd8578f8921d369c5 iscan-2.0.0-0.tar.gz 1305871
+MD5 08e81ee1d522c5e33edaac26afd0ded8 iscan-plugin-gt-7200-1.0.0-1.c2.i386.rpm 62336
+RMD160 7862ae8f8e4362ba9535b9d492e742d9716da91d iscan-plugin-gt-7200-1.0.0-1.c2.i386.rpm 62336
+SHA256 11789e2074670b1098cea9366b3e33bb72ce316c0ced6e09086f3a13eeccb86f iscan-plugin-gt-7200-1.0.0-1.c2.i386.rpm 62336
+MD5 c5808e23a0e9fb367805f884b187b658 iscan-plugin-gt-7200-1.0.0-1.i386.rpm 61826
+RMD160 eab55bd4b8b5d4f329e4b61e8b2b4a9f415aaa65 iscan-plugin-gt-7200-1.0.0-1.i386.rpm 61826
+SHA256 be819a904196b8b26a3667ce00e0d56f03bbbdf8bbf22581fa292b92a5d19725 iscan-plugin-gt-7200-1.0.0-1.i386.rpm 61826
+MD5 060e7ab5b38371a681facae2995b8a74 iscan-plugin-gt-7300-1.0.0-1.c2.i386.rpm 77271
+RMD160 9d3a95a1eefd5a63b991d06ed58356aeb814b7d8 iscan-plugin-gt-7300-1.0.0-1.c2.i386.rpm 77271
+SHA256 a6cfce5c1da99ee34b4186cdf7e611a685be8da95b08f8295fdeafcb4d0fc339 iscan-plugin-gt-7300-1.0.0-1.c2.i386.rpm 77271
+MD5 b7e9c5f9f4f0350a971a56eaa9dc1d9d iscan-plugin-gt-7300-1.0.0-1.i386.rpm 78849
+RMD160 4adf46bbe3ebf7cba38bcac715f3ed9dec04f465 iscan-plugin-gt-7300-1.0.0-1.i386.rpm 78849
+SHA256 113d07bd7775676d49da22a57c45d4aadb35bf08b62ccde96e6709b47f7e3cd9 iscan-plugin-gt-7300-1.0.0-1.i386.rpm 78849
+MD5 f76725766f44debe3f3fec06d0e2023b iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm 140610
+RMD160 aaa768cffc851d2168e358c6f4e30b8125ef8e86 iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm 140610
+SHA256 0172f3331dfefac27fffe3723b7b403b1fbc5d0cd0c3e835bdef7d925dfeab3e iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm 140610
+MD5 770aa86879bbd92737b61ae4fa3789f5 iscan-plugin-gt-9400-1.0.0-1.i386.rpm 138618
+RMD160 a05565c3640bdc1e443dddfdd3090eec2f5b1ed8 iscan-plugin-gt-9400-1.0.0-1.i386.rpm 138618
+SHA256 a92e0441964370c094486d5bf0c532722724e38767d2268b7feb6b1de9e5998b iscan-plugin-gt-9400-1.0.0-1.i386.rpm 138618
+MD5 8b1c398ef58769d9ceb77ad771515de3 iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm 126130
+RMD160 a5ea991156fb8fbe460c5a8198467837eedfa6bc iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm 126130
+SHA256 fe87d16ce22c28e2c320286758bea32ea4cad75c83debd6fe95670b704701464 iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm 126130
+MD5 ba26881e7697db513a2719bc21f959fe iscan-plugin-gt-f500-1.0.0-1.i386.rpm 124153
+RMD160 cf624c88aa6678627b69da06c3f257d7cd5ffd8b iscan-plugin-gt-f500-1.0.0-1.i386.rpm 124153
+SHA256 91ef3ea74051e55e8f5f3aebe98b456b5b2eea997bdb8ad1dd73389ffccf6398 iscan-plugin-gt-f500-1.0.0-1.i386.rpm 124153
+MD5 b72a512a927b9f2020af817c5a541ae8 iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm 125919
+RMD160 8743c98fb45b055adc1db38cfd312de9517cccee iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm 125919
+SHA256 2f0dd2257e19c808062ddbaa4a1f4cf6899944cacce67f46136008fbe60ae61a iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm 125919
+MD5 1bac617831d8a2beccde42f772c43941 iscan-plugin-gt-f520-1.0.0-1.i386.rpm 124048
+RMD160 c95242a974bfdee814de74d522f4b2dca331cdd1 iscan-plugin-gt-f520-1.0.0-1.i386.rpm 124048
+SHA256 19ae358ee4b7ba51cff3330aa0719ed158983cc0f197e5836b7e20257f6d6f94 iscan-plugin-gt-f520-1.0.0-1.i386.rpm 124048
+MD5 5f4137fd69198617b95bd59261affd75 iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm 151280
+RMD160 2779029ea507525042122a0ca5581a3b0fd5cbc8 iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm 151280
+SHA256 4735e468c060250a2e6b9adca72ed43c9e8523db5b95d8edad7d0e91f0ac13d2 iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm 151280
+MD5 7e5aabd458ffdf1856a59172b869dc91 iscan-plugin-gt-f600-1.0.0-1.i386.rpm 149184
+RMD160 a77262fd49cbe6ff788fa16113bd10f8a6f1ef2c iscan-plugin-gt-f600-1.0.0-1.i386.rpm 149184
+SHA256 6d7850442dff534946526008abe006107bc558a07d9b6c0a38ba388dd3bf601a iscan-plugin-gt-f600-1.0.0-1.i386.rpm 149184
+MD5 02c151a49608ae911b1e200672ed236f iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm 163386
+RMD160 aeb024f903c79d64cb79ab8c15d3f6fb0c7ece8d iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm 163386
+SHA256 7ebd3a9cf7f35b5abc5cd8c6b5c27dd98b2b6c39ad621c9ab753f3046b9578a4 iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm 163386
+MD5 b0f5b2cfbb538fa820db1fdb9d5b13dd iscan-plugin-gt-x750-1.0.0-1.i386.rpm 161133
+RMD160 b86c4e69812c035972d4a9b3e49079342c0bcc55 iscan-plugin-gt-x750-1.0.0-1.i386.rpm 161133
+SHA256 adb09cabdcf9c7b8740b1dad1f10eb66af2fe471e7669ece22af4fa7441c5c0f iscan-plugin-gt-x750-1.0.0-1.i386.rpm 161133
diff --git a/media-gfx/iscan/iscan-2.0.0.ebuild b/media-gfx/iscan/iscan-2.0.0.ebuild
new file mode 100644
index 000000000000..2357541e3c79
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.0.0.ebuild
@@ -0,0 +1,209 @@
+# 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-2.0.0.ebuild,v 1.1 2006/04/06 22:32:50 sbriesen Exp $
+
+inherit eutils multilib toolchain-funcs rpm
+
+# HINTS:
+# -> non-free modules are x86 only
+# -> isane frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-0.tar.gz    (for gcc 3.2/3.3)
+# -> ${P}-0.c2.tar.gz (for gcc 3.4 or later)
+
+# PLUGINS:
+# -> iscan-plugin-gt-7200 == Perfection 1250 PHOTO
+# -> iscan-plugin-gt-7300 == Perfection 1260 PHOTO
+# -> iscan-plugin-gt-9400 == Perfection 3170 PHOTO
+# -> iscan-plugin-gt-f500 == Perfection 2480/2580 PHOTO
+# -> iscan-plugin-gt-f520 == Perfection 3490/3590 PHOTO
+# -> iscan-plugin-gt-f600 == Perfection 4180 PHOTO
+# -> iscan-plugin-gt-x750 == Perfection 4490 PHOTO
+
+# FIXME:
+# make jpeg/png optional. The problem is, that the
+# configure script ignores --disable-*, if the
+# corresponding lib is found on the system.
+
+LANGS="de es fr it ja ko nl pt zh_CN zh_TW"
+PLUGINS="7200 7300 9400 f500 f520 f600 x750"
+
+SRC_GCC33="http://lx1.avasys.jp/iscan/${PV}/${P}-0.tar.gz"
+SRC_GCC34="http://lx1.avasys.jp/iscan/${PV}/${P}-0.c2.tar.gz"
+BIN_GCC33=""
+BIN_GCC34=""
+
+for X in ${PLUGINS}; do
+	BIN_GCC33="${BIN_GCC33}	http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-${X}-1.0.0-1.i386.rpm"
+	BIN_GCC34="${BIN_GCC34}	http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-${X}-1.0.0-1.c2.i386.rpm"
+done
+
+# feel free to add your arch, every non-x86
+# arch doesn't install any x86-only stuff.
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend and firmware)"
+HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
+SRC_URI="x86? ( ${SRC_GCC33} ${BIN_GCC33} ) ${SRC_GCC34} ${BIN_GCC34}"
+LICENSE="GPL-2 EAPL EPSON"
+SLOT="0"
+
+IUSE="X gimp unicode usb"
+for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
+
+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() {
+	local i
+	if ! use x86 && ( use X || use gimp ); then
+		ewarn
+		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."
+		ewarn
+	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])
+			if use x86; then
+				MY_A="${SRC_GCC33##*/}"
+				for i in ${BIN_GCC33}; do MY_A="${MY_A} ${i##*/}"; done
+			else  # fallback to GCC 3.4, should not harm.
+				MY_A="${SRC_GCC34##*/}"
+				for i in ${BIN_GCC34}; do MY_A="${MY_A} ${i##*/}"; done
+			fi
+			;;
+		3.4|4.[01])  # 4.x seems to work (tested with Perfection 3490 PHOTO)
+			MY_A="${SRC_GCC34##*/}"
+			for i in ${BIN_GCC34}; do MY_A="${MY_A} ${i##*/}"; done
+			;;
+		*)
+			if use x86; then
+				die "Your GCC version is not supported. You need either 3.2, 3.3, 3.4 or 4.x!"
+			else
+				MY_A="${SRC_GCC34##*/}"  # fallback to GCC 3.4, should not harm.
+				for i in ${BIN_GCC34}; do MY_A="${MY_A} ${i##*/}"; done
+			fi
+			;;
+	esac
+}
+
+src_unpack() {
+	local i
+
+	cd "${WORKDIR}"
+	for i in ${MY_A}; do
+		case "${i}" in
+			*.rpm)
+				echo ">>> Unpacking ${i}"
+				rpm_unpack "${DISTDIR}/${i}" || die "failure unpacking ${i}"
+				;;
+			*)
+				unpack "${i}"
+				;;
+		esac
+	done
+
+	cd "${S}"
+
+	# convert japanese docs to UTF-8
+	if use unicode && use linguas_ja; then
+		einfo "Converting docs to UTF-8"
+		for i in {NEWS,README}.ja non-free/*.ja.txt ${WORKDIR}/doc/*/*.ja.txt; do
+			if [ -f "${i}" ]; then
+				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+			fi
+		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() {
+	local MY_LIB="/usr/$(get_libdir)"
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# --disable-static doesn't work, so we just remove obsolete static lib
+	sed -i -e "s:^\(old_library=\):# \1:g" "${D}${MY_LIB}/sane/libsane-epkowa.la"
+	rm -f "${D}${MY_LIB}/sane/libsane-epkowa.a"
+
+	# install scanner plugins (x86-only)
+	if use x86; then
+		dodir ${MY_LIB}/iscan
+		cp -df "${WORKDIR}"/usr/lib/iscan/* "${D}${MY_LIB}"/iscan/.
+	fi
+
+	# install scanner firmware (could be used by sane-backends)
+	insinto /usr/share/iscan
+	doins "${WORKDIR}"/usr/share/iscan/*
+
+	# install docs
+	dodoc AUTHORS NEWS README doc/{epkowa.desc,xinetd.sane}
+	use linguas_ja && dodoc NEWS.ja README.ja
+
+	# install USB hotplug stuff
+	if use usb; then
+		insinto /etc/hotplug/usb
+		exeinto /etc/hotplug/usb
+		doins utils/hotplug/iscan.usermap
+		doexe utils/hotplug/iscan-device
+	fi
+
+	# 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
+}