--- iscan-network-nt-1.1.1.1.ebuild	2016-10-29 10:51:44.009382481 -0400
+++ iscan-network-nt-1.1.1.1-r1.ebuild	2016-10-29 10:53:19.008377598 -0400
@@ -2,22 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=6
 
-inherit rpm versionator multilib
+inherit versionator multilib
 
 MY_PV="$(get_version_component_range 1-3)"
 MY_PVR="$(replace_version_separator 3 -)"
 S="${WORKDIR}"
+DL_PN="iscan-bundle"
+DL_VER="1.0.1"
+if [[ ${ARCH} = 'amd64' ]]; then
+	DL_ARCH="x64"
+	PKG_ARCH="amd64"
+else
+	DL_ARCH="x86"
+	PKG_ARCH="amd64"
+fi
 
 DESCRIPTION="Image Scan! for Linux network plugin package for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="x86?  ( http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/02/49/93/67635720ac0b8d413610f3ed139faba2a3855c05/${PN}-${MY_PVR}.i386.rpm )
-		 amd64?  ( http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/02/49/93/668e593a30ec6e7f1e04843d6a90a991a618d99a/${PN}-${MY_PVR}.x86_64.rpm )"
+SRC_URI="x86?  ( https://download2.ebz.epson.net/iscan/general/deb/${DL_ARCH}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb.tar.gz )
+		 amd64?  ( https://download2.ebz.epson.net/iscan/general/deb/${DL_ARCH}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb.tar.gz )"
 
 LICENSE="AVASYS"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+#KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="media-gfx/iscan"
@@ -27,11 +36,14 @@
 src_compile () { :; }
 
 src_install() {
-	dodoc ${S}/usr/share/doc/${PN}-${MY_PV}/README ${S}/usr/share/doc/${PN}-${MY_PV}/NEWS ${S}/usr/share/doc/${PN}-${MY_PV}/AVASYSPL.en.txt
+	cd ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins
+	bsdtar -xf ${PN}_${MY_PVR}_${PKG_ARCH}.deb
+	bsdtar -xf data.tar.gz
+	dodoc ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/share/doc/${PN}/README ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/share/doc/${PN}/NEWS.gz ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/share/doc/${PN}/AVASYSPL.en.txt
 
 	insinto /usr/$(get_libdir)/iscan/
 	insopts -m0755
-	doins ${S}/usr/$(get_libdir)/iscan/network
+	doins ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/lib/iscan/network
 }
 
 pkg_postinst() {
--- iscan-network-nt-1.1.1.1.ebuild	2016-10-29 10:51:44.009382481 -0400
+++ iscan-network-nt-1.1.1.1-r1.ebuild	2016-10-29 11:05:19.288340573 -0400
@@ -2,18 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=6
 
-inherit rpm versionator multilib
+inherit versionator multilib
 
 MY_PV="$(get_version_component_range 1-3)"
 MY_PVR="$(replace_version_separator 3 -)"
 S="${WORKDIR}"
+DL_PN="iscan-bundle"
+DL_VER="1.0.1"
+if [[ ${ARCH} = 'amd64' ]]; then
+	DL_ARCH="x64"
+	PKG_ARCH="amd64"
+else
+	DL_ARCH="x86"
+	PKG_ARCH="amd64"
+fi
 
 DESCRIPTION="Image Scan! for Linux network plugin package for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="x86?  ( http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/02/49/93/67635720ac0b8d413610f3ed139faba2a3855c05/${PN}-${MY_PVR}.i386.rpm )
-		 amd64?  ( http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/02/49/93/668e593a30ec6e7f1e04843d6a90a991a618d99a/${PN}-${MY_PVR}.x86_64.rpm )"
+SRC_URI="x86?  ( https://download2.ebz.epson.net/iscan/general/deb/${DL_ARCH}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb.tar.gz )
+		 amd64?  ( https://download2.ebz.epson.net/iscan/general/deb/${DL_ARCH}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb.tar.gz )"
 
 LICENSE="AVASYS"
 SLOT="0"
@@ -27,11 +36,14 @@
 src_compile () { :; }
 
 src_install() {
-	dodoc ${S}/usr/share/doc/${PN}-${MY_PV}/README ${S}/usr/share/doc/${PN}-${MY_PV}/NEWS ${S}/usr/share/doc/${PN}-${MY_PV}/AVASYSPL.en.txt
+	cd ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins
+	bsdtar -xf ${PN}_${MY_PVR}_${PKG_ARCH}.deb
+	bsdtar -xf data.tar.gz
+	dodoc ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/share/doc/${PN}/README ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/share/doc/${PN}/NEWS.gz ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/share/doc/${PN}/AVASYSPL.en.txt
 
 	insinto /usr/$(get_libdir)/iscan/
 	insopts -m0755
-	doins ${S}/usr/$(get_libdir)/iscan/network
+	doins ${S}/${DL_PN}-${DL_VER}.${DL_ARCH}.deb/plugins/usr/lib/iscan/network
 }
 
 pkg_postinst() {