gentoo resync : 29.12.2022

4 files changed, 104 insertions, 7 deletions

diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index a0ac2ef01320..5d239db14661 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,4 +1,5 @@
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
-EBUILD libmtp-1.1.19.ebuild 1607 BLAKE2B 9d275d6310114815fb4ce70d8dd66b22f2b407c9c87f7cc5182b8e1ec6b118e0b74b00cb19baba62c343628d9e915e410600da349116917074577404931ee911 SHA512 d6cc193aaca037be02340f185ea6b01e98399299a9a0710b033144f2489063f9856ccf7b7b122cf3cd4a5214d7dddc09e9d7c1be5699483f9f31531538c7683a
-EBUILD libmtp-9999.ebuild 1594 BLAKE2B b539573f2e7c95d5d3622515e7f37baec057ee64be4468129484382b33e70d9b66028a5460ff2920b15fc3a2016b6c6def1d83223855448d3071493fd0eac439 SHA512 402e201946ce11315c5d366f03835a969f2b7b91e7c35f8eaf2920042b19abe104c097e1521454f31b37884c9af244829e4e9f6e765775f0dc4b7eb38cc884a1
+EBUILD libmtp-1.1.19-r1.ebuild 1660 BLAKE2B 49555601ed00630500316f6bdda97adfafb27997531ccd32b22496d97278ee2be8846012f90eba422faf9de2b55b79e68c96713065dbca42fb1353c3fdb3a9f8 SHA512 69b39b58ae37408338f8928b7d8f7ebabc5ead0557963f38e193563fcddf09588b1a15486f9e44816d569068217cad928d09d7d9a11c45eb007ca34a2ae769e1
+EBUILD libmtp-1.1.19.ebuild 1671 BLAKE2B 10bfcb9527fb3590bf8ad6daad17804abe282dfdd8662024029663fddf3101664b7083d282a5e8ee4eb42bb6f3a2e2ca3d018f8a6d7257447500f1d123754d4d SHA512 13aa3c4a74af67858b0a57f5f754dbc1654a9d83e63a29aecf72e1f887106722ae126fd8a9adc434659e966d9dfb5f9d182c0640e921edf17230a2c464b77976
+EBUILD libmtp-9999.ebuild 1642 BLAKE2B 7ecd6d41037949e3d3efd042a50c1407a20f5860afcee37e0f91b2b96cc880155a6d20e64a7b77f929628ab73e03410b656b12920bbc358f87dbc71d94fe2fa7 SHA512 3cb4d3ce86e544e3bb9248c076be25f027a80e0011839b9fdb9446b7c1ab25663e83ed44e5b7054ad7b5c49726faabcdacda409cb7eeea477ba3372142d1be68
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.19-r1.ebuild b/media-libs/libmtp/libmtp-1.1.19-r1.ebuild
new file mode 100644
index 000000000000..bf1575d7a256
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.19-r1.ebuild
@@ -0,0 +1,80 @@
+# 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 )
+
+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-1.1.19.ebuild b/media-libs/libmtp/libmtp-1.1.19.ebuild
index a4a77ee37e47..cb54789a908f 100644
--- a/media-libs/libmtp/libmtp-1.1.19.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19.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
@@ -70,3 +70,11 @@ src_install() {
 		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 b95cfed9a95a..d0c62a952673 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit udev
 
@@ -23,10 +23,10 @@ IUSE="+crypt doc examples static-libs"
 RDEPEND="
 	acct-group/plugdev
 	virtual/libusb:1
-	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
+	crypt? ( dev-libs/libgcrypt:0= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>sys-devel/gettext-0.18.3
+	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
@@ -69,3 +69,11 @@ src_install() {
 		dodoc examples/*.{c,h,sh}
 	fi
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}