1 |
commit: d4f7329c9b59eab474d993bc17539b0a6cbfeb69 |
2 |
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 2 05:06:19 2020 +0000 |
4 |
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 2 05:55:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=d4f7329c |
7 |
|
8 |
mate-base/mate-control-center: Sync with ::gentoo |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> |
12 |
|
13 |
mate-base/mate-control-center/Manifest | 1 - |
14 |
...ebuild => mate-control-center-1.22.2-r1.ebuild} | 3 +- |
15 |
.../mate-control-center-1.22.2.ebuild | 70 ---------------------- |
16 |
...ebuild => mate-control-center-1.24.0-r1.ebuild} | 3 +- |
17 |
mate-base/mate-control-center/metadata.xml | 1 - |
18 |
5 files changed, 3 insertions(+), 75 deletions(-) |
19 |
|
20 |
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest |
21 |
index 2a1fe01..15a7d50 100644 |
22 |
--- a/mate-base/mate-control-center/Manifest |
23 |
+++ b/mate-base/mate-control-center/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
-DIST mate-control-center-1.22.1.tar.xz 1445012 BLAKE2B 2dc129280510432c25d158d6acdb50e58dfffd2e027fade545459669a6e6dbeafc4efe2cc81e19483427ec563daee903e2422e61ee398c88fec566cd80842639 SHA512 92390bf5eea459effbd94f0488cdaf3d7b6ff4f548f1aafead928d75e064e85ec1ac7796289f96af2ca8f6cbf3ef57bd2ae37058192af0ec976f4770ec8abeca |
26 |
DIST mate-control-center-1.22.2.tar.xz 1614216 BLAKE2B cb6dfe509740b2bedc036e849c85f9b752a56310fffe1bb31a19edfd428b3e2e35bf3a5bff9d83e3b72fc05f7bbd97bccd003340bfcb8cb43e9b6964a63957e8 SHA512 994563b8970ebf51ba44afe49122e82ff67fdb6c78ab2e8175acc6f619d40a82284cbafc1d61b89b25ac9e8488b00f63433eda94118d40a4fbff0d644ae1ddd5 |
27 |
DIST mate-control-center-1.24.0.tar.xz 3488572 BLAKE2B 683b3326deeacf3f47a8ca3201de66a492cac022ae341dfc54cdc97c9a5260e223a082a3dd899b31680e4a8e5b3237d0338c7fd8125468f75e1b00b4e6a130c7 SHA512 78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce |
28 |
|
29 |
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild |
30 |
similarity index 97% |
31 |
rename from mate-base/mate-control-center/mate-control-center-1.22.1.ebuild |
32 |
rename to mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild |
33 |
index 4ba72e7..32b3570 100644 |
34 |
--- a/mate-base/mate-control-center/mate-control-center-1.22.1.ebuild |
35 |
+++ b/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild |
36 |
@@ -44,10 +44,9 @@ RDEPEND=" |
37 |
>=x11-libs/libXi-1.5 |
38 |
x11-libs/libXrandr |
39 |
x11-libs/libXrender |
40 |
- x11-libs/libXxf86misc |
41 |
>=x11-libs/libxklavier-4 |
42 |
x11-libs/pango |
43 |
- >=x11-wm/marco-1.17.0 |
44 |
+ >=x11-wm/marco-1.17.0:= |
45 |
virtual/libintl |
46 |
accountsservice? ( sys-apps/accountsservice ) |
47 |
appindicator? ( dev-libs/libappindicator:3 )" |
48 |
|
49 |
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild |
50 |
deleted file mode 100644 |
51 |
index 6e0e3e4..0000000 |
52 |
--- a/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild |
53 |
+++ /dev/null |
54 |
@@ -1,70 +0,0 @@ |
55 |
-# Copyright 1999-2020 Gentoo Authors |
56 |
-# Distributed under the terms of the GNU General Public License v2 |
57 |
- |
58 |
-EAPI=6 |
59 |
- |
60 |
-MATE_LA_PUNT="yes" |
61 |
- |
62 |
-inherit mate |
63 |
- |
64 |
-if [[ ${PV} != 9999 ]]; then |
65 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
66 |
-fi |
67 |
- |
68 |
-DESCRIPTION="The MATE Desktop configuration tool" |
69 |
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND" |
70 |
-SLOT="0" |
71 |
- |
72 |
-IUSE="accountsservice appindicator debug" |
73 |
- |
74 |
-RDEPEND=" |
75 |
- dev-libs/atk |
76 |
- >=dev-libs/dbus-glib-0.73 |
77 |
- >=dev-libs/glib-2.50:2 |
78 |
- dev-libs/libxml2:2 |
79 |
- >=gnome-base/dconf-0.13.4 |
80 |
- >=gnome-base/librsvg-2.0:2 |
81 |
- >=mate-base/libmatekbd-1.17.0 |
82 |
- >=mate-base/mate-desktop-1.21.2 |
83 |
- >=mate-base/caja-1.20.0 |
84 |
- >=mate-base/mate-menus-1.21.0 |
85 |
- >=mate-base/mate-settings-daemon-1.21.2 |
86 |
- >=media-libs/fontconfig-1:1.0 |
87 |
- media-libs/freetype:2 |
88 |
- media-libs/libcanberra:0[gtk3] |
89 |
- >=sys-apps/dbus-1 |
90 |
- x11-apps/xmodmap |
91 |
- x11-libs/cairo |
92 |
- x11-libs/gdk-pixbuf:2 |
93 |
- >=x11-libs/gtk+-3.22:3 |
94 |
- x11-libs/libX11 |
95 |
- x11-libs/libXScrnSaver |
96 |
- x11-libs/libXcursor |
97 |
- x11-libs/libXext |
98 |
- >=x11-libs/libXi-1.5 |
99 |
- x11-libs/libXrandr |
100 |
- x11-libs/libXrender |
101 |
- >=x11-libs/libxklavier-4 |
102 |
- x11-libs/pango |
103 |
- >=x11-wm/marco-1.17.0 |
104 |
- virtual/libintl |
105 |
- accountsservice? ( sys-apps/accountsservice ) |
106 |
- appindicator? ( dev-libs/libappindicator:3 )" |
107 |
- |
108 |
-DEPEND="${RDEPEND} |
109 |
- app-text/rarian |
110 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
111 |
- app-text/yelp-tools |
112 |
- dev-util/desktop-file-utils |
113 |
- dev-util/glib-utils |
114 |
- >=dev-util/intltool-0.50.1 |
115 |
- sys-devel/gettext |
116 |
- x11-base/xorg-proto |
117 |
- virtual/pkgconfig" |
118 |
- |
119 |
-src_configure() { |
120 |
- mate_src_configure \ |
121 |
- --disable-update-mimedb \ |
122 |
- $(use_enable appindicator) \ |
123 |
- $(use_enable debug) |
124 |
-} |
125 |
|
126 |
diff --git a/mate-base/mate-control-center/mate-control-center-1.24.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.24.0-r1.ebuild |
127 |
similarity index 96% |
128 |
rename from mate-base/mate-control-center/mate-control-center-1.24.0.ebuild |
129 |
rename to mate-base/mate-control-center/mate-control-center-1.24.0-r1.ebuild |
130 |
index ccc6fa3..72e4053 100644 |
131 |
--- a/mate-base/mate-control-center/mate-control-center-1.24.0.ebuild |
132 |
+++ b/mate-base/mate-control-center/mate-control-center-1.24.0-r1.ebuild |
133 |
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes" |
134 |
inherit mate |
135 |
|
136 |
if [[ ${PV} != 9999 ]]; then |
137 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
138 |
+ KEYWORDS="amd64 ~arm ~arm64 x86" |
139 |
fi |
140 |
|
141 |
DESCRIPTION="The MATE Desktop configuration tool" |
142 |
@@ -64,6 +64,7 @@ DEPEND="${RDEPEND} |
143 |
|
144 |
src_configure() { |
145 |
mate_src_configure \ |
146 |
+ --disable-static \ |
147 |
--disable-update-mimedb \ |
148 |
$(use_enable appindicator) \ |
149 |
$(use_enable debug) |
150 |
|
151 |
diff --git a/mate-base/mate-control-center/metadata.xml b/mate-base/mate-control-center/metadata.xml |
152 |
index ddbd22a..d28d3d1 100644 |
153 |
--- a/mate-base/mate-control-center/metadata.xml |
154 |
+++ b/mate-base/mate-control-center/metadata.xml |
155 |
@@ -7,7 +7,6 @@ |
156 |
</maintainer> |
157 |
<use> |
158 |
<flag name="accountsservice">Add support for AccountsService</flag> |
159 |
- <flag name="appindicator">Add support for AppIndicator</flag> |
160 |
</use> |
161 |
<upstream> |
162 |
<remote-id type="github">mate-desktop/mate-control-center</remote-id> |