Merge pull request #1959 from blshkv/master

libplist-2.6.0.ebuild

app-pda/libplist/Manifest

@@ -1 +1,2 @@
 DIST libplist-2.5.0.tar.bz2 155847 BLAKE2B b6530f0732db28759df160e77cf61a23c6b97c5e1d1aed7797fd4771bbe96be40f9ffe477c9cd3470e71280572559ece7868b0098d0472de84bf915502a05b71 SHA512 95bed7111b54a59331933491c1f0b8eb6eb2ab3b8958ca63166ae21cf8430a8b2badca2968b45ac90b8d0672e4035ac92969100881daaefc0339daf45dc49268
+DIST libplist-2.6.0.tar.bz2 155575 BLAKE2B cee4d00eff0b7393f34dc0b1fdb1e473bbb849ac2a8b243bcc97bfbee36a884b5574b662fa5a1a2b9c86c4c03cf0be2b2b0c09a0008b64e8b2f564349bc6df54 SHA512 4e9f301979e57230d016acabb84b9c032e934bbb5d755aa4f374d477472340af35632c3080c480a140d1aafbe32df88a950ebae3f062bfe2aaad2935f063e6b6

app-pda/libplist/libplist-2.6.0.ebuild

@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
+#	"${FILESDIR}"/${PN}-2.3.0-test-rename.patch
+#	"${FILESDIR}"/${PN}-2.3.0-configure-c99.patch
+)
+
+src_prepare() {
+	default
+	RELEASE_VERSION=${PV} eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--without-cython
+	)
+	econf "${myeconfargs[@]}"
+}
+
+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
+	#configure.ac:
+	# CURRENT : REVISION : AGE
+	# LIBPLIST_SO_VERSION=8:0:4
+	# 2.0.so.4 + AGE + REVISION
+	dosym ./libplist++-2.0.so.4.5.0 /usr/$(get_libdir)/libplist++.so
+	dosym ./libplist-2.0.so.4.5.0 /usr/$(get_libdir)/libplist.so
+}

app-pda/usbmuxd/usbmuxd-1.1.1_p20231011.ebuild

@@ -3,13 +3,14 @@
 
 EAPI=8
 
-inherit systemd udev autotools
+inherit autotools systemd udev
 
 HASH_COMMIT="360619c5f721f93f0b9d8af1a2df0b926fbcf281"
 
 DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
 HOMEPAGE="https://libimobiledevice.org/"
 SRC_URI="https://github.com/libimobiledevice/usbmuxd/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${HASH_COMMIT}
 
 # src/utils.h is LGPL-2.1+, rest is found in COPYING*
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1+"
@@ -22,44 +23,37 @@ IUSE="selinux systemd"
 DEPEND="
 	acct-user/usbmux
 	>=app-pda/libimobiledevice-1.3.0:=
+	app-pda/libimobiledevice-glue:=
 	>=app-pda/libplist-2.3:=
 	virtual/libusb:1=
 "
-
 RDEPEND="
 	${DEPEND}
 	virtual/udev
 	selinux? ( sec-policy/selinux-usbmuxd )
 	systemd? ( sys-apps/systemd )
 "
-
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/227_openrc.patch"
 )
 
-S=${WORKDIR}/${PN}-${HASH_COMMIT}
-
 src_prepare() {
 	default
 	#define git-version-gen $RELEASE_VERSION
-	echo ${PV} > .tarball-version
+	echo ${PV} > "${S}"/.tarball-version
 	eautoreconf
 }
 
 src_configure() {
 	initsystem="--with-openrc --without-systemd"
 	use systemd && initsystem="--with-systemd --without-openrc"
-	echo "init: " + $initsystem
 
 	econf \
 		$initsystem \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
-#		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir)) \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
 }
 
 pkg_postrm() {