gentoo resync : 30.06.2018

6 files changed, 9 insertions, 20 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 42ab18251464..b3a1768d9840 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index f607791ea92e..a542daa322aa 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -1,4 +1,4 @@
 AUX barry-0.18.4-shared_ptr.patch 746 BLAKE2B c45dbda427c25807e1cdb9d3d54a5695a92623230eaaabe41cff71236715c816f1d2de6e8c29f71d993288803010803fe046a3a96e39d9f0b6da3a7f452d793c SHA512 b376e3553aa22d3aa8a04cee766d34aae3d03ad3677174d5f02118653fbfe8391175238727cf0c21c0caf33a850cc10fa0fcf077266815e891bf5efbb3d0d745
 DIST barry-0.18.3.tar.bz2 3457451 BLAKE2B ba7f49e95ac85d764c1275f6dc06f4a7be080d8d725466e1bb8d23977437879f2f7bf7581d9f5bc1262a07f8d1478992ce3c62c9893504f1094dcfb16d944ebd SHA512 4944d22bd5f5a76201ca10ccaf9d12ecf21b298e5b9c8d3d503441e0ad0386a94699c48ae683004992508bb385e75ec137859509663148f2f148933fa508e7fd
-EBUILD barry-0.18.3.ebuild 2735 BLAKE2B fbcd7b4e2ff863a8e1dda2561a7ef6a082ac8552f795e50469ad03e0c06c0cf1e08137455f05df5aa1d8540280d3864ae0e64bab10f48567f3f2129ea28841d7 SHA512 1ec9aa828c59b6e4a0b319e360fd8a8e51bc6f1d51a5aad8c8c3cec25001cbb29855fa5a08285574dff49eb152cec71a169f6d9f5c819decce04fdfaec99e6b9
-MISC metadata.xml 566 BLAKE2B ac2ac098fd0d302c63bb6aff031d6f83c6ce32ca4753114462529bf5c557cb63ba9dc3dea1756e928e933da6cdf3a19345244a82884ff2e0e11e5e4d9ff28718 SHA512 340bb06f3120e51996d6206be65d2184418477e2906ee8bf99fbaf87b91cf2b88141739367eff0d0389820ec24467582dae5e37de520803f450ee7dae2c7b560
+EBUILD barry-0.18.3.ebuild 2328 BLAKE2B 6764afecfe7b135440d912a546c4b7b10bcbeadf6d070e45265ced4f5f73cff63270d8258af5f03e8f3171ec45b05630b2d2befb2477cf302ae893d47d528a30 SHA512 810f3bbafb86fe081b5bc05c1fdd078f9fb6cb463ca51e37f3f16c924c5612c8bb1e1b5c97e0ae6c2b44f05059667194db0a3d624ad0effb8b4dfb1486bd1819
+MISC metadata.xml 498 BLAKE2B 996a82041baa888af865b675d7cf737e43e7fee3ef884ccbbfde08381bbfedf66f7eba86f03f4599f4068f159fdd57cf8b938e723680053bb47ed581bbdfa58a SHA512 fb554a30934fdb3889ae42e1828f62ac3b45f97b1d38739d205a790c295e7081bdb78322e8896d79f4b7348bf295cd5ef0810a6de14a24ba3c32db00d25e42c0
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild
index 48454eed302d..6a672094e52f 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,17 +11,16 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
 LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="boost desktop doc gui nls static-libs"
+IUSE="boost doc gui nls static-libs"
 
 RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6
-	>=dev-libs/glib-2
+	dev-libs/glib:2
 	>=dev-libs/libtar-1.2.11-r2
 	>=media-libs/libsdl-1.2
 	>=sys-fs/fuse-2.5:=
 	sys-libs/zlib
 	virtual/libusb:1
 	boost? ( >=dev-libs/boost-1.33 )
-	desktop? ( >=net-libs/libgcal-0.9.6 )
 	gui? (
 		dev-cpp/glibmm:2
 		dev-cpp/gtkmm:2.4
@@ -49,7 +48,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable boost) \
 		$(use_enable gui) \
-		$(use_enable desktop) \
+		--disable-desktop \
 		--disable-rpath
 }
 
@@ -86,7 +85,6 @@ src_install() {
 	dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader
 
 	newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg
-	use desktop && domenu "${S}"/menu/barrydesktop.desktop
 	use gui && domenu "${S}"/menu/barrybackup.desktop
 
 	prune_libtool_files
@@ -98,14 +96,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-
-	elog "Barry requires you to be a member of the \"usb\" group."
-	ewarn
-	ewarn "Barry and the in-kernel module 'BERRY_CHARGE' are incompatible."
-	ewarn
-	ewarn "Kernel-based USB suspending can discharge your blackberry."
-	ewarn "Use at least kernel 2.6.22 and/or disable CONFIG_USB_SUSPEND."
-	ewarn
 }
 
 pkg_postrm() {
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index dfc30d13b212..64b764c3d6cd 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -7,7 +7,6 @@
 	</longdescription>
 	<use>
 		<flag name="boost">Enable boost support</flag>
-		<flag name="desktop">Install the GUI desktop control panel</flag>
 		<flag name="gui">Install the GUI backup tool</flag>
 	</use>
 	<upstream>
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 6a6542973d17..c0cb731a97bd 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -3,6 +3,6 @@ DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58d
 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-r1.ebuild 3259 BLAKE2B 078f8a40655aa3abc555a6b625b841ec17fc5bdacd0f01d8a3dce27b5f5b013f62231f80ab61af1b3738dcfe4e36feaafd9d09cd2a969a48114aca3c09597b4a SHA512 e4ac840f32ac52d01990a07ee7be043b7c15c839afc84d41ead25aea1ed7f81b29b443b987174bc039f6c814e0869eb5763f85759d0391564ebf440d6a16cbc7
 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
index 19d56287cf42..a46707403b83 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit autotools python-r1
 
@@ -20,7 +20,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 
 SLOT="0/6" # based on SONAME of libimobiledevice.so
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="gnutls libressl python static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"