media-gfx/epsonscan2 version bump

6 files changed, 11 insertions, 50 deletions

diff --git a/media-gfx/epsonscan2-non-free-plugin/Manifest b/media-gfx/epsonscan2-non-free-plugin/Manifest
index 41bf947..e7b0c49 100644
--- a/media-gfx/epsonscan2-non-free-plugin/Manifest
+++ b/media-gfx/epsonscan2-non-free-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST epsonscan2-bundle-6.7.0.0.x86_64.rpm.tar.gz 22483759 BLAKE2B a9682b6821154263c6ba85b174eb8e44361cf34e8a411662c63a855f89d09f70534d9305331319cce14642bd78d989d659076bce4cd993acc5937bce44da0ced SHA512 b51a0b9d8c3540393185723ae6b6ecd2e48504c093b9d26d447c908608d72f3d86f06c136bee6b84cda903f73f961bd448ca752f26358a0e09fd4e7388cde2c3
-DIST epsonscan2-bundle-6.7.43.0.x86_64.rpm.tar.gz 22930303 BLAKE2B 862e91a306aadca5c9e5bdf348ab72ac731b5567fc982acec8522e3efa8f0b7f720dfad9cee272c5b9a8d61875347ac9b303127ab8a1a3fecf79b014dc9bc6de SHA512 7971e6b5138b694e6bb5f9fa621fb38a1b159355eb509c135caf150e87fb17cd96336680956c4c69d80e417dd41bf79fddb6a435790495f6e04c55e834f2563f
-EBUILD epsonscan2-non-free-plugin-1.0.0.5.ebuild 945 BLAKE2B 06268aac6a047c04988a329e6c3c127ad0f89e89331d2a80e3a11143e47d2eae73d53224ecc689fd4adbd956c26a17eeee4d0566510b711e07926f65bab5f3e1 SHA512 81c75af3615f0e40658248f2c5916d7429261d51e09fc34766dfcaf16fa8eeb1b50b242cf932da4ced836a7e42b354775644d1045d9ca221b9965c5a4b3b0974
-EBUILD epsonscan2-non-free-plugin-1.0.0.6.ebuild 946 BLAKE2B de855dbd244607fd913e4ae9b3e5d2fb0783182685ba28c58ded60650a0e35798cd911b9ce62e88f827aa3827eadaa0bda213b6b61326e3d45066151b307cbcf SHA512 b50baac71450896b60f6616bf9c050a9981427028e9a160329c83ed6071685723e2c64885626220f7fc915f2ff814415cde0b96917427e001132bfcac644e7c5
+DIST epsonscan2-bundle-6.7.61.0.x86_64.rpm.tar.gz 23149705 BLAKE2B 49e388b276cb77b4165e279be1d7a25f40b6ac32359de842fd5e7357f2f0777dda01a9ba916c41c9a356008e15f50ad572e78a87168d97785c2615ca6021af2c SHA512 715c4606942308dbc297110e3b8c6d656137a950163a23f49e9910c7890a2590ac5f5363660034c5ee47d9d69e6ec3b49888e99e07de1273910dbefd5f1bae7e
+EBUILD epsonscan2-non-free-plugin-1.0.0.6.ebuild 982 BLAKE2B 0dbea61ab4a35d18d11ee34fbd941474f00ac8c5bc338411d784ca195eab4cc1d3f94ac2e1104a516123d2be03dee6bd8d28a5b140e58ed1d9c123af406e4607 SHA512 c211c8d763d49febb0a67cf70950a9d805954c6ec90344d08c97ab5d001ab0e6f60eef92011cbe9b7f7a193a0bcf6dd97e26f5a833f0cd65f36c7aec4624fb6f
 MISC metadata.xml 618 BLAKE2B bd895968aff2820d7857b196d6cb272e53c59da49777aa893958efbb29ad987c28bbbb75e40d98e927b60785743a5ac1e7fac5b4ad5d135fac64e04ab38f9197 SHA512 01b4a34c97d0e47d451dfaf611569d898c7b863530d6544a2882b6fab75c38dc1ca89927ab361afb62f8333374286f7e0f26a87a7833c40ad95117a138949a51
