gentoo auto-resync : 08:10:2023 - 18:03:40

7 files changed, 125 insertions, 3 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index f6f628ab7913..912a86f169d4 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index a76b8c1d5831..f9f536b875ef 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -4,4 +4,5 @@ AUX libimobiledevice-1.3.0-slibtool.patch 5477 BLAKE2B 963072a0e577c52a2434d011b
 DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
 EBUILD libimobiledevice-1.3.0-r1.ebuild 2580 BLAKE2B 483dfa764ca3b9ad7f2d57d3c1b37cbcc343f66fbc2c6d2e203c00d0bb9bdd17e0f886218280efe99fbf91e3034ea6a004feff38193fa5cae2cd60c940ae2aad SHA512 9daf6f8d12da723b82cf823e4696ff21cb158af7f749737c21abb3d953415eda79d7f36f08b5d598b145a72eac9b5f706dd698a868e7ff9a95a67a4f8c2ea898
 EBUILD libimobiledevice-1.3.0-r2.ebuild 2614 BLAKE2B da5b7dd32f7b3a1c1d3e1e2f0c0c9e6a2a8441240a42cdf6b44b7745d1388ff55c3b2b39a51d4ad2496afe107cc5cdfc8717f87e942a6e859f96cc77ce07bd3e SHA512 72b7bae22b3e481f723c72333b21bd31c0f61f16042b37ff5bfb443fde7ad2b0aca8948cf32e2a97bba2f8bddd43f83600e084368c747902cd7128793259d336
