Use a generalized syntax to handle multiple base commands; install in /opt; fix description; simplify doc install.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 35 insertions, 20 deletions

diff --git a/media-gfx/iscan-plugin-gt-f500/ChangeLog b/media-gfx/iscan-plugin-gt-f500/ChangeLog
index 61e77fc610b5..d61f2938bca7 100644
--- a/media-gfx/iscan-plugin-gt-f500/ChangeLog
+++ b/media-gfx/iscan-plugin-gt-f500/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/iscan-plugin-gt-f500
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-f500/ChangeLog,v 1.2 2011/04/21 14:28:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-f500/ChangeLog,v 1.3 2011/04/22 15:12:04 flameeyes Exp $
+
+  22 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  iscan-plugin-gt-f500-1.0.0.1.ebuild, metadata.xml:
+  Use a generalized syntax to handle multiple base commands; install in /opt;
+  fix description; simplify doc install.
 
   21 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   iscan-plugin-gt-f500-1.0.0.1.ebuild:
diff --git a/media-gfx/iscan-plugin-gt-f500/Manifest b/media-gfx/iscan-plugin-gt-f500/Manifest
index 269f1c410c66..3641e5961064 100644
--- a/media-gfx/iscan-plugin-gt-f500/Manifest
+++ b/media-gfx/iscan-plugin-gt-f500/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST iscan-plugin-gt-f500-1.0.0-1.i386.rpm 124153 RMD160 cf624c88aa6678627b69da06c3f257d7cd5ffd8b SHA1 c0abb811f97f5d1c69b2777946c208b404ad0437 SHA256 91ef3ea74051e55e8f5f3aebe98b456b5b2eea997bdb8ad1dd73389ffccf6398
-EBUILD iscan-plugin-gt-f500-1.0.0.1.ebuild 2030 RMD160 6e6135eb920213350a4e962f88f9c930fa6f4de0 SHA1 4b74a7c2f5ec045a942e0f33e508fe3d52dff8b0 SHA256 09acae8dbe7be95b5ed4c9553c074ad0ea1b48813ebbfa889bb9491ab4782702
-MISC ChangeLog 673 RMD160 78b949c35da4a6d8d2d75c388fc03eab3c08ef55 SHA1 9a92128c32b73ef27782e2ee0476900d5028ed09 SHA256 180e2c498bdfc9bf974fbc606fb17253c75381faa18c6f832659d1949248a46b
-MISC metadata.xml 792 RMD160 bc1c9b06dd3ea55b3a345a25233f92d433117d7c SHA1 4c72c20441004cd1e8ae5ca3d4baf4ac7d7af204 SHA256 56fc60400299f13855309f3d6c0a7e4ca6164ca24df40cb2b4fc48e139d0573c
+EBUILD iscan-plugin-gt-f500-1.0.0.1.ebuild 2160 RMD160 0a7dc1a2db8dcd241156ca1479667e22fb15c8e0 SHA1 7ca09185604e2d4d901e3f443ae328c5ed351d62 SHA256 add1b78e9b55ffdae8eb5c4f78aef2fb7b4afa1dacb0a82223f08395b6b665e7
+MISC ChangeLog 902 RMD160 901990c9d0af57e38e374509c8e6338b5ea3ab0e SHA1 01c4ae2009af5c774616487f91a65ffac027ac53 SHA256 fc15df1cd44a69fee1e8600c6a1105ca90b4e26ccb0358b25990a82d380fccb0
+MISC metadata.xml 812 RMD160 572673b2c710a6ee6023eb4b283b196825f16db3 SHA1 7d68ce05634fa847e501a2a0f54bbc99c42a817d SHA256 2c8d92804e2a2e484043e3ebf1135ec2757173c4dbe03dd61ebc1381356af08c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2wPwwACgkQAiZjviIA2XgusgCeLODY9yYrB372TB3oreZkNvKl
-KOMAoJ7Hbxe5CL689nbjGGI16EisW0As
-=rBih
+iEYEARECAAYFAk2xmscACgkQAiZjviIA2XgyqwCeJjRlAXrOOerCaHNIiHOhRs9U
+6g4AoKBBobFhY6gfRgAFkMqYbJats3hW
+=yxUR
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1.ebuild b/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1.ebuild
index 178bbb2ea0f1..11ae51b6b269 100644
--- a/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1.ebuild
+++ b/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1.ebuild,v 1.2 2011/04/21 14:28:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1.ebuild,v 1.3 2011/04/22 15:12:04 flameeyes Exp $
 
 EAPI="4"
 
 inherit rpm versionator
 
