gentoo resync : 29.05.2018

5 files changed, 129 insertions, 8 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 1472ea0cd127..42ab18251464 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/iripdb/Manifest b/app-pda/iripdb/Manifest
index 2ee9c5b3e00b..5b9e49c59c6a 100644
--- a/app-pda/iripdb/Manifest
+++ b/app-pda/iripdb/Manifest
@@ -1,3 +1,3 @@
 DIST iRipDB-0.1.3b.zip 32000 BLAKE2B 139affccb8545756c0d0e2652b7b1851b588aad3fcbcad04a88ccb517bcb10bd7aa4d46bc87885a6b32b0d27564bb98cde2bf21846140eb572f9c1953dba4d8a SHA512 7d3811e12a8570a07d2381bf6e97c9818b0da5b38dca95fc66441635343d827395d16fcdc7cea49179c062888ecbd88722f379ed59664919e10050618e66e8d5
-EBUILD iripdb-0.1.3b.ebuild 887 BLAKE2B d78a18e257191ccd806246d15eaf126c6fb5068a8d4ccb3661a4c8391500e95c79b587c0970d39fabb5a2cde09f851c5b59f6d3db2f703eea96a1eee8b8ba80c SHA512 fe166c0d0beb43a1ace147acf86ecbb9d2a25646152ec62bdc603f718afcf73134b5aa82ddead10b68ca5e458f74f9bd55f661119d03e533366c90f444056e69
+EBUILD iripdb-0.1.3b.ebuild 892 BLAKE2B 80c4dabb4da82e6f3f3f9fd6061b4307ed2024c4ddf235df28c4f87b5fa29f251c0d2c9ec7af7ee53b4ada6890e58c15f03d600b992779667c4bc1eb8a72c685 SHA512 c671f4b4c66841f38605147a82c980b467df3267ea2f298a8200eb4ba68edc1878e69a74dfdc7a88d351a6e8d7cea9246b19365fc471298bfdc56d419a4e9097
 MISC metadata.xml 579 BLAKE2B 264497ce16f001b7fb8c86880829d553ca82bdea0e6f6d41910b850369471dac9b41c9d8e937ff5abe278f1e1758d2541e0814db8937da195ebddb837ac3efa6 SHA512 b3c40a10ecbb9a7d700b37172c9ce5917554a89a5e3d0c88f1b7032f08b7187f0cb09bcb91288330715d3d4f19078ec639e3e56ac1f33c334ec16dc59a59e011
diff --git a/app-pda/iripdb/iripdb-0.1.3b.ebuild b/app-pda/iripdb/iripdb-0.1.3b.ebuild
index f2d2e3a24e2e..959d4997dc63 100644
--- a/app-pda/iripdb/iripdb-0.1.3b.ebuild
+++ b/app-pda/iripdb/iripdb-0.1.3b.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit toolchain-funcs
 
-MY_P=${P/iripdb/iRipDB}
+MY_P="${P/iripdb/iRipDB}"
 
 DESCRIPTION="Allows generating the DB files necessary for the iRiver iHP-1xx"
 HOMEPAGE="http://www.fataltourist.com/iripdb/"
@@ -13,15 +12,18 @@ SRC_URI="http://www.fataltourist.com/iripdb/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="media-libs/taglib
-	sys-libs/zlib"
+RDEPEND="
+	media-libs/taglib
+	sys-libs/zlib
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
 	echo "$(tc-getCXX) ${CXXFLAGS} -c -o main.o main.cpp"
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 173b5fe14b05..6a6542973d17 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,4 +1,8 @@
 AUX gnutls-3.4.patch 2415 BLAKE2B cdd9f3ad241a866db1794ec2ac661df902b180555102173706a47700889ff98a18bdadefba90818edea14def51664c3bbe75fe38cf1375574f3fe7ba51c10340 SHA512 d1a46062d3e4a37dfbb8d8ac754f7e927e0f8f2720152d7f8604667b65ea8fa5f26777f4490cb01c7dc01771a96c545bc1b1c8b433482ad24fb9840f063fb36b
+DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2
+DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172
+DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
 DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589
+EBUILD libimobiledevice-1.2.0-r1.ebuild 3256 BLAKE2B db6e395affb1faf69c0de4d39d20fe6fc541d786ad289f73a5ea4d5fc195839320af3f1a8bcdbd5b88e81ff2c5cdc96631fc110281ceaf339c468cff6c812ad3 SHA512 60fbdb4c1dbbb6044636f147ee3a49946ba6f965dd6ef88a9c957f3056be37a059eeca64f2ed4e36a703607950766c385920e07e9fcba0f6e292cddda0eb8b27
 EBUILD libimobiledevice-1.2.0.ebuild 2477 BLAKE2B 56ef477e949f566bee71fb86302565c2c8bf8d3a1b70b7e37043b31a5364e87ba4cd7ddeaa891fc537cd92c7d72a85d4a82d0fb510ded514f3ed5054b354a913 SHA512 b1157df10321b06393c8f17b437faa1dcb208e8b52e01209ded2a81512733f4c1aab3a3fe17cec5f47a2f2b8f9d2cc409cfec952f20931fa37d4404083697d34
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..19d56287cf42
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+
+# Get patches from Fedora
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2
+	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> ${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
+	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> ${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
+	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> ${P}-git.patch"
+
+# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
+LICENSE="GPL-2+ LGPL-2.1+"
+
+SLOT="0/6" # based on SONAME of libimobiledevice.so
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="gnutls libressl python static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-pda/libplist-1.11:=
+	>=app-pda/libusbmuxd-1.0.9:=
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0 )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
+	python? (
+		${PYTHON_DEPS}
+		app-pda/libplist[python(-),${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+BUILD_DIR="${S}_build"
+
+PATCHES=(
+	"${DISTDIR}"/${P}-git.patch
+	"${DISTDIR}"/${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
+	"${DISTDIR}"/${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.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
+		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 -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1 DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	dodoc docs/html/*
+	if use python; then
+		insinto /usr/include/${PN}/cython
+		doins cython/imobiledevice.pxd
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}