gentoo auto-resync : 27:04:2024 - 23:59:42

3 files changed, 47 insertions, 5 deletions

diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index e3dc71794c26..82bc59ff008d 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,8 +1,9 @@
 AUX libgpod-0.8.3-comment.patch 611 BLAKE2B 6ed4cfbb6ca1ca6876f835bdad2b9d11a8ad147c0f0f584436791fa84e40e15dcbfe163a47dedc688eecf4db84610df81ab01ae2c1266324a8cebadd914627e2 SHA512 a9d042745d8095a8188e57d82c8e1b00acb41f45da1510b2615d29b607b52ae49e54d3482e5021d085501f3705f4ad0fa79796cd4262c74acd0b4f34f8450a44
 AUX libgpod-0.8.3-implicit-int.patch 638 BLAKE2B 55433e6709baf17bc18b9da9b5ca2c15601f3a5b364f52573c21ab49ab18b9089fa5ad318307dc107034faece88416ced565261b23243e42dcfcfdac400efaf3 SHA512 63a1f0c3871f34ae356f3b8f1b465e744d7f6ed656c7ee24a88f2a81742af76c0db44985759d9905dc6fa14b1e98b3654229d3c64c1010b87b16b71ec4059e93
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
+AUX libgpod-0.8.3-plist-2.3.patch 1013 BLAKE2B c67673febfc18b9a0af9b967ff0a7572bec622d1255e981923db00e385b6c25fb14cb40b75498f1b33a2093d9c1b84a3094f769766f8064a99aa3ba38782bb6a SHA512 abea5daa3a0a2d12f04b6f642b359981aa9a2d8f5e550dddbf88d3720f9e9793b4c39b565991b561c9f753b421ae6a4270b6a9a1ab1520133a2910a99486d51d
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r5.ebuild 1450 BLAKE2B 80a7b44a9987d805abf88772ad06863459b1c7b327f349ced501cf087d83c9b5431ca77eee08be4894d20e5e8265213034503922dcc6130e3b389242115c79c6 SHA512 04c1078723b69d425b3c551c4c14e7d583d2148937d45580fd2839f85262b7a644380a4341dc3b55ceb8c5647a69b67cd024dbf82e78ea8ac775f7ae1b94d3e5
 EBUILD libgpod-0.8.3-r6.ebuild 1589 BLAKE2B b0acee7c4046df4f25c1a068a07f2aec258eeb75bb4b590d6c95f26fe767e64bccd91ec3015ed577985a0fbe021a384360c082f7b13262e028a61dc809120e4d SHA512 12c163ab2fcc88aefaa84cdb27ad445d0961558b71b9bbdc31d1dbe600ef69b54ac92bbccd0c84681d894e1d160d10f9f7145dba7116d8798a5a689f4f7b1620
+EBUILD libgpod-0.8.3-r7.ebuild 1638 BLAKE2B c0b3113c64570ae9596ecbeaaa2fc3e5030b7dca8f81169506fc794716b43037902471a4fb6bb1abc88acadf05206efb8dcf71fcac053ae4c62b89cc4f2efd7c SHA512 d5819cc151f70312b7e3a9c78e5a1dbfd17e5ffc853c8283b95711839f3862e44987c8920b9c57d64aa9cbab94a005bb9ecc58936e2dc71741f11e4d219588c9
 MISC metadata.xml 484 BLAKE2B f3704943d01d8048940f1d359a12330aad167f6a7b3e67f37fd3c8b954aef0cde441b3e9b957414404e5a450a21acb899a8c07df838632063e45734cebea1b68 SHA512 40128d4bd5043e699ec2acdbc267eba5f2ca4cb54e7e05ca81d033fee88124e37824234ddfe2d51da7cbbb2757cb68801db4899c82c66895e5005bd85a211965
diff --git a/media-libs/libgpod/files/libgpod-0.8.3-plist-2.3.patch b/media-libs/libgpod/files/libgpod-0.8.3-plist-2.3.patch
new file mode 100644
index 000000000000..6baa712c9a96
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.8.3-plist-2.3.patch
@@ -0,0 +1,31 @@
+diff -Naur a/tools/ipod-lockdown.c b/tools/ipod-lockdown.c
+--- a/tools/ipod-lockdown.c	2013-07-10 14:57:39.000000000 +0100
++++ b/tools/ipod-lockdown.c	2024-04-27 22:28:10.334056758 +0100
+@@ -100,7 +100,7 @@
+ 	plist_get_string_val(ptr, &str);
+ 	if (str != NULL) {
+ 	    ptr = plist_new_string(str);
+-	    plist_dict_insert_item(value, "SerialNumber", ptr);
++	    plist_dict_set_item(value, "SerialNumber", ptr);
+ 	    free(str);
+ 	}
+ 
+@@ -112,15 +112,15 @@
+ 	plist_get_string_val(ptr, &str);
+ 	if (str != NULL) {
+ 	    ptr = plist_new_string(str);
+-	    plist_dict_insert_item(value, "VisibleBuildID", ptr);
++	    plist_dict_set_item(value, "VisibleBuildID", ptr);
+ 	    free(str);
+ 	}
+ 
+ 	ptr = plist_new_string(uuid);
+-	plist_dict_insert_item(value, "FireWireGUID", ptr);
++	plist_dict_set_item(value, "FireWireGUID", ptr);
+ 
+ 	ptr = plist_new_string(uuid);
+-	plist_dict_insert_item(value, "UniqueDeviceID", ptr);
++	plist_dict_set_item(value, "UniqueDeviceID", ptr);
+ 
+ 	plist_to_xml(value, &xml, &xml_length);
+ 
diff --git a/media-libs/libgpod/libgpod-0.8.3-r5.ebuild b/media-libs/libgpod/libgpod-0.8.3-r7.ebuild
index 741b728b3b47..959027f94d84 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools udev
 
@@ -11,11 +11,11 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE="+gtk ios +udev"
 
 RDEPEND="
-	>=app-pda/libplist-1.0:=
+	>=app-pda/libplist-2.3:=
 	>=dev-db/sqlite-3:3
 	>=dev-libs/glib-2.16:2
 	dev-libs/libxml2:2
@@ -39,6 +39,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-comment.patch # bug 537968
 	"${FILESDIR}"/${P}-segfault.patch # bug 565052
 	"${FILESDIR}"/${P}-pkgconfig_overlinking.patch
+	"${FILESDIR}"/${P}-implicit-int.patch
+	"${FILESDIR}"/${P}-plist-2.3.patch
 )
 
 src_prepare() {
@@ -64,6 +66,14 @@ src_configure() {
 src_install() {
 	default
 	rm "${ED}"/usr/$(get_libdir)/pkgconfig/libgpod-sharp.pc || die
-	rmdir "${ED}"/tmp || die
+	[[ -d ${ED}/tmp ]] && rmdir "${ED}"/tmp || die
 	find "${ED}" -name '*.la' -type f -delete || die
 }
+
+pkg_postinst() {
+	use udev && udev_reload
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}