gentoo Easter resync : 12.04.2020

4 files changed, 54 insertions, 40 deletions

diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index 6ac05ce1abc4..7a76ae3a1b73 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,5 @@
-DIST usbmuxd-1.0.8_p20140530.tar.xz 46988 BLAKE2B 8efedee3231b134995316fc295fffd975271aa9d630aa6e3d96ccda472634422299aadb92acda09b6802cdcf9e99af0c165dcbed153d0a5027ffcc8f26126cdc SHA512 200c9bd208ef9e8d5e0a9b2779ff260efe6319333ce27c93a0686ba924e6cfaa1a003072c3eabbe46d495a66bc47c3cd6e82482653fde5e1a7ae0edd9b838fac
 DIST usbmuxd-1.1.0.tar.bz2 321897 BLAKE2B 3ca5d1da222e457ac01f3e87fb7573c6405e51fd5d270a2b3dab7601118f21be22232d5100b4d027273fc837e6a57f7a7d17d2c41ae59d7c5aa41f76bef5a03d SHA512 66aa0c40e912bf596b819098b87d88e9cf30b2e6352e607eeb778bd4f23bf9bb123fb6a6ecca2d4e4be3171e35d66200d632d2c9c80b1f2462bb45be8aa6912d
-EBUILD usbmuxd-1.0.8_p20140530.ebuild 869 BLAKE2B c4f285dfdb12994d9bcf488b91215b1e5f4245d9b269d3cb1164710fc8a344a2d66a24a3fdcdeb1842bbb8b64a9c47ef3f20e15548367d711fdbe9c4b0d16131 SHA512 fd1b326c16e0c74f4a2f6b3857606ffb6b7e14c40e5682c01fab1655c3df27dffd4b4ea6b15d5c3a5e5ae64f914b135ac562b6d792d6699dddbb183dae5b226e
-EBUILD usbmuxd-1.1.0.ebuild 812 BLAKE2B 8372243e9047c7af5cfb1fabf5c94a7ddbe2f01f83909bed7954535e81c249fccbc76d2915ac546120a05bd8ac93b1c87aedf4dd1c4a1f919085782abc5091b9 SHA512 24bc2804424ab3ec022731966351f48f963fb0e9ff0f93b95f3aa64bb0c46e7039063857b9b59da04c91fc24a4bcaf79ef592294c0b305679836e724445fa1e0
+DIST usbmuxd-1.1.1_pre20200121.tar.bz2 51859 BLAKE2B 339d53904f7484bebb6d7524313ee065bf5a244efab16c77b30b8932071012105f21aa56083d82667b06088af83464ea8c86e3c28c5a45cb9abbe574a634533e SHA512 cc113b054e8e04d228af740ec43d2dbf29c015dc9d8e1cdd0eaf84bfcaa9838d5b1bf6db2efed30ffb84c35c88db5469983a115ffdbddbb6acd0df9fd2a5182f
+EBUILD usbmuxd-1.1.0.ebuild 854 BLAKE2B aff005e1ff9c9ea91d8965bc28662f579562b0ecbdb8bf7d4b728da685cdb1c9567ce79a060aabe202c5e3b7d272bdddbf32be00a6f2ed69e8ca10ff20c5f563 SHA512 779d1bfec159db90b531400dd6d505145673b5f6db6a0afdb00a598d66036bf240e2115155bcb0e27499625929a9a8b278b98832506dee8a9a56a239a40ee7fd
+EBUILD usbmuxd-1.1.1_pre20200121.ebuild 1001 BLAKE2B a56ea9d8d22834f535f9a80f46f5e5922ec2b60385929311d476a7edf304c9db2b913abd82fa4d96108146209902b477e5e7bc074db7aa365cf5c9553630f67d SHA512 a275bdd3541b791f93b68276df7e812daed58ff73c182f817fefecf78d36f229697803afbde36bd0cded539db55d60846b9f1a09861001963b866aa70d34b689
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild b/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
deleted file mode 100644
index 17dd00ce82b1..000000000000
--- a/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils udev user
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-#SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
-
-# src/utils.h is LGPL-2.1+, rest is found in COPYING*
-LICENSE="GPL-2 GPL-3 LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-group/plugdev
-	>=app-pda/libimobiledevice-1.1.6
-	>=app-pda/libplist-1.11
-	virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewuser usbmux -1 -1 -1 "usb,plugdev"
-}
-
-src_install() {
-	autotools-utils_src_install udevrulesdir="$(get_udevdir)"/rules.d
-}
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
index 0de7aed7b123..4220c366a73c 100644
--- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,8 +17,9 @@ IUSE=""
 
 RDEPEND="
 	acct-group/plugdev
-	>=app-pda/libimobiledevice-1.1.6
-	>=app-pda/libplist-1.11
+	>=app-pda/libimobiledevice-1.1.6:=
+	<app-pda/libimobiledevice-1.2.1_pre0
+	>=app-pda/libplist-1.11:=
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
new file mode 100644
index 000000000000..371f8cb38f28
--- /dev/null
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="8a69f1a78a58476f77b66916091d2405d0cd815f"
+
+inherit autotools systemd udev
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/usbmuxd.git/snapshot/usbmuxd-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+# src/utils.h is LGPL-2.1+, rest is found in COPYING*
+LICENSE="GPL-2 GPL-3 LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	acct-user/usbmux
+	>=app-pda/libimobiledevice-1.2.1_pre0:=
+	>=app-pda/libplist-1.11:=
+	virtual/libusb:1"
+
+RDEPEND="
+	${DEPEND}
+	virtual/udev
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with systemd) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+}