-MY_P="${PN}-$(get_version_component_range 1-3)"
+MY_P="${PN}-$(replace_version_separator 3 -)"
 
-DESCRIPTION="Epson Perfection V2480/2580 PHOTO scanner plugin for SANE 'epkowa' backend."
+DESCRIPTION="Epson Perfection 2480/2580 PHOTO scanner plugin for SANE 'epkowa' backend."
 HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
-SRC_URI="http://lx1.avasys.jp/iscan/v1180/${PN}-$(replace_version_separator 3 -).i386.rpm"
+SRC_URI="http://lx1.avasys.jp/iscan/v1180/${MY_P}.i386.rpm"
 
 LICENSE="EPSON EAPL"
 SLOT="0"
@@ -31,16 +31,18 @@ src_install() {
 	insinto /usr/share/iscan
 	doins "${WORKDIR}/usr/share/iscan/"*
 
-	dodoc "usr/share/doc/${MY_P}/"*
+	dodoc usr/share/doc/*/*
 
 	use minimal && return
 	# install scanner plugins
-	exeinto "/usr/$(get_libdir)/iscan"
+	exeinto /opt/iscan/esci
 	doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"*
 }
 
 pkg_setup() {
-	basecmd="iscan-registry --COMMAND interpreter usb 0x04b8 0x0121 '/usr/$(get_libdir)/iscan/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
+	basecmds=(
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
+	)
 }
 
 pkg_postinst() {
@@ -53,11 +55,15 @@ pkg_postinst() {
 
 	# Needed for scanner to work properly.
 	if [[ ${ROOT} == "/" ]]; then
-		eval ${basecmd/COMMAND/add}
+		for basecmd in "${basecmds[@]}"; do
+			eval ${basecmd/COMMAND/add}
+		done
 	else
 		ewarn "Unable to register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		ewarn "${basecmd/COMMAND/add}"
+		for basecmd in "${basecmds[@]}"; do
+			ewarn "${basecmd/COMMAND/add}"
+		done
 	fi
 }
 
@@ -66,10 +72,14 @@ pkg_prerm() {
 	[[ -n ${REPLACED_BY_VERSION} ]] && return
 
 	if [[ ${ROOT} == "/" ]]; then
-		eval ${basecmd/COMMAND/remove}
+		for basecmd in "${basecmds[@]}"; do
+			eval ${basecmd/COMMAND/remove}
+		done
 	else
 		ewarn "Unable to de-register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		ewarn "${basecmd/COMMAND/remove}"
+		for basecmd in "${basecmds[@]}"; do
+			ewarn "${basecmd/COMMAND/remove}"
+		done
 	fi
 }
diff --git a/media-gfx/iscan-plugin-gt-f500/metadata.xml b/media-gfx/iscan-plugin-gt-f500/metadata.xml
index 73e49419c3a0..90b8153ae56e 100644
--- a/media-gfx/iscan-plugin-gt-f500/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-f500/metadata.xml
@@ -15,8 +15,8 @@
 
     Supports the following models:
 
-    EPSON Perfection 2480 PHOTO
-    EPSON Perfection 2580 PHOTO
+    EPSON Perfection 2480 PHOTO / GT-F500
+    EPSON Perfection 2580 PHOTO / GT-F550
   </longdescription>
 
   <use>