1 |
commit: 91cc1feeac886bf9e42ccf4d8702a35aa0d8ee49 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 1 07:14:14 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 9 21:41:17 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91cc1fee |
7 |
|
8 |
xfce-base/thunar: Replace XFCE_PLUGINS with a local flag |
9 |
|
10 |
xfce-base/thunar/metadata.xml | 4 ++++ |
11 |
xfce-base/thunar/thunar-1.6.12.ebuild | 14 +++++++------- |
12 |
2 files changed, 11 insertions(+), 7 deletions(-) |
13 |
|
14 |
diff --git a/xfce-base/thunar/metadata.xml b/xfce-base/thunar/metadata.xml |
15 |
index 359901b31db..d844c26059c 100644 |
16 |
--- a/xfce-base/thunar/metadata.xml |
17 |
+++ b/xfce-base/thunar/metadata.xml |
18 |
@@ -5,4 +5,8 @@ |
19 |
<email>xfce@g.o</email> |
20 |
<name>XFCE Team</name> |
21 |
</maintainer> |
22 |
+ <use> |
23 |
+ <flag name='trash-panel-plugin'>Build the trash status indicator plugin for |
24 |
+ the XFCE panel</flag> |
25 |
+ </use> |
26 |
</pkgmetadata> |
27 |
|
28 |
diff --git a/xfce-base/thunar/thunar-1.6.12.ebuild b/xfce-base/thunar/thunar-1.6.12.ebuild |
29 |
index d3c8bd2df7b..1081996ccfd 100644 |
30 |
--- a/xfce-base/thunar/thunar-1.6.12.ebuild |
31 |
+++ b/xfce-base/thunar/thunar-1.6.12.ebuild |
32 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2" |
33 |
LICENSE="GPL-2 LGPL-2" |
34 |
SLOT="0" |
35 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
36 |
-IUSE="+dbus exif libnotify pcre test udisks +xfce_plugins_trash" |
37 |
+IUSE="+dbus exif libnotify pcre test +trash-panel-plugin udisks" |
38 |
|
39 |
GVFS_DEPEND=">=gnome-base/gvfs-1.18.3" |
40 |
COMMON_DEPEND=">=dev-lang/perl-5.6 |
41 |
@@ -28,22 +28,22 @@ COMMON_DEPEND=">=dev-lang/perl-5.6 |
42 |
exif? ( >=media-libs/libexif-0.6.19:= ) |
43 |
libnotify? ( >=x11-libs/libnotify-0.7:= ) |
44 |
pcre? ( >=dev-libs/libpcre-6:= ) |
45 |
- udisks? ( virtual/libgudev:= ) |
46 |
- xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10:= )" |
47 |
+ trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) |
48 |
+ udisks? ( virtual/libgudev:= )" |
49 |
RDEPEND="${COMMON_DEPEND} |
50 |
>=dev-util/desktop-file-utils-0.20-r1 |
51 |
x11-misc/shared-mime-info |
52 |
dbus? ( ${GVFS_DEPEND} ) |
53 |
+ trash-panel-plugin? ( ${GVFS_DEPEND} ) |
54 |
udisks? ( |
55 |
virtual/udev |
56 |
${GVFS_DEPEND}[udisks,udev] |
57 |
- ) |
58 |
- xfce_plugins_trash? ( ${GVFS_DEPEND} )" |
59 |
+ )" |
60 |
DEPEND="${COMMON_DEPEND} |
61 |
dev-util/intltool |
62 |
sys-devel/gettext |
63 |
virtual/pkgconfig" |
64 |
-REQUIRED_USE="xfce_plugins_trash? ( dbus )" |
65 |
+REQUIRED_USE="trash-panel-plugin? ( dbus )" |
66 |
|
67 |
S=${WORKDIR}/${MY_P} |
68 |
|
69 |
@@ -56,7 +56,7 @@ src_configure() { |
70 |
$(use_enable libnotify notifications) |
71 |
$(use_enable exif) |
72 |
$(use_enable pcre) |
73 |
- $(use_enable xfce_plugins_trash tpa-plugin) |
74 |
+ $(use_enable trash-panel-plugin tpa-plugin) |
75 |
) |
76 |
|
77 |
econf "${myconf[@]}" |