From b2be182d49eea46686b5cf2680d457df61e89dc4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 30 Jun 2018 08:49:38 +0100
Subject: gentoo resync : 30.06.2018

---
 app-pda/barry/Manifest            |  4 ++--
 app-pda/barry/barry-0.18.3.ebuild | 18 ++++--------------
 app-pda/barry/metadata.xml        |  1 -
 3 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'app-pda/barry')

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>
-- 
cgit v1.2.3