1 |
commit: 27aea9404919e449d84c8e3f1f24746aac44de45 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 26 22:19:35 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 26 23:45:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=27aea940 |
7 |
|
8 |
app-arch/file-roller: sync live ebuild and metadata.xml |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
Manifest-Sign-Key: 0x5A56C8CD0C13248A |
12 |
|
13 |
app-arch/file-roller/file-roller-9999.ebuild | 39 ++++++++++++---------------- |
14 |
app-arch/file-roller/metadata.xml | 6 ++--- |
15 |
2 files changed, 19 insertions(+), 26 deletions(-) |
16 |
|
17 |
diff --git a/app-arch/file-roller/file-roller-9999.ebuild b/app-arch/file-roller/file-roller-9999.ebuild |
18 |
index 9b688a8d..a6ec9188 100644 |
19 |
--- a/app-arch/file-roller/file-roller-9999.ebuild |
20 |
+++ b/app-arch/file-roller/file-roller-9999.ebuild |
21 |
@@ -1,26 +1,24 @@ |
22 |
-# Copyright 1999-2015 Gentoo Foundation |
23 |
+# Copyright 1999-2018 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
|
27 |
-EAPI="5" |
28 |
-GCONF_DEBUG="no" |
29 |
+EAPI=6 |
30 |
GNOME2_LA_PUNT="yes" |
31 |
|
32 |
-inherit eutils gnome2 readme.gentoo |
33 |
+inherit gnome2 readme.gentoo-r1 |
34 |
if [[ ${PV} = 9999 ]]; then |
35 |
inherit gnome2-live |
36 |
fi |
37 |
|
38 |
DESCRIPTION="Archive manager for GNOME" |
39 |
-HOMEPAGE="http://fileroller.sourceforge.net/ https://wiki.gnome.org/Apps/FileRoller" |
40 |
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller" |
41 |
|
42 |
LICENSE="GPL-2+ CC-BY-SA-3.0" |
43 |
SLOT="0" |
44 |
-IUSE="nautilus packagekit" |
45 |
+IUSE="libnotify nautilus packagekit" |
46 |
if [[ ${PV} = 9999 ]]; then |
47 |
KEYWORDS="" |
48 |
else |
49 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" |
50 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
51 |
fi |
52 |
|
53 |
# gdk-pixbuf used extensively in the source |
54 |
@@ -31,17 +29,19 @@ RDEPEND=" |
55 |
>=dev-libs/glib-2.36:2 |
56 |
>=dev-libs/json-glib-0.14 |
57 |
>=x11-libs/gtk+-3.13.2:3 |
58 |
- >=x11-libs/libnotify-0.4.3:= |
59 |
sys-apps/file |
60 |
x11-libs/cairo |
61 |
x11-libs/gdk-pixbuf:2 |
62 |
x11-libs/pango |
63 |
- nautilus? ( >=gnome-base/nautilus-3 ) |
64 |
+ libnotify? ( >=x11-libs/libnotify-0.4.3:= ) |
65 |
+ nautilus? ( >=gnome-base/nautilus-2.22.2 ) |
66 |
packagekit? ( app-admin/packagekit-base ) |
67 |
" |
68 |
+# libxml2+gdk-pixbuf required for glib-compile-resources |
69 |
DEPEND="${RDEPEND} |
70 |
- dev-util/desktop-file-utils |
71 |
- >=dev-util/intltool-0.40.0 |
72 |
+ dev-libs/libxml2 |
73 |
+ >=dev-util/intltool-0.50.1 |
74 |
+ dev-util/itstool |
75 |
sys-devel/gettext |
76 |
virtual/pkgconfig |
77 |
" |
78 |
@@ -67,26 +67,19 @@ iso - app-cdr/cdrtools |
79 |
jar,zip - app-arch/zip and app-arch/unzip |
80 |
lha - app-arch/lha |
81 |
lzop - app-arch/lzop |
82 |
+lz4 - app-arch/lz4 |
83 |
rar - app-arch/unrar or app-arch/unar |
84 |
rpm - app-arch/rpm |
85 |
unstuff - app-arch/stuffit |
86 |
zoo - app-arch/zoo" |
87 |
|
88 |
src_prepare() { |
89 |
- # Use absolute path to GNU tar since star doesn't have the same |
90 |
- # options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar |
91 |
- epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch |
92 |
- |
93 |
# File providing Gentoo package names for various archivers |
94 |
- cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die |
95 |
- |
96 |
+ cp -f "${FILESDIR}"/3.22-packages.match data/packages.match || die |
97 |
gnome2_src_prepare |
98 |
} |
99 |
|
100 |
src_configure() { |
101 |
- local myconf="" |
102 |
- [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)" |
103 |
- DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO" |
104 |
# --disable-debug because enabling it adds -O0 to CFLAGS |
105 |
gnome2_src_configure \ |
106 |
--disable-run-in-place \ |
107 |
@@ -94,9 +87,9 @@ src_configure() { |
108 |
--disable-debug \ |
109 |
--enable-magic \ |
110 |
--enable-libarchive \ |
111 |
+ $(use_enable libnotify notification) \ |
112 |
$(use_enable nautilus nautilus-actions) \ |
113 |
- $(use_enable packagekit) \ |
114 |
- ${myconf} |
115 |
+ $(use_enable packagekit) |
116 |
} |
117 |
|
118 |
src_install() { |
119 |
|
120 |
diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml |
121 |
index a1511def..fee03a0b 100644 |
122 |
--- a/app-arch/file-roller/metadata.xml |
123 |
+++ b/app-arch/file-roller/metadata.xml |
124 |
@@ -6,13 +6,13 @@ |
125 |
<name>Gentoo GNOME Desktop</name> |
126 |
</maintainer> |
127 |
<use> |
128 |
- <flag name="nautilus">Enable file-roller to integrate with |
129 |
- <pkg>gnome-base/nautilus</pkg> by providing entries in its context |
130 |
- menu</flag> |
131 |
+ <flag name="nautilus">Build contextual menu extension for |
132 |
+ <pkg>gnome-base/nautilus</pkg>.</flag> |
133 |
<flag name="packagekit">Enable support for the distro-neutral package |
134 |
manager GUI <pkg>app-admin/packagekit</pkg></flag> |
135 |
</use> |
136 |
<upstream> |
137 |
<remote-id type="sourceforge">fileroller</remote-id> |
138 |
+ <remote-id type="cpe">cpe:/a:paolo_bacchilega:file_roller</remote-id> |
139 |
</upstream> |
140 |
</pkgmetadata> |