gentoo resync : 30.10.2021

3 files changed, 2 insertions, 76 deletions

diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 87514f59fc53..a0ac2ef01320 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,4 @@
-DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
-EBUILD libmtp-1.1.18.ebuild 1607 BLAKE2B 9d275d6310114815fb4ce70d8dd66b22f2b407c9c87f7cc5182b8e1ec6b118e0b74b00cb19baba62c343628d9e915e410600da349116917074577404931ee911 SHA512 d6cc193aaca037be02340f185ea6b01e98399299a9a0710b033144f2489063f9856ccf7b7b122cf3cd4a5214d7dddc09e9d7c1be5699483f9f31531538c7683a
-EBUILD libmtp-1.1.19.ebuild 1610 BLAKE2B 1bfe9ca9529d75106b2b141c7a4e22c89cfd7d2d291450710eb7e14a8af641eac1a7dde2cdbc5313ea3a03f3706dc321c32a2eeb4c3bf746f7e78fc1ed89f46a SHA512 3602c10bcc2934aedae5533a66f3afe7df04f0a8790edba25c11a6de6b4f36e3e2b7c8b6d06574505c28570a066b1ef29decb43c0056a0b7e20964920fa6258e
+EBUILD libmtp-1.1.19.ebuild 1607 BLAKE2B 9d275d6310114815fb4ce70d8dd66b22f2b407c9c87f7cc5182b8e1ec6b118e0b74b00cb19baba62c343628d9e915e410600da349116917074577404931ee911 SHA512 d6cc193aaca037be02340f185ea6b01e98399299a9a0710b033144f2489063f9856ccf7b7b122cf3cd4a5214d7dddc09e9d7c1be5699483f9f31531538c7683a
 EBUILD libmtp-9999.ebuild 1594 BLAKE2B b539573f2e7c95d5d3622515e7f37baec057ee64be4468129484382b33e70d9b66028a5460ff2920b15fc3a2016b6c6def1d83223855448d3071493fd0eac439 SHA512 402e201946ce11315c5d366f03835a969f2b7b91e7c35f8eaf2920042b19abe104c097e1521454f31b37884c9af244829e4e9f6e765775f0dc4b7eb38cc884a1
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.18.ebuild b/media-libs/libmtp/libmtp-1.1.18.ebuild
deleted file mode 100644
index a4a77ee37e47..000000000000
--- a/media-libs/libmtp/libmtp-1.1.18.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="
-	acct-group/plugdev
-	virtual/libiconv
-	virtual/libusb:1
-	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	default
-
-	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
-	rm ChangeLog || die
-
-	if [[ ${PV} == 9999* ]]; then
-		if [[ -e /usr/share/gettext/config.rpath ]]; then
-			cp /usr/share/gettext/config.rpath . || die
-		else
-			touch config.rpath || die # This is from upstream autogen.sh
-		fi
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable crypt mtpz)
-		$(use_enable doc doxygen)
-		$(use_enable static-libs static)
-		--with-udev="$(get_udevdir)"
-		--with-udev-group=plugdev
-		--with-udev-mode=0660
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-1.1.19.ebuild b/media-libs/libmtp/libmtp-1.1.19.ebuild
index ce44f968a49b..a4a77ee37e47 100644
--- a/media-libs/libmtp/libmtp-1.1.19.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"