commit: 0fb265d615bb04783479521d2ef9f834ac1610c5 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Feb 4 13:24:56 2017 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Feb 4 13:28:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb265d6
gnome-base/gnome-control-center: Clean samba deps now that samba-3 was removed due to security issues, this also solves #604030 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../gnome-control-center-3.20.1.ebuild | 152 --------------------- ...build => gnome-control-center-3.20.2-r1.ebuild} | 2 +- ...build => gnome-control-center-3.22.1-r1.ebuild} | 5 +- 3 files changed, 2 insertions(+), 157 deletions(-) diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild deleted file mode 100644 index cc5e903..00000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools bash-completion-r1 gnome2 - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"; - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 -# kerberos unfortunately means mit-krb5; build fails with heimdal -# udev could be made optional, only conditions gsd-device-panel -# (mouse, keyboards, touchscreen, etc) -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.20.3:3[X,wayland?] - >=gnome-base/gsettings-desktop-schemas-3.19.3 - >=gnome-base/gnome-desktop-3.19.93:3= - >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] - - >=dev-libs/libpwquality-1.2.2 - dev-libs/libxml2:2 - gnome-base/libgtop:2= - media-libs/fontconfig - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99:= - >=x11-libs/libnotify-0.7.3:0= - - virtual/libgudev - virtual/opengl - x11-apps/xmodmap - x11-libs/cairo - x11-libs/libX11 - x11-libs/libXxf86misc - >=x11-libs/libXi-1.2 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - colord? ( - net-libs/libsoup:2.4 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/colord-gtk-0.1.24 ) - cups? ( - >=net-print/cups-1.4[dbus] - || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) - gnome-online-accounts? ( - >=media-libs/grilo-0.3.0:0.3= - >=net-libs/gnome-online-accounts-3.15.1:= ) - i18n? ( >=app-i18n/ibus-1.5.2 ) - kerberos? ( app-crypt/mit-krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-0.9.7.995 - >=net-misc/networkmanager-0.9.8:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - v4l? ( - media-libs/clutter-gtk:1.0 - >=media-video/cheese-3.5.91 ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=media-libs/clutter-1.11.3:1.0 - media-libs/clutter-gtk:1.0 - >=x11-libs/libXi-1.2 ) -" -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x -# libgnomekbd needed only for gkbd-keyboard-display tool -RDEPEND="${COMMON_DEPEND} - || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) - >=sys-apps/accountsservice-0.6.39 - x11-themes/adwaita-icon-theme - colord? ( >=gnome-extra/gnome-color-manager-3 ) - cups? ( - app-admin/system-config-printer - net-print/cups-pk-helper ) - input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) - i18n? ( >=gnome-base/libgnomekbd-3 ) - - !<gnome-base/gdm-2.91.94 - !<gnome-extra/gnome-color-manager-3.1.2 - !gnome-extra/gnome-media[pulseaudio] - !<gnome-extra/gnome-media-2.32.0-r300 - !<net-wireless/gnome-bluetooth-3.3.2 -" -# PDEPEND to avoid circular dependency -PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" - -DEPEND="${COMMON_DEPEND} - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gnome-base/gnome-common -" -# Needed for autoreconf -# gnome-base/gnome-common - -src_prepare() { - # Make some panels and dependencies optional; requires eautoreconf - # https://bugzilla.gnome.org/686840, 697478, 700145 - eapply "${FILESDIR}"/${PN}-3.20.0-optional.patch - eapply "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch - eapply "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch - eapply "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch - - # Fix some absolute paths to be appropriate for Gentoo - eapply "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-update-mimedb \ - --disable-static \ - --enable-documentation \ - $(use_enable bluetooth) \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable i18n ibus) \ - $(use_enable kerberos) \ - $(use_enable networkmanager) \ - $(use_with v4l cheese) \ - $(use_enable input_devices_wacom wacom) \ - $(use_enable wayland) -} - -src_install() { - gnome2_src_install completiondir="$(get_bashcompdir)" -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.20.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild similarity index 98% rename from gnome-base/gnome-control-center/gnome-control-center-3.20.2.ebuild rename to gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild index 5ed410b..a9db42d 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.20.2.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild @@ -57,7 +57,7 @@ COMMON_DEPEND=" >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] - || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) + >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.15.1:= ) diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.1-r1.ebuild similarity index 97% rename from gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild rename to gnome-base/gnome-control-center/gnome-control-center-3.22.1-r1.ebuild index 3e0675e..96d45c0 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.1-r1.ebuild @@ -56,10 +56,7 @@ COMMON_DEPEND=" >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] - || ( - ( >=net-fs/samba-3.6.14-r1[smbclient] <net-fs/samba-4.0.0[smbclient] ) - >=net-fs/samba-4.0.0[client] - ) + >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3=
