gentoo new year resync : 01.01.2021

4 files changed, 79 insertions, 4 deletions

diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 7f735b348b02..bd67f749fd02 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,8 @@
 DIST libmtp-1.1.16.tar.gz 820516 BLAKE2B debc0755b91f44a878c4a5d4eb8d23c92ac17a80cf59ca13ada80bc1884ee7ab771153252258e33c834aba718a064d9e9a1b4618b3e0abe81bbffdfc7e5a2c88 SHA512 0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0
 DIST libmtp-1.1.17.tar.gz 829529 BLAKE2B 7e7393aaf0e988029382d30e260d651ad1166a89a2af32a3da544cdb85eeec1a026eaa40d131096eaec0686b92c4e25663ec5cfbe3916a522ebafd38f107744e SHA512 f2648e259529bd3dfe74a7049a79c4b0042bcaf63cc1fec8b232b66312d62e9620280e4f725312c9ef8207f1f1ceac19f460a0a8772a3cc6c7f0b00ead01add2
+DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
 EBUILD libmtp-1.1.16.ebuild 1582 BLAKE2B adbb02fde31badb613d08a69909160eecf1ed440421227b0234f529255a12ce9e699d16e12517f66b9a686c78f5dbe1c56055e4ee2794d51f1cc68398a72917d SHA512 dea94b3ab47e7ce227a550a3fb2f895dd5c46e54107b0bc1e58eb3fd965d8aafe7a4fc5bb2f7e48761b12a8d8cafcac44ef4784c6624093d21f111e26b012b89
-EBUILD libmtp-1.1.17.ebuild 1587 BLAKE2B e76c9874b13d9681d48b48237de230b642133a8948fd0e8ae380f197bcfd8f84b29f960d4785ea56000c8b85b1c22e41ef8bfe9c21907a2bc75289c50ea92d29 SHA512 28c04af5d34ac81e2ce4e3d5874c7c71d0579f29890cd0b0221381bdc62cb94e770dda5b3553890d9eaf68b29618abed509e404050bebdae078e262e500316be
+EBUILD libmtp-1.1.17.ebuild 1586 BLAKE2B b8e136b01d8032154eee23d6e3e1a880bb7468b65e58cd260bc8bf2b67493a7530853132152b1e247a64a764f9c7b218ee07278d9c3e0c007abba84817ad8c75 SHA512 cf7a132424e4e3e9322fef50414fe3559219d30a69a6736d279c9d0f01c27c4b6f80a493720c86e926d3559a137eaef954d3f43dda4c269ac7df19f558c6e673
+EBUILD libmtp-1.1.18.ebuild 1605 BLAKE2B 5323e0b427108d356bd879a991f4e6d03c897d4fdff985c22ffccebd458a81c69a2492d69592f28774aac82540cb0999cd12061558592d16eac7685a84597cd4 SHA512 63a027b8b143608dbe555369d131798b5b7298f49d814265b5499af15bfaca8ebb860399fda2e8366e57793bab00ea6db5a2a842ce3741134d9fe25952914c43
 EBUILD libmtp-9999.ebuild 1587 BLAKE2B db65f8bbe716f8ecc2b2700c56b430fe239230e2950acca1f6f732d3d92c25e2f2d8a77f55735ece0b31075b1e131d9704f39d1e5865ff60de6edd37791c8218 SHA512 c35a6b0fc775992d78b84e6028c6480e7744e400b1543c25f64936c4b46816aa63104f82602e00f7af25705e9d7832b7f049a36ea6edc739e672ad57649a837c
-MISC metadata.xml 394 BLAKE2B bf7cc1e63c4f81e160cdb34f21a1c9412f917c3183d3728da53c11830413ccc23c835d13798fd4c09d5b9d5424d8e711f13a0d3dd39acea3e5370dd26beca355 SHA512 48695d6eda543de340c36dc778647b753cce9000fde558de1932cf8a0533266d2300993c605d2d340c96f665e4782f62aefca45390322c1614a9dbdcbab44e35
+MISC metadata.xml 447 BLAKE2B 93dc7722951975ded85fabe8f53c75317b6981561f8848ff52ffa277a93b31ed626e9c97fbce4ce62d40fc186f473059cc036398f218abaecf692e0683e2f439 SHA512 4ddbe48062ced53c6ce5473a837e449251933ae248d04c14c2008d35ce8f290bfcef67aeb31a9d29e53bb54377df5043e89c98ea2744896c1f106785e3b4c212
diff --git a/media-libs/libmtp/libmtp-1.1.17.ebuild b/media-libs/libmtp/libmtp-1.1.17.ebuild
index 6bd41c26145b..073a0c5cf71c 100644
--- a/media-libs/libmtp/libmtp-1.1.17.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libmtp/libmtp-1.1.18.ebuild b/media-libs/libmtp/libmtp-1.1.18.ebuild
new file mode 100644
index 000000000000..e9755bfc4201
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.18.ebuild
@@ -0,0 +1,72 @@
+# 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 ~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/metadata.xml b/media-libs/libmtp/metadata.xml
index 7b15a68479f9..18b68008be9b 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libmtp_project:libmtp</remote-id>
+		<remote-id type="github">libmtp/libmtp</remote-id>
 		<remote-id type="sourceforge">libmtp</remote-id>
 	</upstream>
 </pkgmetadata>