diff --git a/media-gfx/epsonscan2-non-free-plugin/epsonscan2-non-free-plugin-1.0.0.5.ebuild b/media-gfx/epsonscan2-non-free-plugin/epsonscan2-non-free-plugin-1.0.0.5.ebuild
deleted file mode 100644
index 89e0434..0000000
--- a/media-gfx/epsonscan2-non-free-plugin/epsonscan2-non-free-plugin-1.0.0.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit rpm
-
-DESCRIPTION="Plugins for Epson Scan 2"
-
-HOMEPAGE="https://support.epson.net/linux/en/epsonscan2.php"
-# This is distributed as part of the "bundle driver"; since we already have the
-# opensource part separately we just install the nonfree part here.
-
-EPSONSCAN2_VERSION="6.7.0.0"
-REL="1"
-
-SRC_URI="https://download2.ebz.epson.net/epsonscan2/common/rpm/x64/epsonscan2-bundle-${EPSONSCAN2_VERSION}.x86_64.rpm.tar.gz"
-LICENSE="EPSON"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="media-gfx/epsonscan2"
-RESTRICT="bindist mirror strip"
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	rpm_unpack "./epsonscan2-bundle-${EPSONSCAN2_VERSION}.x86_64.rpm/plugins/${P}-${REL}.x86_64.rpm"
-}
-
-src_install() {
-	mv usr/share/doc/${P}-${REL} usr/share/doc/${P}
-	insinto /
-	doins -r usr
-	# Fix permissions
-	find "${ED}/usr/lib"* -type f -exec chmod 0755 {} +
-}
diff --git a/media-gfx/epsonscan2-non-free-plugin/epsonscan2-non-free-plugin-1.0.0.6.ebuild b/media-gfx/epsonscan2-non-free-plugin/epsonscan2-non-free-plugin-1.0.0.6.ebuild
index 0a04e4c..0226031 100644
--- a/media-gfx/epsonscan2-non-free-plugin/epsonscan2-non-free-plugin-1.0.0.6.ebuild
+++ b/media-gfx/epsonscan2-non-free-plugin/epsonscan2-non-free-plugin-1.0.0.6.ebuild
@@ -11,10 +11,10 @@ HOMEPAGE="https://support.epson.net/linux/en/epsonscan2.php"
 # This is distributed as part of the "bundle driver"; since we already have the
 # opensource part separately we just install the nonfree part here.
 
-EPSONSCAN2_VERSION="6.7.43.0"
+EPSONSCAN2_VERSION="6.7.61.0"
 REL="1"
 
-SRC_URI="https://download2.ebz.epson.net/epsonscan2/common/rpm/x64/epsonscan2-bundle-${EPSONSCAN2_VERSION}.x86_64.rpm.tar.gz"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/14/53/70/1cf9dcea61695151b4ad24ab263179c97179d96a/epsonscan2-bundle-${EPSONSCAN2_VERSION}.x86_64.rpm.tar.gz"
 LICENSE="EPSON"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/media-gfx/epsonscan2/Manifest b/media-gfx/epsonscan2/Manifest
index 3464e07..a4d1555 100644
--- a/media-gfx/epsonscan2/Manifest
+++ b/media-gfx/epsonscan2/Manifest
@@ -1,5 +1,5 @@
 DIST epsonscan2-6.6.42.0-1.src.tar.gz 2448446 BLAKE2B 8fa1718c9e153c9fca1a90e1cce3642e7cf8ae2f7ad95295a24735e6aae3a115f5a0282b5f59227441aef82d1cb05684cac32c018589428883c0bdb0285e4d7b SHA512 ae93d9c1aed6f1a420ad390af9f72ca9c5d28a3735f51df2fbfe23d26ae12ba45bc9a7f42776745a64d97141db2ec61a6fd3699f310d854b0f1e7e5b5cacb195