+EBUILD libimobiledevice-1.3.0-r3.ebuild 2639 BLAKE2B 5aaee8aa5a2635ea6bfaa8da54dce9fa9dee51a5f744e70e66c44d001516a16889fee353af3038f8c7b559334e2a18df73f8f87529b343812f74b51923e39b46 SHA512 3f1dbc9f9ca369af079a5d486307527584d17739103cef05eb084be78ecfbd4004d767b36c2786642c7fd0ace8cf0c3c198f3a849020ffecabf1b9e6bb472880
 MISC metadata.xml 346 BLAKE2B 5979763c0edb5ba8ea839769460571c50fff06027fa402e66b8f6927179e8898bde50732d847e775683b065eae274afa900b7a9ca6643ad98b4362fb9ec1385f SHA512 6252917ccb0280baea04596905530e2a37e364dfab87281987d9e8369e3fadc7eedded779d50bce6c0f2a39a9d224641c69bbc668f41765ff6f453bee4ea050b
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r3.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..47b0b4f1185d
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/${PV}/${P}.tar.bz2"
+
+# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc gnutls python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=app-pda/libplist-2.2.0:= <app-pda/libplist-2.3
+	>=app-pda/libusbmuxd-2.0.2:=
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0
+	)
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	python? (
+		${PYTHON_DEPS}
+		app-pda/libplist[python(-),${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+# <cython-3 for bug #898666
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	python? ( <dev-python/cython-3[${PYTHON_USEDEP}] )
+"
+
+BUILD_DIR="${S}_build"
+
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch"
+	"${FILESDIR}/${P}-missing_libflags.patch" #787962
+	"${FILESDIR}/${P}-python.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	local myeconfargs=( $(use_enable static-libs static) )
+	use gnutls && myeconfargs+=( --disable-openssl )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		# Bug 567916
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:$1/cython" \
+			imobiledevice_la_LIBADD="$1/src/libimobiledevice-1.0.la"
+	}
+
+	emake -C "${BUILD_DIR}"
+	use python && python_foreach_impl python_compile "${BUILD_DIR}"
+
+	if use doc; then
+		doxygen "${BUILD_DIR}"/doxygen.cfg || die
+	fi
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" install \
+			DESTDIR="${D}" \
+			VPATH="${S}/cython:$1/cython"
+	}
+
+	emake -C "${BUILD_DIR}" install DESTDIR="${D}"
+	use python && python_foreach_impl python_install "${BUILD_DIR}"
+	use doc && dodoc docs/html/*
+
+	if use python; then
+		insinto /usr/include/${PN}/cython
+		doins cython/imobiledevice.pxd
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 3f11e0b5a3ef..3f1f7866b465 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -5,5 +5,5 @@ AUX libplist-2.3.0-test-rename.patch 16569 BLAKE2B 04675bba9ae4d1690ecc539a136cb
 DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
 DIST libplist-2.3.0.tar.bz2 151851 BLAKE2B 0ea595c5de30b413548526e5f26660c96d53216182111e00817369d5069e2fa1a4982bc7252a97160e3d9f92d5edadd57bd1be0598754d1ed0872a85a6a6504d SHA512 494858ebd6ba41f51d714b4da470ba40c564d9f327dc07c8cbe50cb301a8ef078cd43fedd45473c3a8d1a714ce149fe6365c44b2cd4a12fb711256ce273720e4
 EBUILD libplist-2.2.0-r4.ebuild 2723 BLAKE2B 71675e059df2638aa7f9db279ad387f33eeaa8701e9f0412f180827a1a588af485388a88e6a8090bd0ccdec8a71ca9bfaed5cbf33d641c4bd8ae1f6b5ff47801 SHA512 63c6cb211e0ad03e963ea197be0a0bf9e6db5d67f242dff10c32ac1ff3629c0d217d340cdfddf67103ef5f2751b7b6d6e55265f972b450ad02ff9bd9d584677c
-EBUILD libplist-2.3.0.ebuild 897 BLAKE2B 9f113b42fe127689dcf5487716e1acbd60f482a35136261df40ec7c12f5774b148d6cf6a415615fce2a29663fd529e045c86aa9891a214f44ab667049c289bf9 SHA512 31245f55153dd9fd12e911f4e5aacbffdc447257445c60cf03ca258c4cda88e0eab6fd122199da83aa53c56523c2e4a3df70bde2ba7bd4ce076d95892413194c
+EBUILD libplist-2.3.0-r1.ebuild 1187 BLAKE2B db36018debfce623e4f83d4c59aea9d712de61c07d3a3d20131c85aed74f22a8c11bb41f4e69536f48fe70ad22fcbcd2dc153b5957bc76d9d905889ffd9ddf52 SHA512 4cdbef7d62f23dfc6f6c3efb8f35ecba9aaff8f45e11bccc25ae9097e4e33dfd5aa20f8cf859c43e3a5912c55805494771f6efa7b3e27995d84bb4da1c4b0242
 MISC metadata.xml 411 BLAKE2B 739995675d95e408b7ddd6092af57e2cd39a9aa129271de40119350926a75200962ccc35c463d304cfd3fc396f4a4e04ecdef752a506bbc576365c9b689a8d1b SHA512 82db103987ba57112cd18557114d82be89a1c3cc6da43334b16a1b22023fc5961be3c2abc3213be046ee370d3285717cf9c267ae97309065fe888f39fd75355c
diff --git a/app-pda/libplist/libplist-2.3.0.ebuild b/app-pda/libplist/libplist-2.3.0-r1.ebuild
index 6d570f108b5e..bc96e2f7fa11 100644
--- a/app-pda/libplist/libplist-2.3.0.ebuild
+++ b/app-pda/libplist/libplist-2.3.0-r1.ebuild
@@ -40,4 +40,10 @@ src_install() {
 	emake DESTDIR="${D}" install
 	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
+
+	# bugs #733082, #915375
+	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+	dosym ./libplist++-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist++.pc
+	dosym ./libplist++-2.0.so.4.3.0 /usr/$(get_libdir)/libplist++.so
+	dosym ./libplist-2.0.so.4.3.0 /usr/$(get_libdir)/libplist.so
 }
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index bbd1a35d119a..f0bb273a1568 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,4 +1,4 @@
 DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
-EBUILD usbmuxd-1.1.1-r1.ebuild 1003 BLAKE2B 1dff57c66ca9f73c6369f4a3ed0108290bca4d2935f22c12c3cdac16f18327137bcd6ed92414fa1102a9f013c23eac91c29507e1e1db467f0aaaa70255aef5f8 SHA512 6544749d9ecc0b344ded006431d200e0049ef4b2becd768fc6f3029b4195857a3b8661fb74474845c0f7c0835c3b937ada99159efdef553e9ea88c2814827cb3
+EBUILD usbmuxd-1.1.1-r2.ebuild 1025 BLAKE2B 6b841506494ab7c4963d8c52033c87f3ee30ec0ad7ab5fdb50bbe80f12fe873edf251c7d5de346cffa8abd934c2afff879f6cd68a4bb8d5ac57bc8992a731b44 SHA512 6a250ac08dd22d8dcf2d6469af243c45e2fde7fd8671ecf354be0294ea5d4fd6c50a05a129722357ee6bbe081cc89c33111e11f9922db78efdb3a682f10c28fc
 EBUILD usbmuxd-1.1.1.ebuild 937 BLAKE2B 36c169ef63922661d3acab3dad7b0f9b895194c86506784842407b07ebac90b2a948b3661060992867c99523a889f4d846de2acb6987d06bba7db1bd15052db2 SHA512 37a996370c2266c90932ad23b44748b0c699cfd6e0f10fed695d9ec5852e9e288e207ba2546fc79b076d78ec7e3f5090bd03439bf952019a1b0d3be2d9a9f6b0
 MISC metadata.xml 489 BLAKE2B 59caec3b41e2864b320df6b86cb3169a03867f390f689d938512d28e99404c0d57d070ace55c3d04e83dd5d254222cc1e7affa334a684ac34f7a9900e8437f8b SHA512 4ffbbfc34b81774984931106df1ec706ee5bc5b635ef58f78daf3b54d9952d0e5799f69bf9cc7178e0849ed426ad31bc2e71aff4af33ff7dfca6bc9a0c605eac
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1-r1.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild
index a61717a2d817..0f7ab30b7dc5 100644
--- a/app-pda/usbmuxd/usbmuxd-1.1.1-r1.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild
@@ -18,7 +18,7 @@ IUSE="selinux systemd"
 DEPEND="
 	acct-user/usbmux
 	>=app-pda/libimobiledevice-1.3.0:=
-	>=app-pda/libplist-2.2:=
+	>=app-pda/libplist-2.2:= <app-pda/libplist-2.3
 	virtual/libusb:1=
 "