Cleanup (bug #287211.)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

2 files changed, 4 insertions, 44 deletions

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 8003ed1ff1e9..3d3452a82837 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,6 +1,3 @@
------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
@@ -23,13 +20,6 @@ DIST iscan-plugin-gt-x770-2.1.0-0.c2.i386.rpm 166476 RMD160 123a686c2d5abcd2d319
 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
 EBUILD iscan-2.11.0.ebuild 9627 RMD160 6269364ef4196572c4b3c10fafd861c5ed47ce11 SHA1 d5f0434ac802bd43d7390045ac1acf0613897892 SHA256 418dca91a175b26c1c7fa37cdb5d46bcb21dc1a50a8016a5ebef595544cdbaee
-EBUILD iscan-2.21.0.ebuild 6451 RMD160 f2800c5d78281b53ab2332346ac2906e11ec92b9 SHA1 d555f57fd9d9481e82f9d6ebfd504b861e343578 SHA256 87d9ecf68246a908b99d60001fd1af8a404558d45b6405fedd3f04e7251a1638
+EBUILD iscan-2.21.0.ebuild 5330 RMD160 064af3cef9439ca775153ce60cbc91fc7267180e SHA1 8b543e9ffa3d3a3124294e4e112747334bdde4ec SHA256 7f8e3b9473962b953f113924098d4f6c7001e795ef23599cfa358b00e33d7791
 MISC ChangeLog 6247 RMD160 0306ac99637b429b3b1d3e551ab3b13ddd1f87ee SHA1 3c6c6b5b320c195029e4b6d474f3d95a45e8a4c8 SHA256 eb6cfafe22d555559a282ab031854a293a1005a2c7f7aaa542c015c8b1a41de2
 MISC metadata.xml 674 RMD160 9337250d90495a96a34e5e3b6db2b5125f75e8cb SHA1 6405fc64d508b081a27c420828302dadd05fafe9 SHA256 9c1fe69dd2b3ba142164829a8725afdc1f573f597d4decd024d006c6321efe26
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq77KMACgkQAiZjviIA2Xgj3ACgmSa47ZhU3U4cQhdF+5BFD4kK
-9N0AnRPTb5DwMFfxA73a4uW1FLs+Ig5Z
-=6pnp
------END PGP SIGNATURE-----
diff --git a/media-gfx/iscan/iscan-2.21.0.ebuild b/media-gfx/iscan/iscan-2.21.0.ebuild
index d93c855e187b..0e18336d6908 100644
--- a/media-gfx/iscan/iscan-2.21.0.ebuild
+++ b/media-gfx/iscan/iscan-2.21.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild,v 1.3 2009/09/24 22:03:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild,v 1.4 2009/10/01 08:14:22 elvanor Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
 QA_TEXTRELS="usr/$(get_libdir)/iscan/lib*"
 
 # Upstream ships broken sanity test
-RESTRICT=test
+RESTRICT="test"
 
 RDEPEND="media-gfx/sane-backends
 	>=sys-fs/udev-103
@@ -98,19 +98,6 @@ usermap_to_udev() {
 	echo 'LABEL="iscan_rules_end"'
 }
 
-pkg_setup() {
-	if use X || use gimp; then
-		ewarn
-		ewarn "The iscan application needs CSS x86/amd64-only"
-		ewarn "libs and thus can't be built currently.  You"
-		ewarn "can still use 'xscanimage', 'xsane', or 'kooka'"
-		ewarn "with sane-epkowa backend.  But some low-end"
-		ewarn "scanners are also not supported, because they"
-		ewarn "need these x86/amd64 libs, too."
-		ewarn
-	fi
-}
-
 src_prepare() {
 	local i
 
@@ -204,7 +191,7 @@ 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."
@@ -216,21 +203,4 @@ pkg_postinst() {
 		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."
-	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
 }