gentoo resync : 25.08.2020

5 files changed, 259 insertions, 0 deletions

diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 84bd77f0ac20..b04546d6b87a 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,3 +1,8 @@
+AUX libplist-2.2.0-fmin.patch 1102 BLAKE2B ce8c76a369ae1ddc54016bbc941efeafa96d093bce14c0cdaf1da17fe7d201673bd0565669dc12209ee1230b66f56750ba64e8431d72f0d118ea5880b0764a0e SHA512 683203116ffdae053c4da35704aaf2b707b804a19316286f890df4bb6a9ae8dd6b6a4ee0f6db6164f124887e8a602db709d985496b0734899826f04e19846d78
+AUX libplist-2.2.0-pkgconfig-lib.patch 305 BLAKE2B 67da57f080454e8b01408872ab76b66703e0339052f64c3738964b02e6a389b03aac65d7d6ca30bfd78b1366c4a7fec843b039b32269db0a4e7e95850638e34d SHA512 1c2c628f178ed64a8f7e1dd84657d7d365e980a2b2d8af9dd6bbe55d245997cf51974d9ed451eafb715299097029886f7ec0a863f199a72bf15f50281c9bfab7
 DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
+DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
 EBUILD libplist-2.1.0.ebuild 2145 BLAKE2B 666212cfa479b9855390170df691006230daeebad437fa6599427fea3f7b6f25db4079cbd47d87453ad23eacfa8103f45e834d8c472db3b4cc6ce4a37c0fa9ed SHA512 f73c7808e738a970fd5edd8ef657558dcf97ac73cda3b2470ba3856edb0aa831e9338d349ce35330caa1c56a3713fd1d3d5046c965ecc8715f837479596a5a47
+EBUILD libplist-2.2.0-r1.ebuild 2150 BLAKE2B f4019c675f045e06bf35f4badf4738708b3afaf229087b7f0c3d8ef62a4051c7d9d6d40a44eb2a3b828c3fdabab40920af75890f08e6385a01ef561d6ecc3ef7 SHA512 8776a7558f87372514d6bdf21bbc4ef73f0c9dbac29c1bbd2b9b54f2fa66e9b40b91d309dc2cb8209c794696b2ea70972327abee5978dbf78848e54f55704c93
+EBUILD libplist-2.2.0-r2.ebuild 2715 BLAKE2B 4b4fb6aeaab88462ace8ed04e3b8b49b5934a1173d8c4c0e889bd3bec5c2ed5cf18c14d4789360ca63b1fc99a157ec0c227f4c820547b08eb75737695969b6fc SHA512 2ad8f9f92458cfe1be5d9927a5753bddb511e6da84c1ad3f6b717ac6837e957e09902c51b56f1e0f5a192f6266ec5da65010f720e41abf8d8c79c2adbc372ad0
 MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/files/libplist-2.2.0-fmin.patch b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
new file mode 100644
index 000000000000..7b9bdc353268
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,19 +79,7 @@
+ esac
+ AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
+ 
+-# Check if we need libm for fmin
+-CACHED_CFLAGS="$CFLAGS"
+-CFLAGS="-O0"
+-AC_CACHE_CHECK(if fmin is a builtin function, ac_cv_fmin_builtin,
+-	AC_TRY_LINK([
+-		#include <math.h>
+-		#include <float.h>
+-	], [
+-		double val = 3.1415f * 0.55555f;
+-		double diff = fmin(val, DBL_MAX);
+-		if (diff > 0) return 1;
+-	], ac_cv_fmin_builtin=yes, ac_cv_fmin_builtin=no))
+-CFLAGS="$CACHED_CFLAGS"
++AC_SEARCH_LIBS([fmin],[m])
+ 
+ # Check if struct tm has a tm_gmtoff member
+ AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+@@ -153,10 +141,6 @@
+ AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith  -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS")
+ GLOBAL_LDFLAGS="$PTHREAD_LIBS"
+ 
+-if test "x$ac_cv_fmin_builtin" != "xyes"; then
+-	GLOBAL_LDFLAGS+=" -lm"
+-fi
+-
+ AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug],
+                [build debug message output code (default is no)]),
diff --git a/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
new file mode 100644
index 000000000000..2a57d06074a3
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
@@ -0,0 +1,9 @@
+--- a/src/libplist-2.0.pc.in
++++ b/src/libplist-2.0.pc.in
+@@ -6,5 +6,5 @@
+ Name: @PACKAGE_NAME@
+ Description: A library to handle Apple Property Lists whereas they are binary or XML
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lplist-2.0
++Libs: -L${libdir} -lplist-2.0 -lplist
+ Cflags: -I${includedir}
diff --git a/app-pda/libplist/libplist-2.2.0-r1.ebuild b/app-pda/libplist/libplist-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..c5c2f5167b89
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools python-r1 toolchain-funcs
+
+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/2.0-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="python static-libs"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( AUTHORS NEWS README.md )
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+	local myeconfargs=( $(use_enable static-libs static) )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
+	}
+
+	# Don't prefer clang.
+	tc-export CC CXX
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	einstalldocs
+
+	if use python ; then
+		insinto /usr/include/plist/cython
+		doins cython/plist.pxd
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..31d8621f1cee
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools python-r1 toolchain-funcs
+
+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/2.0-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="python static-libs"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/libplist-2.2.0-fmin.patch
+	"${FILESDIR}"/libplist-2.2.0-pkgconfig-lib.patch
+)
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+	local myeconfargs=( $(use_enable static-libs static) )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
+	}
+
+	# Don't prefer clang.
+	tc-export CC CXX
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	#
+	ln -s "${native_builddir}/src/libplist-2.0.la" "${native_builddir}/src/libplist.la"
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	einstalldocs
+
+	if use python ; then
+		insinto /usr/include/plist/cython
+		doins cython/plist.pxd
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+
+	# temporary fix for 2.2.0 release: 
+	# b.g.o 733082, 
+	# https://github.com/libimobiledevice/libplist/issues/163
+	# upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
+	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+	dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
+	dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
+}