fixed Manifest

4 files changed, 16 insertions, 307 deletions

diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index a4c13e126250..cbece36cc8bd 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/iscan
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.29 2008/06/29 22:56:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.30 2008/06/30 17:52:50 sbriesen Exp $
+
+  30 Jun 2008; Stefan Briesenick <sbriesen@gentoo.org> -iscan-2.8.0.ebuild,
+  iscan-2.11.0.ebuild:
+  removed old version.
+
+  30 Jun 2008; Stefan Briesenick <sbriesen@gentoo.org> iscan-2.11.0.ebuild:
+  small correction in libtool fix
 
   29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/iscan-2.11.0-libltdl.patch, iscan-2.11.0.ebuild:
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 2949a45d2d9b..9a0a0684ae86 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -2,7 +2,6 @@ AUX iscan-2.10.0+gcc-4.3.patch 768 RMD160 049cde9cc91225af8aef872217f704972ff55d
 AUX iscan-2.11.0-gcc43.patch 249 RMD160 8d10c5a4105f7ba520948fa5ff630c07907f0a2f SHA1 590bb8e964a8c920ef302e15264bc2ee9bc79ad9 SHA256 a5babcf81aa2023a15e8a58ae08e2b3c65d9ca9767ccd5796a67eaf75ed9cdbd
 AUX iscan-2.11.0-libltdl.patch 1102 RMD160 14ad9a6481a864e143ed977129d0f4258c08c555 SHA1 e30d0add39dceca98a3fa01ea3a1a478b2e61070 SHA256 501e4f8cb396da112bcf30051b8a8e8703c5f866a70ad757d019dea696ab3b48
 AUX iscan-usb.sh 826 RMD160 ebf81c44b9e4f1f040a276e3f918662cd93a5f10 SHA1 90e0205dad199aeb87cfb89c7d89dd8737702001 SHA256 8ece8711de7ebfd7d9266e96d8cdf4c7bc12ad52ab212590162526d4af669798
-DIST iscan-2.8.0-1.c2.tar.gz 1297487 RMD160 d15b4c8062e124468aa40169fd6448213ffa4bd9 SHA1 f59ddebe98ccd3614af7562e12af951d5fe9b072 SHA256 0b8269769cbacc3666866998e763f44226d15a68a6d164ad55fa6a3f3cf70a45
 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
 DIST iscan-plugin-gt-7300-1.0.0-1.c2.i386.rpm 77271 RMD160 9d3a95a1eefd5a63b991d06ed58356aeb814b7d8 SHA1 b57c9d4a7e8cd90157a3671d5a794d603a6734cd SHA256 a6cfce5c1da99ee34b4186cdf7e611a685be8da95b08f8295fdeafcb4d0fc339
@@ -18,7 +17,6 @@ DIST iscan-plugin-gt-x770-2.1.0-0.c2.i386.rpm 166476 RMD160 123a686c2d5abcd2d319
 DIST iscan_2.10.0-1.tar.gz 1437822 RMD160 0ce7c7d88b93f7881558d7d9ca556f87e0684a23 SHA1 87340157b2f6854e6bdeb00b4036467b845189c6 SHA256 8930ef9c41951bb2b229160e832fce9bef520bcb578af5c3c7cc7f58d378ec43
 DIST iscan_2.11.0-1.tar.gz 1458880 RMD160 7ac5777d57afa2c0a76cac0808a3aaf7c354edf5 SHA1 a7fe77ded2f788a7bed6b0fa8377c43e6cf6e077 SHA256 ae0a72647acfa4cedc320e280014d3cdf8d61c0f4e2a7e941697cf2f36bed0a8
 EBUILD iscan-2.10.0.ebuild 9378 RMD160 9f49b53c0c5bbbe7bfc2a334ea684b4fc797ad86 SHA1 74075bb4e14f91d163f86abd18298b3f8400521e SHA256 33a3195bbcded623fca7fe96550142b12633b65d569315d5f18c00821dfeac63
-EBUILD iscan-2.11.0.ebuild 9589 RMD160 a16f6bda948cb46e26ecc3265ef883cc5debcdd5 SHA1 248925ccf8c4b507c37ed59ccf84b3f6e58b1de5 SHA256 6e275d05a48565587948343fe200a7f16c0893a152bf35b72d66fa91c5959941
-EBUILD iscan-2.8.0.ebuild 9096 RMD160 9cd4c8f69c5bbea21dba5158ea4c41eb60b7a05c SHA1 215ed86a8e6f4cb813d5aa2c238a3211b67d0504 SHA256 9747a3eda93386be42caf1d21f720c0b0f62f5234eb711f822bdce93f5d06466
-MISC ChangeLog 4581 RMD160 779e5eddbcee7ab6d530c011d2c3ef0fdd9c90c2 SHA1 c3081c3b5f1b5ff0ba7c9ee6f975724fd71a54c0 SHA256 7edf827dc2ad2ddf7edccc5fb0d9935160d4afe345bd156d4b6f62c059c9e1bb
+EBUILD iscan-2.11.0.ebuild 9608 RMD160 4e0c7fb5465e89e8b4be8d0b41d135f0eb940baa SHA1 28d1afd86c054e582ea547491ec9aeb8c363d2f8 SHA256 7f6ebd5b3d7ecdace2688f1ef54a96faa47d43188c9be22d36cac8053bae4fd3
+MISC ChangeLog 4815 RMD160 6e38069c2e9e3f4bfe409c3356424cd03d3d65a3 SHA1 c2d7b8c6ca25361aee775576f6bbcb6c8258fce8 SHA256 41b71ca2574dd408c3bd1feb3acaef862d52b856a4e84f25624b0cd5465141ce
 MISC metadata.xml 674 RMD160 9337250d90495a96a34e5e3b6db2b5125f75e8cb SHA1 6405fc64d508b081a27c420828302dadd05fafe9 SHA256 9c1fe69dd2b3ba142164829a8725afdc1f573f597d4decd024d006c6321efe26
