1 |
commit: f54a644da95af0a74c230c8df81d6f7fdd37e103 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 28 21:18:23 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 28 21:18:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54a644d |
7 |
|
8 |
app-pda/barry: libgcal will be removed (#659532) |
9 |
|
10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
11 |
|
12 |
app-pda/barry/barry-0.18.3.ebuild | 18 ++++-------------- |
13 |
app-pda/barry/metadata.xml | 1 - |
14 |
2 files changed, 4 insertions(+), 15 deletions(-) |
15 |
|
16 |
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild |
17 |
index 48454eed302..6a672094e52 100644 |
18 |
--- a/app-pda/barry/barry-0.18.3.ebuild |
19 |
+++ b/app-pda/barry/barry-0.18.3.ebuild |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 1999-2017 Gentoo Foundation |
22 |
+# Copyright 1999-2018 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
EAPI=5 |
26 |
@@ -11,17 +11,16 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2" |
27 |
LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL |
28 |
SLOT="0" |
29 |
KEYWORDS="~amd64 ~x86" |
30 |
-IUSE="boost desktop doc gui nls static-libs" |
31 |
+IUSE="boost doc gui nls static-libs" |
32 |
|
33 |
RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6 |
34 |
- >=dev-libs/glib-2 |
35 |
+ dev-libs/glib:2 |
36 |
>=dev-libs/libtar-1.2.11-r2 |
37 |
>=media-libs/libsdl-1.2 |
38 |
>=sys-fs/fuse-2.5:= |
39 |
sys-libs/zlib |
40 |
virtual/libusb:1 |
41 |
boost? ( >=dev-libs/boost-1.33 ) |
42 |
- desktop? ( >=net-libs/libgcal-0.9.6 ) |
43 |
gui? ( |
44 |
dev-cpp/glibmm:2 |
45 |
dev-cpp/gtkmm:2.4 |
46 |
@@ -49,7 +48,7 @@ src_configure() { |
47 |
$(use_enable static-libs static) \ |
48 |
$(use_enable boost) \ |
49 |
$(use_enable gui) \ |
50 |
- $(use_enable desktop) \ |
51 |
+ --disable-desktop \ |
52 |
--disable-rpath |
53 |
} |
54 |
|
55 |
@@ -86,7 +85,6 @@ src_install() { |
56 |
dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader |
57 |
|
58 |
newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg |
59 |
- use desktop && domenu "${S}"/menu/barrydesktop.desktop |
60 |
use gui && domenu "${S}"/menu/barrybackup.desktop |
61 |
|
62 |
prune_libtool_files |
63 |
@@ -98,14 +96,6 @@ pkg_preinst() { |
64 |
|
65 |
pkg_postinst() { |
66 |
gnome2_icon_cache_update |
67 |
- |
68 |
- elog "Barry requires you to be a member of the \"usb\" group." |
69 |
- ewarn |
70 |
- ewarn "Barry and the in-kernel module 'BERRY_CHARGE' are incompatible." |
71 |
- ewarn |
72 |
- ewarn "Kernel-based USB suspending can discharge your blackberry." |
73 |
- ewarn "Use at least kernel 2.6.22 and/or disable CONFIG_USB_SUSPEND." |
74 |
- ewarn |
75 |
} |
76 |
|
77 |
pkg_postrm() { |
78 |
|
79 |
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml |
80 |
index dfc30d13b21..64b764c3d6c 100644 |
81 |
--- a/app-pda/barry/metadata.xml |
82 |
+++ b/app-pda/barry/metadata.xml |
83 |
@@ -7,7 +7,6 @@ |
84 |
</longdescription> |
85 |
<use> |
86 |
<flag name="boost">Enable boost support</flag> |
87 |
- <flag name="desktop">Install the GUI desktop control panel</flag> |
88 |
<flag name="gui">Install the GUI backup tool</flag> |
89 |
</use> |
90 |
<upstream> |