Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/
Date: Fri, 28 Sep 2018 17:59:04
Message-Id: 1538084517.2df2b35cd47445e75f857d1c050e1c581742b891.leio@gentoo
1 commit: 2df2b35cd47445e75f857d1c050e1c581742b891
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 27 21:41:57 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 27 21:41:57 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2df2b35c
7
8 gnome-base/gnome-control-center: remove, moved to ::gentoo
9
10 .../gnome-control-center-3.26.2-r1.ebuild | 157 ---------------------
11 gnome-base/gnome-control-center/metadata.xml | 16 ---
12 2 files changed, 173 deletions(-)
13
14 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
15 deleted file mode 100644
16 index ab4f3f3c..00000000
17 --- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
18 +++ /dev/null
19 @@ -1,157 +0,0 @@
20 -# Copyright 1999-2018 Gentoo Authors
21 -# Distributed under the terms of the GNU General Public License v2
22 -
23 -EAPI=6
24 -GNOME2_LA_PUNT="yes"
25 -GNOME2_EAUTORECONF="yes"
26 -
27 -inherit bash-completion-r1 gnome2
28 -
29 -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
30 -HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
31 -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
32 -
33 -LICENSE="GPL-2+"
34 -SLOT="2"
35 -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
36 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
37 -
38 -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
39 -# g-s-d[policykit] needed for bug #403527
40 -# kerberos unfortunately means mit-krb5; build fails with heimdal
41 -# udev could be made optional, only conditions gsd-device-panel
42 -# (mouse, keyboards, touchscreen, etc)
43 -# display panel requires colord and gnome-settings-daemon[colord]
44 -# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
45 -COMMON_DEPEND="
46 - >=dev-libs/glib-2.53.0:2[dbus]
47 - >=x11-libs/gdk-pixbuf-2.23.0:2
48 - >=x11-libs/gtk+-3.22.0:3[X,wayland?]
49 - >=gnome-base/gsettings-desktop-schemas-3.21.4
50 - >=gnome-base/gnome-desktop-3.21.2:3=
51 - >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit]
52 - >=x11-misc/colord-0.1.34:0=
53 -
54 - >=dev-libs/libpwquality-1.2.2
55 - dev-libs/libxml2:2
56 - gnome-base/libgtop:2=
57 - media-libs/fontconfig
58 - >=sys-apps/accountsservice-0.6.39
59 -
60 - >=media-libs/libcanberra-0.13[gtk3]
61 - >=media-sound/pulseaudio-2[glib]
62 - >=sys-auth/polkit-0.97
63 - >=sys-power/upower-0.99:=
64 -
65 - virtual/libgudev
66 - x11-apps/xmodmap
67 - x11-libs/cairo
68 - x11-libs/libX11
69 - x11-libs/libXxf86misc
70 - >=x11-libs/libXi-1.2
71 -
72 - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
73 - colord? (
74 - net-libs/libsoup:2.4
75 - >=x11-misc/colord-0.1.34:0=
76 - >=x11-libs/colord-gtk-0.1.24 )
77 - cups? (
78 - >=net-print/cups-1.7[dbus]
79 - >=net-fs/samba-4.0.0[client]
80 - )
81 - gnome-online-accounts? (
82 - >=media-libs/grilo-0.3.0:0.3=
83 - >=net-libs/gnome-online-accounts-3.25.3:= )
84 - ibus? ( >=app-i18n/ibus-1.5.2 )
85 - kerberos? ( app-crypt/mit-krb5 )
86 - networkmanager? (
87 - >=gnome-extra/nm-applet-1.2.0
88 - >=net-misc/networkmanager-1.2.0:=[modemmanager]
89 - >=net-misc/modemmanager-0.7.990 )
90 - v4l? (
91 - media-libs/clutter-gtk:1.0
92 - >=media-video/cheese-3.5.91 )
93 - input_devices_wacom? (
94 - >=dev-libs/libwacom-0.7
95 - >=media-libs/clutter-1.11.3:1.0
96 - media-libs/clutter-gtk:1.0
97 - >=x11-libs/libXi-1.2 )
98 -"
99 -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
100 -# libgnomekbd needed only for gkbd-keyboard-display tool
101 -#
102 -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
103 -# Also we need newer driver versions to allow wacom and libinput drivers to
104 -# not collide
105 -#
106 -# system-config-printer provides org.fedoraproject.Config.Printing service and interface
107 -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
108 -RDEPEND="${COMMON_DEPEND}
109 - || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
110 - x11-themes/adwaita-icon-theme
111 - colord? ( >=gnome-extra/gnome-color-manager-3 )
112 - cups? (
113 - app-admin/system-config-printer
114 - net-print/cups-pk-helper )
115 - input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
116 - >=gnome-base/libgnomekbd-3
117 - wayland? ( dev-libs/libinput )
118 - !wayland? (
119 - >=x11-drivers/xf86-input-libinput-0.19.0
120 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
121 -
122 - !<gnome-base/gdm-2.91.94
123 - !<gnome-extra/gnome-color-manager-3.1.2
124 - !gnome-extra/gnome-media[pulseaudio]
125 - !<gnome-extra/gnome-media-2.32.0-r300
126 - !<net-wireless/gnome-bluetooth-3.3.2
127 -"
128 -# PDEPEND to avoid circular dependency
129 -PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
130 -
131 -DEPEND="${COMMON_DEPEND}
132 - x11-base/xorg-proto
133 -
134 - dev-libs/libxml2:2
135 - dev-libs/libxslt
136 - dev-util/glib-utils
137 - >=dev-util/intltool-0.40.1
138 - >=sys-devel/gettext-0.17
139 - virtual/pkgconfig
140 -
141 - gnome-base/gnome-common
142 - sys-devel/autoconf-archive
143 -"
144 -# Needed for autoreconf
145 -# gnome-base/gnome-common
146 -# sys-devel/autoconf-archive
147 -
148 -PATCHES=(
149 - # Lots of patches from gnome-3-26 branch on top of 3.26.2
150 - # Makes some panels and dependencies optional; requires eautoreconf
151 - # https://bugzilla.gnome.org/686840, 697478, 700145
152 - # Fix some absolute paths to be appropriate for Gentoo
153 - "${WORKDIR}"/patches/
154 -)
155 -
156 -src_configure() {
157 - gnome2_src_configure \
158 - --disable-update-mimedb \
159 - --disable-static \
160 - --enable-documentation \
161 - $(use_enable bluetooth) \
162 - $(use_enable colord color) \
163 - $(use_enable cups) \
164 - $(usex debug --enable-debug=yes ' ') \
165 - $(use_enable gnome-online-accounts goa) \
166 - $(use_enable ibus) \
167 - $(use_enable kerberos) \
168 - $(use_enable networkmanager) \
169 - $(use_with v4l cheese) \
170 - $(use_enable input_devices_wacom wacom) \
171 - $(use_enable wayland)
172 -}
173 -
174 -src_install() {
175 - gnome2_src_install completiondir="$(get_bashcompdir)"
176 -}
177
178 diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
179 deleted file mode 100644
180 index 4e408626..00000000
181 --- a/gnome-base/gnome-control-center/metadata.xml
182 +++ /dev/null
183 @@ -1,16 +0,0 @@
184 -<?xml version="1.0" encoding="UTF-8"?>
185 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
186 -<pkgmetadata>
187 - <maintainer type="project">
188 - <email>gnome@g.o</email>
189 - <name>Gentoo GNOME Desktop</name>
190 - </maintainer>
191 - <use>
192 - <flag name="colord">Support color management using
193 - <pkg>x11-misc/colord</pkg></flag>
194 - <flag name="gnome-online-accounts">Enable configuration panel for
195 - <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
196 - <flag name="ibus">Enable support for enhanced input methods through
197 - <pkg>app-i18n/ibus</pkg></flag>
198 - </use>
199 -</pkgmetadata>