diff --git a/media-gfx/iscan/iscan-2.11.0.ebuild b/media-gfx/iscan/iscan-2.11.0.ebuild
index ec602778fcc4..00ee41bb66d3 100644
--- a/media-gfx/iscan/iscan-2.11.0.ebuild
+++ b/media-gfx/iscan/iscan-2.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.11.0.ebuild,v 1.3 2008/06/29 22:56:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.11.0.ebuild,v 1.4 2008/06/30 17:52:50 sbriesen Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -178,6 +178,10 @@ src_unpack() {
 
 	cd "${S}"
 
+	# apply patches
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-libltdl.patch"
+
 	# convert japanese docs to UTF-8
 	if use unicode && use linguas_ja; then
 		for i in {NEWS,README}.ja non-free/*.ja.txt; do
@@ -198,10 +202,8 @@ src_unpack() {
 		sed -i -e 's:iscan.1::g' doc/Makefile*
 	fi
 
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-libltdl.patch
 	# autotool stuff
-	rm libltdl/acinclude.m4
+#	rm libltdl/acinclude.m4
 	rm m4/libtool.m4
 	eautoreconf
 }
diff --git a/media-gfx/iscan/iscan-2.8.0.ebuild b/media-gfx/iscan/iscan-2.8.0.ebuild
deleted file mode 100644
index 618ffd279ea2..000000000000
--- a/media-gfx/iscan/iscan-2.8.0.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.8.0.ebuild,v 1.1 2007/09/03 20:55:51 sbriesen Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils toolchain-funcs flag-o-matic autotools rpm
-
-SRC_REV="1"  # revision used by upstream
-
-# HINTS:
-# -> non-free modules are x86 only
-# -> isane 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)
-
-# PLUGINS:
-# -> iscan-plugin-gt-7200 == Perfection 1250 PHOTO
-# -> iscan-plugin-gt-7300 == Perfection 1260 PHOTO
-# -> iscan-plugin-gt-9400 == Perfection 3170 PHOTO      (esfw32.bin)
-# -> iscan-plugin-gt-f500 == Perfection 2480/2580 PHOTO (esfw41.bin)
-# -> iscan-plugin-gt-f520 == Perfection 3490/3590 PHOTO (esfw52.bin)
-# -> iscan-plugin-gt-f600 == Perfection 4180 PHOTO      (esfw43.bin)
-# -> iscan-plugin-gt-x750 == Perfection 4490 PHOTO      (esfw54.bin)
-# -> iscan-plugin-gt-s600 == Perfection V10/V100 PHOTO  (esfw66.bin)
-# -> iscan-plugin-gt-f700 == Perfection V350 PHOTO      (esfw68.bin)
-# -> iscan-plugin-gt-f670 == Perfection V200 PHOTO      (esfw7A.bin)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the
-# configure script ignores --disable-*, if the
-# corresponding lib is found on the system.
-# Furthermore, isane doesn't compile w/o libusb,
-# this should be fixed somehow.
-
-# available x86 plugins (will be assembled below)
-PLUGINS="
-	v1180/7200-1.0.0-1
-	v1180/7300-1.0.0-1
-	v1180/9400-1.0.0-1
-	v1180/f500-1.0.0-1
-	v1180/f520-1.0.0-1
-	v1180/f600-1.0.0-1
-	v1180/x750-1.0.0-1
-	2.3.0/f700-2.0.0-0
-	2.3.0/s600-2.0.0-1
-	2.8.0/f670-2.0.0-1"
-
-# Firmware files within plugin RPMs
-FIRMWARE=(	"esfw41.bin Perfection 2480/2580 PHOTO"
-			"esfw32.bin Perfection 3170 PHOTO"
-			"esfw52.bin Perfection 3490/3590 PHOTO"
-			"esfw43.bin Perfection 4180 PHOTO"
-			"esfw54.bin Perfection 4490 PHOTO"
-			"esfw66.bin Perfection V10/V100 PHOTO"
-			"esfw68.bin Perfection V350 PHOTO"
-			"esfw7A.bin Perfection V200 PHOTO" )
-
-SRC_GCC34="http://lx1.avasys.jp/iscan/${PV}/${P}-${SRC_REV}.c2.tar.gz"
-BIN_GCC34=""
-
-for X in ${PLUGINS}; do
-	BIN_GCC34="${BIN_GCC34} http://lx1.avasys.jp/iscan/${X%%/*}/iscan-plugin-gt-${X##*/}.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="${SRC_GCC34} ${BIN_GCC34}"
-LICENSE="GPL-2 EAPL EPSON"
-SLOT="0"
-
-IUSE="X gimp unicode"
-IUSE_LINGUAS="de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-QA_TEXTRELS="
-	usr/lib/iscan/libesint41.so.2.0.0
-	usr/lib/iscan/libesint52.so.2.0.0"
-
-DEPEND="media-gfx/sane-backends
-	media-libs/libpng
-	media-libs/jpeg
-	>=sys-fs/udev-103
-	>=dev-libs/libusb-0.1.12
-	x86? (
-		X? (
-			sys-devel/gettext
-			>=x11-libs/gtk+-2.0
-			gimp? ( media-gfx/gimp )
-		)
-	)"
-
-snapscan_firmware() {
-	local i
-	echo "#-------------- EPSON Image Scan! for Linux Scanner-Firmware --------------"
-	for i in "${FIRMWARE[@]}"; do
-		echo
-		echo "# ${i#* } (${i%% *})"
-		echo "#firmware /usr/share/iscan/${i%% *}"
-	done
-	echo
-	cat 2>/dev/null "${1}"
-}
-
-usermap_to_udev() {
-	local ACTION='MODE="0660", GROUP="scanner"'
-	local DEVICE='\1ATTRS{idVendor}=="\L\2\E", ATTRS{idProduct}=="\L\3\E"'
-	echo '# udev rules file for iscan devices (udev >= 0.98)'
-	echo '#'
-	echo 'ACTION!="add", GOTO="iscan_rules_end"'
-	echo 'SUBSYSTEM!="usb*", GOTO="iscan_rules_end"'
-	echo 'KERNEL=="lp[0-9]*", GOTO="iscan_rules_end"'
-	echo
-	sed -n -e "s|^\(# SEIKO EPSON.*\)|\1|p" \
-		-e "s|^\(#*\)i*scan-device *0x0003 *0x\([^ ]\+\) *0x\([^ ]\+\)*.*|${DEVICE}, ${ACTION}|p" "${1}"
-	echo
-	echo 'LABEL="iscan_rules_end"'
-}
-
-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.4|4.[01234])  # 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.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
-		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 iscan frontend + none-free modules
-	if ! ( use x86 && 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
-		sed -i -e 's:^\([[:space:]]*\)frontend[[:space:]]*\\:\1\\:g' \
-			-e 's:^\([[:space:]]*\)non-free[[:space:]]*\\:\1\\:g' \
-			-e 's:^\([[:space:]]*\)po[[:space:]]*\\:\1\\:g' Makefile*
-		sed -i -e 's:iscan.1::g' doc/Makefile*
-	fi
-
-	# autotool stuff
-	eautoconf
-}
-
-src_compile() {
-	append-flags -D_GNU_SOURCE  # needed for 'strndup'
-	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
-	use linguas_ja && dodoc NEWS.ja README.ja
-
-	# remove 'make-udev-rules', we use our own stuff below
-	rm -f "${D}usr/lib/iscan/make-udev-rules"
-
-	# install USB hotplug stuff
-	dodir /etc/udev/rules.d
-	usermap_to_udev utils/hotplug/iscan.usermap \
-		> "${D}etc/udev/rules.d/99-iscan.rules"
-
-	# 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() {
-	local i
-	local DLL_CONF="/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-	local SNAPSCAN_CONF="/etc/sane.d/snapscan.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
-	elog
-	elog "You can also use the 'snapscan' backend if you have a recent"
-	elog "sane-backend installation. Firmware files for some newer"
-	elog "EPSON scanners were installed into /usr/share/iscan:"
-	elog
-	for i in "${FIRMWARE[@]}"; do
-		elog " ${i%% *}: ${i#* }"
-	done
-	elog
-	if ! grep 2>/dev/null -q "/usr/share/iscan/.*\.bin" "${SNAPSCAN_CONF}"; then
-		snapscan_firmware "${SNAPSCAN_CONF}" > "${SNAPSCAN_CONF}~~~" \
-		&& mv -f "${SNAPSCAN_CONF}~~~" "${SNAPSCAN_CONF}" \
-		|| rm -f "${SNAPSCAN_CONF}~~~"
-		elog "The firmware entries were added to ${SNAPSCAN_CONF}"
-	else
-		elog "Please edit ${SNAPSCAN_CONF} to suit your needs."
-	fi
-	elog "Hint: not all models are supported by 'snapscan' yet!"
-	elog
-	elog "You can check which backend fits best for your scanner:"
-	elog "http://www.sane-project.org/cgi-bin/driver.pl?manu=Epson&bus=any"
-	elog
-}