gentoo resync : 12.05.2022

6 files changed, 8 insertions, 54 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 6daa56d1c4ee..ea5e9f23096b 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index ce9e8beb639c..aa576b0428f5 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,5 +1,5 @@
 AUX gtkpod-2.1.3-gold.patch 451 BLAKE2B 2f0202782394abc636265fbf9d13dade3d28608bec3bc8298ae1ea592a4f34688ba4be227aead6c4cfa8a946dbe872dbb5d596fd728e18e27166a01b524e6c00 SHA512 b6fb32ce37087beed99c475f747a6c79541821d836892ab4b8673ec49ca0a72ca6d55aaeaf8cf25895cc8e4f54341673e0f5616c5fa5ebc610250c641f4a2b13
 AUX gtkpod-2.1.5-m4a.patch 405 BLAKE2B 0102cecc598c7594dc545f9142fb152e601db8a793b80acb4ce92a7594bb6902cfb19f90612a169585c42daa6827046f257cab76db7be69534b0e7c79f14d75a SHA512 d7774f82d5a30c393354da9302f4cd62eb2c9c0588bb6afcc1429850730f727db91bd200c78934e9a3a64a112a11a51d62d7bfb3a17f74c77e259ebb126037a4
 DIST gtkpod-2.1.5.tar.gz 3780232 BLAKE2B 8de431ed04b1f9d85322d7d1c823f7ace08511616f81a3030dbebe455f71e7f130944173c1fde6e27aceec2cd71a7f731fa00ea574ef201bf48ef6100f3bf82c SHA512 428b9ce75d2c7c208a847bee6f10f6ed0c9f896efbedd86ed41ecce64fdbf1b937968042ad9945aec33a714fc3031427a54f924619db99cc111945355978f24c
-EBUILD gtkpod-2.1.5-r3.ebuild 2795 BLAKE2B 87d5112a7b66dc54eb55a304a57b2672c45023ee7ff7dafc9b5226f55ffdf30ea6be7df40107121d82de8ab6ee181f798b46077bc6d68ffd5fa9f0c5c9d70b51 SHA512 95f6a22cd42e0da60228adac63353bd8db99169547bd082aa7405e6d05132b0668ab559e9fa2a6ef141c495c6f96e9c9f3995553c601dbd7c2d38043f73d366b
-MISC metadata.xml 336 BLAKE2B a98e4f3d0b8408f9e5b5238ed5e008f9e83d201f620686176e1469f125a948bbffdc94a15da1a02b86b6e285b3bffd0056b8c071a9d15e3b8230f0f585eda5de SHA512 026f059733ab8fb71c832b5fda2df3c0e48a4f1d84dd5107d55b8d4301c4a2611ecb987b2bec7f268278fce0c5679f7396dc0a138691347807a5b030a4c3289e
+EBUILD gtkpod-2.1.5-r3.ebuild 2797 BLAKE2B 729d5b8e0d5cad599b00e1242d4ca10e1348254409ce2827944df3cef24bc6601ddf2e0990a8094d9b2444e17429091138cc83a651c3fb537158db1e1bc45c98 SHA512 c70fc988c49e2b157504d81d7c12652fc79c11f8717278f83d9f77a1d06b35d02cbed2f381aee2b67ba770ec1df36fb8dc9021cef32e58657248a87b07a0957a
+MISC metadata.xml 416 BLAKE2B 9119062713110232b63f2da3b4a43791cb6c14548a56c0446940976e540ee6001292125cb745ca6d18830dc02d59205080fc76b95b83b5d31850eb9d9d902795 SHA512 d3519f4df4f020f72b1871976f1c2377e95a32a0ada1b6b53d41e22ac544c9c43a473e3cc9a0d9c00e7a219be3630c3310e530f76607d44cb6a423bc72ddd16c
diff --git a/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild b/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild
index 1289ab37de7a..45b1dfe68c6f 100644
--- a/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis"
 REQUIRED_USE="cdr? ( gstreamer )"
diff --git a/app-pda/gtkpod/metadata.xml b/app-pda/gtkpod/metadata.xml
index f606dff213fb..64a6166579d0 100644
--- a/app-pda/gtkpod/metadata.xml
+++ b/app-pda/gtkpod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
 	<use>
 		<flag name="clutter">Enable clutter support for displaying coverart</flag>
 	</use>
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index 2d8bd6253f21..9de99e785983 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,3 @@
 DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
-DIST usbmuxd-1.1.1_pre20200121.tar.bz2 51859 BLAKE2B 339d53904f7484bebb6d7524313ee065bf5a244efab16c77b30b8932071012105f21aa56083d82667b06088af83464ea8c86e3c28c5a45cb9abbe574a634533e SHA512 cc113b054e8e04d228af740ec43d2dbf29c015dc9d8e1cdd0eaf84bfcaa9838d5b1bf6db2efed30ffb84c35c88db5469983a115ffdbddbb6acd0df9fd2a5182f
 EBUILD usbmuxd-1.1.1.ebuild 892 BLAKE2B 97674b0eead116f41b38997b09da6786ad04f70287ceeee24d9b3c4330f44c8cd522da56b5647194fba7077de952184b501dfcbab3873f20a1f15a9761362c15 SHA512 a18e3c77ecc6a580984160b8c668cfc1d876c6a6cfdbb5bc32bfb705858eb3405327a420eecaddc878776b8b0118b4403c8e1419a66644e485553ab1844ddaef
-EBUILD usbmuxd-1.1.1_pre20200121.ebuild 999 BLAKE2B 2ee05606bfec58b686d5c9391b0374e2a525614bb94ba239b04517032da709c58f3eb51b5fd906db68d059c56f6604d8a91fed43aeda88984ff5d754ca2c7848 SHA512 d7149fa395b79a097eaeb8db5cd68cdbbb42a792b6be2e1ec513232aee7be2eac1ac426b9db10eaed66b6a7360c27c04f52e8d370474eb3279d8cc7c95f9c18f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
deleted file mode 100644
index 0451b37d3617..000000000000
--- a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="8a69f1a78a58476f77b66916091d2405d0cd815f"
-
-inherit autotools systemd udev
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/usbmuxd.git/snapshot/usbmuxd-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-
-# src/utils.h is LGPL-2.1+, rest is found in COPYING*
-LICENSE="GPL-2 GPL-3 LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="systemd"
-
-DEPEND="
-	acct-user/usbmux
-	>=app-pda/libimobiledevice-1.2.1_pre0:=
-	>=app-pda/libplist-1.11:=
-	virtual/libusb:1"
-
-RDEPEND="
-	${DEPEND}
-	virtual/udev
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with systemd) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-}