gentoo resync : 28.04.2021

5 files changed, 31 insertions, 77 deletions

diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 14b8cdc36a0d..325ac41370f3 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -1,9 +1,6 @@
-DIST usbredir-0.7.1.tar.bz2 329895 BLAKE2B 7017b1441c2265c9e58532bcc8718844e6f64c7272ad599a8cf5f6e21f694524e05da2d8672c4892faa7b744be46bdfff521dbcb4944715d45b24d5925972ac4 SHA512 f8d26d59d5a530aa413fabe2402fbbd9662760453c2b4e83d34f2e5287c188114ea870f15ae1bc910297649986315be965f0d23d0a2b7b0cec2f207fc65d7598
-DIST usbredir-0.7.1_p20170503-patches.tar.xz 8120 BLAKE2B 21c7a853b3d5329fcca45169e22135bce615c9422f314f680f1087014d64179bf26f07bdb377bcff48155f28a37dec82b0bee8bce4d868e41614b128fe61b95a SHA512 b281d7a1ee191746e5fbe655b21c0cd9b2cf9cd69d5f28d91ab41de2d62a7f3c5c2a42f3f9c40c73d61a57d89423d996f4a779ebdff8f9d088030c2a4c2a24a7
-DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a0cc2f6651a32c8a618756638ae04928dda7082214d501fb5122a0f5d02aca994be0a386a8e493628faa240f61987dbd02d2fcfa679a SHA512 993c7ad5faf66f249546e1a631a10cd842439486de029ed2fff049b70967cb0a6ad45fb773a1c97fd6811e246f4cc4c7482522393dcc74b26ba2646a83ac70c8
 DIST usbredir-0.8.0.tar.bz2 331349 BLAKE2B 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b SHA512 976274adf08f8691b0961f5238021e988a4347873d0c67576038f44cbdaf25c2bb325d8cede0a507933b719f9715b1508ccd1d8f52fccd36f13a7640553dc108
