gentoo resync : 09.07.2022

5 files changed, 109 insertions, 2 deletions

diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 5d239db14661..2d5a4268ad03 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,5 +1,8 @@
+AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff17357ce604cc7e11bf652e180d560cfc1befb2957629a5bb9e46876721fa62d186dd7e0a4dc0e95b74f41a3d5620f9c SHA512 50e15c26fe110d551c350ec11e9fc2309f8dfb26039e824e7d59aa1e5b5250e012397ed30278578524eb579132b0206fae8d5c40f387dd71b93ac7fc261ac2e7
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
-EBUILD libmtp-1.1.19-r1.ebuild 1660 BLAKE2B 49555601ed00630500316f6bdda97adfafb27997531ccd32b22496d97278ee2be8846012f90eba422faf9de2b55b79e68c96713065dbca42fb1353c3fdb3a9f8 SHA512 69b39b58ae37408338f8928b7d8f7ebabc5ead0557963f38e193563fcddf09588b1a15486f9e44816d569068217cad928d09d7d9a11c45eb007ca34a2ae769e1
+DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
+EBUILD libmtp-1.1.19-r2.ebuild 1710 BLAKE2B 94dc2b986f7d2e8c33a40c5b82846508758dfacde64ab2411e3e58d3aac27b1495442fb1813c4c86d900bf012ea67c08c65f0dc8ea9642cf957b3dd9b79b2733 SHA512 230e50ebb1c614f78c04010a424d3bbef1dbc382685e144337312bf38f5a2de6a5b56c0ed8d2aa763cb1479b0a1cb2556252b6d970c9189072acdae750c84786
 EBUILD libmtp-1.1.19.ebuild 1671 BLAKE2B 10bfcb9527fb3590bf8ad6daad17804abe282dfdd8662024029663fddf3101664b7083d282a5e8ee4eb42bb6f3a2e2ca3d018f8a6d7257447500f1d123754d4d SHA512 13aa3c4a74af67858b0a57f5f754dbc1654a9d83e63a29aecf72e1f887106722ae126fd8a9adc434659e966d9dfb5f9d182c0640e921edf17230a2c464b77976
-EBUILD libmtp-9999.ebuild 1642 BLAKE2B 7ecd6d41037949e3d3efd042a50c1407a20f5860afcee37e0f91b2b96cc880155a6d20e64a7b77f929628ab73e03410b656b12920bbc358f87dbc71d94fe2fa7 SHA512 3cb4d3ce86e544e3bb9248c076be25f027a80e0011839b9fdb9446b7c1ab25663e83ed44e5b7054ad7b5c49726faabcdacda409cb7eeea477ba3372142d1be68
+EBUILD libmtp-1.1.20.ebuild 1719 BLAKE2B bf05733a42e02fc5109548e6af9bdbeb9f23d7a35df3031176e525aef7b831ef3792575496f6f1cca1f7bea5293f8f4fd14fd6563d5576f5f96a75bd18ff3c31 SHA512 a596419c6b4e7946cccbfa511c6f2817609ebb7c4d17ec11b6843205fd1abcf2fc618bbbfb5672f01ef0a67d8399deb98b67fa47012c52ddf908210b4a93247e
+EBUILD libmtp-9999.ebuild 1661 BLAKE2B a69293877e373fefde0c6fb420dbb66c1fb805624e22a547eee2f541f43fb4ba1756fa1e062829e01683aea13d3bd97efccb320f349b3c94e51de01ba665f298 SHA512 b942f7eb68588be410d8b949060255199e0d2601e11a7e92060d0a00bc92c9e09411caa978a6d939ffecdd6f7412600bedff0e1e7cf29540d8d4cd1e9c5a028e
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch b/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch
new file mode 100644
index 000000000000..25450079d203
--- /dev/null
+++ b/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index fede3e0..d801a47 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -256,7 +256,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Doxyfile.in examples.h mainpage.h
+-@HAVE_DOXYGEN_TRUE@pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++@HAVE_DOXYGEN_TRUE@pkgdocdir = $(docdir)
+ @HAVE_DOXYGEN_TRUE@htmldocdir = $(pkgdocdir)/html
+ all: all-am
+ 
diff --git a/media-libs/libmtp/libmtp-1.1.19-r1.ebuild b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
index bf1575d7a256..fd347a6888d2 100644
--- a/media-libs/libmtp/libmtp-1.1.19-r1.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 
 DOCS=( AUTHORS README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-docdir.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild
new file mode 100644
index 000000000000..5e6a85f46c71
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.20.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.19-fix-docdir.patch"
+)
+
+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
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index d0c62a952673..ab7478bda189 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -22,6 +22,7 @@ IUSE="+crypt doc examples static-libs"
 
 RDEPEND="
 	acct-group/plugdev
+	virtual/libiconv
 	virtual/libusb:1
 	crypt? ( dev-libs/libgcrypt:0= )"
 DEPEND="${RDEPEND}"
@@ -57,6 +58,7 @@ src_configure() {
 		--with-udev-group=plugdev
 		--with-udev-mode=0660
 	)
+
 	econf "${myeconfargs[@]}"
 }