gentoo resync : 23.09.2020

5 files changed, 2 insertions, 100 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 6e6d88947be9..1d686401b4ec 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index 1c85dc738b64..e4f0c9be28cf 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -2,5 +2,4 @@ AUX gtkpod-2.1.3-gold.patch 451 BLAKE2B 2f0202782394abc636265fbf9d13dade3d28608b
 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-r1.ebuild 2798 BLAKE2B a642130505b4fa7b3c2d98ec3afc695e824106cde777b3120afc57ef679f4563d2850111b7c7eb7fec40e3586b127332ae22932d7e94909dfc66a4c9bca327f9 SHA512 f8516c42146735c682d6e21eaa92fb6eda70690f4430c27625a17ec4b7f2822a530f2a576172d1ec7cd07faf7f2a92c6745ec26b7c77ccb80bd3d87ed0d7d735
-EBUILD gtkpod-2.1.5.ebuild 2240 BLAKE2B 52ac88288ad8a45d366a1ca305691405155aa3670a6458d63d88ac461dc9d46965959bf317ea863b723f4bcaaedafde143b0fb9e18e88f45e582650d8aa081d7 SHA512 5619e8def4900659558842cecbd8017cbf21d1c0d402ce116e5350915fcd17f189cc4aefa7e80df0185998138cd21eb230746d37cf25ff2fa7ba09782e5f3eca
 MISC metadata.xml 335 BLAKE2B eb5370d6ed11cddddb74642e42a2bbb70d74d7e45b1dc228be2febc3cd3a1e6d0344e96bc94a3417b0c6c6cd67e5658fc8b06a53106ad746db92f48f70d47d31 SHA512 97aa0c82eebf5b63b8f3de0ea32f3f51eed2ebb2ba37a90a60759ffd7caf20ce90235851cdbf05fb5d45e3a0d35e1c062fb92e10cf10285c42e5ff20657ff061
diff --git a/app-pda/gtkpod/gtkpod-2.1.5.ebuild b/app-pda/gtkpod/gtkpod-2.1.5.ebuild
deleted file mode 100644
index 3e412ebd2564..000000000000
--- a/app-pda/gtkpod/gtkpod-2.1.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A graphical user interface to the Apple productline"
-HOMEPAGE="http://www.gtkpod.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis"
-REQUIRED_USE="cdr? ( gstreamer )"
-
-COMMON_DEPEND="
-	>=dev-libs/gdl-3.6:3
-	>=dev-libs/glib-2.31:2
-	>=dev-libs/libxml2-2.7.7:2
-	>=dev-util/anjuta-3.6
-	>=media-libs/libgpod-0.8.2:=
-	>=media-libs/libid3tag-0.15
-	>=x11-libs/gtk+-3.0.8:3
-	aac? ( media-libs/faad2 )
-	clutter? ( >=media-libs/clutter-gtk-1.2:1.0 )
-	curl? ( >=net-misc/curl-7.10 )
-	flac? ( media-libs/flac )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		cdr? (
-			>=app-cdr/brasero-3
-			>=media-libs/libdiscid-0.2.2
-			media-libs/musicbrainz:5
-			)
-		)
-	mp3? ( media-sound/lame )
-	vorbis? (
-		media-libs/libvorbis
-		media-sound/vorbis-tools
-		)
-"
-
-# to pull in at least -flac and -vorbis plugins , but others at the same time
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.3-gold.patch
-	epatch "${FILESDIR}"/${PN}-2.1.5-m4a.patch
-
-	sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #420279
-	addpredict /dev
-
-	gnome2_src_configure \
-		--enable-deprecations \
-		--disable-static \
-		--disable-plugin-coverweb \
-		$(use_enable clutter plugin-clarity) \
-		$(use_enable gstreamer plugin-media-player) \
-		$(use_enable cdr plugin-sjcd) \
-		$(use_with curl) \
-		$(use_with vorbis ogg) \
-		$(use_with flac) \
-		$(use_with aac mp4)
-}
-
-src_install() {
-	gnome2_src_install \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/html \
-		figuresdir=/usr/share/doc/${PF}/html/figures \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
-	rm -f "${ED}"/usr/share/gtkpod/data/{AUTHORS,COPYING} || die
-}
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index b427e1cfac93..90d1d1bae354 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -2,5 +2,5 @@ AUX pilot-link-0.12.5-Werror-args.patch 851 BLAKE2B 4f011a10975b9ba1a2fe29e282ae
 DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d
 DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868
 EBUILD pilot-link-0.12.5-r2.ebuild 3074 BLAKE2B 262f8a5972dde1f3f8e3835926aad69553b8b63dd6a2a1cb352e1ac650df228044a4823e6ea0558d5527c5199c8aba2cd8e9977a04ad66001c7bc60b04fb1d12 SHA512 c408dcd0478bd70f7e5dc32f51c08699e00bf3069288ec8c70de9cef01105fbd2adc56d1e4bee75b25f41483bcf4d933db87a14b5cfed5c2dbc0c69bb57a8533
-EBUILD pilot-link-0.12.5-r3.ebuild 2994 BLAKE2B df8c33e816eeac059be78d2fecb0ef6aa87880712886fc191e7029058ba37f7e250a92d35e22637558bbfa868dc2b1400246e05cdd34b70ea037e2d95e30a348 SHA512 4820827674f08866552569016016bc67d0bd1adbf111842e54a140edab357bda323ecf0f44048abea0ebf01cb552f59ffa81b5819badd8b0c689c43d0f91946d
+EBUILD pilot-link-0.12.5-r3.ebuild 2993 BLAKE2B 14035339f84410bea5bce1bd0b86ff35283cee3166e173b5b54201b0838242eec73aa5b0f1da16185f91b26bb4e9a6e575adeed4a3d2fd72f7231ed60620f108 SHA512 e5cea6fda5fc2ac4912a8f19a596c5b4729dcdae1c40b8d70761eab1c2b9c54401451aff58f1f270459a9b1013cd7be4dc4f36fce0f7c65f8c549d3b74632cb2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
index f28d43f7d288..6e88956efa7f 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bluetooth debug perl png static-libs threads usb"
 
 COMMON_DEPEND="