-EBUILD usbredir-0.7.1_p20170503.ebuild 1003 BLAKE2B bb0837a9d6c069743bea46321fa5381cec6e0ecdab4d3cfa0a4a745a7ef0b388f399e6d4cfebc1d1a50a72e888360ef05edd7692d7ada755375973a3e60d75c5 SHA512 b8ec95d79b4761d79bde59f077057a33747c050df4388bcd94f8101afa288220be67ddb0d242cdadc897fb3e686685cba04e8a1c7b4c6f6d245a84d625a0c2ba
-EBUILD usbredir-0.7.1_p20180211.ebuild 1015 BLAKE2B 414cbca6d217eff50399838c4ecf2347cf21d9dd1e0db647f3226e29ef310acb23cebbf0cb070c04b576d24bc1319fdcb8287ad5d4dd844a966e37a41bbbf31f SHA512 9c0677daf7aad198167007d60b271af0a94f9d92315b2f3b9f0d1b2fa20c0a2960db10d6d4b10a07c73e3a9efc8d5843b06eed05d6a8a89d65882f2ae8f41d98
-EBUILD usbredir-0.8.0.ebuild 920 BLAKE2B 311afcb7250e8710026222309b4e5bfbe8cf2fa0e2d26f57c63ef882ae8b05137cbdab4594cb3afd5649d805ae302f8cb4cb17e3ffe4a1011da67c04759fc7fe SHA512 427f8d66cd133c2532512f3d1213cc2719214b0b6eea829ab3406996a4d87e84d29e5939601b20c5e93eac59098e40882907feec910a308fca9b3277df9a9555
-EBUILD usbredir-9999.ebuild 852 BLAKE2B e6a96cc5978957733801a69c92d4b47f39ddf81415bea571f88eb2c18e8b8f6a90af63f2cdc21c8d16112eecd941a997b8b5c70ade8fc17ab41cf5b94335ac9b SHA512 34ea35e062d41cce07d9985b3ffa6a0e666d1794f9cf964ed962eb809c9ae7da013d4e93bae501f3eabbe2e44c302e35e7c6ff0fb20309060caac6c9a1e7a54b
+DIST usbredir-0.9.0.tar.bz2 72498 BLAKE2B 857b83795ac082d412b2872a4ca06b1602d556698f3217379698e8b1f54edd09b012600069045ff0f7583703253853998b900f34d861a538047783510b3fb2e9 SHA512 5df62fb6e49161be974776c86f026a58322ccf1c1964447958707408492c02175100ead9dc4a7e77bb7a9112a33b91461d64761425e7aee7d44c71ff6913588a
+EBUILD usbredir-0.8.0.ebuild 923 BLAKE2B 580602ef4cf7f46fe0ab508c1c3a53262e0f2eeb7bb9e72dcfa53e48756daff7775c19f7e402bc6f536f8cf05ca75995b954c1f0f5d6b0423e4320fbf57e3cac SHA512 718d4916a441bf6a2a2d83988666e5217a1c310069444096011a02f63c3e0bd596045bcad908f216d2ae2471d4991d0f8122a608a9119c548584677c441d437a
+EBUILD usbredir-0.9.0.ebuild 997 BLAKE2B c33a126d7aa4bffe010730c63f63385aa1859ac3098e5219641cee9681556354fcad1b19a5ebaa055d2a4f1bd08bda847ef3502998a211c4985abff8eb2394af SHA512 11c1373bf9ebf3df076688b65026552dfe9e0c4596b39b5aec0ae0a7b718628768c82eb8fed6b8cfecb16b88f74682e808d45d7ff301aba6756ebd37e7b81a42
+EBUILD usbredir-9999.ebuild 850 BLAKE2B b01f925aea22d8f2e288a5e4fd8a093409f7370d2b6399add5df799de1af24694dde48dc971579c108917860773bf715e419a806e7e3e5db7684d694182e4f06 SHA512 47a51143cd9587b0aa280792375fd8329b547d434245ee4cde3187f06750521c1d1e9cd2d2e3e56c3c1229fc9ee9a4ef15f45720b55f668332c04f3691eab25d
 MISC metadata.xml 381 BLAKE2B 63160ad268e74a23031e19d54e171504f751e2337e6dc059215942052518e09e945796ec6522828eee63fc872be396f9f47f85a8b1ad970904f764e7e5a222a7 SHA512 a4363c96453be6c53dff19c47739440d00f03b7994a2c993f9be0608f2a1b7a4ac8e9178a4784a74dd51b97cd0de37cf0aad209041f2b03c65864b2798f9684a
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
deleted file mode 100644
index 5b382fb4c5c0..000000000000
--- a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic ltprune
-
-MY_PV=${PV/_p*/}
-
-DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
-HOMEPAGE="https://www.spice-space.org/usbredir.html"
-SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${S}_p20170503-patches"
-)
-
-DOCS="ChangeLog README* TODO *.txt"
-
-src_configure() {
-	# https://bugs.freedesktop.org/show_bug.cgi?id=54643
-	append-cflags -Wno-error
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	# noinst_PROGRAMS
-	dobin usbredirtestclient/usbredirtestclient
-}
diff --git a/sys-apps/usbredir/usbredir-0.8.0.ebuild b/sys-apps/usbredir/usbredir-0.8.0.ebuild
index a62437dc2019..66e49f807dfa 100644
--- a/sys-apps/usbredir/usbredir-0.8.0.ebuild
+++ b/sys-apps/usbredir/usbredir-0.8.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic
+
+inherit flag-o-matic
 
 MY_PV=${PV/_p*/}
 
@@ -16,8 +17,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild b/sys-apps/usbredir/usbredir-0.9.0.ebuild
index c939b6bf7ee3..73cd0c9866b9 100644
--- a/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild
+++ b/sys-apps/usbredir/usbredir-0.9.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic ltprune
+EAPI=7
+
+inherit autotools flag-o-matic
 
 MY_PV=${PV/_p*/}
 
 DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="https://www.spice-space.org/usbredir.html"
-SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz"
+SRC_URI="https://gitlab.freedesktop.org/spice/${PN}/-/archive/${P}/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -17,16 +17,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 
-PATCHES=(
-	"${S}_p20180211-patches"
-)
+DOCS="README* TODO *.txt"
 
-DOCS="ChangeLog README* TODO *.txt"
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	# https://bugs.freedesktop.org/show_bug.cgi?id=54643
@@ -37,7 +38,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	# noinst_PROGRAMS
 	dobin usbredirtestclient/.libs/usbredirtestclient
diff --git a/sys-apps/usbredir/usbredir-9999.ebuild b/sys-apps/usbredir/usbredir-9999.ebuild
index 86a0a057b70d..c673028d9e2d 100644
--- a/sys-apps/usbredir/usbredir-9999.ebuild
+++ b/sys-apps/usbredir/usbredir-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic autotools git-r3 ltprune
+inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="https://www.spice-space.org/usbredir.html"
@@ -11,14 +11,13 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/usbredir.git"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS="ChangeLog README* TODO *.txt"
+DOCS="README* TODO *.txt"
 
 src_prepare() {
 	default
@@ -34,8 +33,8 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	# noinst_PROGRAMS
-	dobin usbredirtestclient/usbredirtestclient
+	dobin usbredirtestclient/.libs/usbredirtestclient
 }