-DIST epsonscan2-6.7.43.0-1.src.tar.gz 47903544 BLAKE2B b17f241c19e988886261f2991a6a90a0119e85346ee4b83726205321040c7a8957945b9473f67e170aded04a4c42257d8f5cab2607050cb5e8a4ff71c2b73563 SHA512 feee8abdc1efc0cbec3fc0c5442219f47497a714dca210b9c1ac238a23ca1e99a7f5c1ce4f802a2e9c1d604edf9cc37a888381759c4b8cf1598ce76793c604c7
-EBUILD epsonscan2-6.6.42.0.ebuild 1510 BLAKE2B 29a1482b4b3141a1a944ff638d7942d6e3dc017210376b61115238ba00f56584aa4b4fdf1d63ae68e9f4404232cc6bc7655a8eb22bbdace5a4c200aac8ff21c9 SHA512 386df8748d513ccc8b6a018fe2d35f43ea6f13b85048814deb43dcaa2fe0bb1391cf3fe0c5ad032f62f863d319685d286e4464b2f18a0068252565eebdd7b811
-EBUILD epsonscan2-6.7.43.0.ebuild 1556 BLAKE2B 57ecfbf09213d02ca8d77033de9269299d61e7075c8bd8e9f47850ffd86814f14e9460bdcffbae4967b618e20307e6e213bb995bd78f5ddd983529056620aec3 SHA512 9cccb0b3463c1f322ef44e2675e5a889d352eae2ed872ef0e052544557da593a8e072bc17f9a56937fc8f8ba5285cc0dbb6f3d45745c039132770629db1c7ebf
+DIST epsonscan2-6.7.61.0-1.src.tar.gz 2555274 BLAKE2B b3184f9bba0b79b806b35953fadd7d1fdb22855e42ecaf0c3e80fb3fb7c1aeb1638e0bb8fa4e71fe47d17287108286d9bc96e3137d05fdb25578c7d99a272986 SHA512 65f0681402401db32470dc6496dd667fcdbb365cbda9b9d94f67387edfa9e8f8c9747bc77467b39ac08fcaa0d7cd0d35569d61cbae470a329aee318d637bf402
+EBUILD epsonscan2-6.6.42.0.ebuild 1509 BLAKE2B 9df80f6ae83f66f7e660cf01ba3339fa6804950fa95dd3789e45462b0ff8f4531e89a2155315093c37b93f938e4fe4415a75adfe1f146c4ad52723dd1b2db5ed SHA512 f335573a09ed8f111725b45ed96c561a0530e7907d1a00bd2574d04c9b9784e12e15a249d21447c96032d95295f1db1c7a8caa1b552b5c26dd08c80e1ffc3621
+EBUILD epsonscan2-6.7.61.0.ebuild 1578 BLAKE2B 53d2d212c07fe3ba255f8d20fbe89733d22e6968b1bfce65e086540f84c9d2974a76504674156264d8694357f3982b2a3f8a4eb51b897b69b1c58ab662b90588 SHA512 3eaabb78a00937e09f36b0cbdd69c467db11856848ca153bc631756f61447a5a2b889aa188b62d5e148b0e692c63aa70f0b1d2440bcc19d264bf1bd8fd73ddfe
 MISC metadata.xml 787 BLAKE2B 86ad1919846630b77745e19fed9f3cfb9c76b28e3aff3c9709e68c230361226240e4d8101f2bdc6fd5d4b25a283c43bab755eb8c5794d762631cfc6f66e231ac SHA512 545659f051bdc470ea1f988866de2966f1fd812e6b863f7d5851a498d55a25e02208d669b14a7c3e5a79b3d4afde732bbe08818b4236ae4dd02066cdedc8aac6
diff --git a/media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild b/media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild
index 101da7f..48afaa9 100644
--- a/media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild
+++ b/media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild
@@ -15,7 +15,7 @@ inherit cmake desktop udev
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-libs/boost
diff --git a/media-gfx/epsonscan2/epsonscan2-6.7.43.0.ebuild b/media-gfx/epsonscan2/epsonscan2-6.7.61.0.ebuild
index e745295..7e5e03c 100644
--- a/media-gfx/epsonscan2/epsonscan2-6.7.43.0.ebuild
+++ b/media-gfx/epsonscan2/epsonscan2-6.7.61.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-MY_VERSION="${PV}-1"
+MY_PROG="${P}-1"
 
 DESCRIPTION="Epson scanner management utility"
 HOMEPAGE="https://support.epson.net/linux/en/epsonscan2.php"
-SRC_URI="https://support.epson.net/linux/src/scanner/${PN}/${PN}-${MY_VERSION}.src.tar.gz"
-S="${WORKDIR}/${PN}-${MY_VERSION}"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/14/53/67/1a6447b4acc5568dfd970feba0518fabea35bca2/${MY_PROG}.src.tar.gz"
+S="${WORKDIR}/${MY_PROG}"
 
 inherit cmake desktop udev