commit: a5ed677994d8e32814b2e5f50a035f54e75e0756 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Feb 3 19:50:39 2018 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Feb 3 20:54:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ed6779
gnome-base/gnome-control-center: remove old Package-Manager: Portage-2.3.19, Repoman-2.3.6 gnome-base/gnome-control-center/Manifest | 3 - .../gnome-control-center-3.22.2-r1.ebuild | 164 -------------------- .../gnome-control-center-3.24.2.ebuild | 166 --------------------- 3 files changed, 333 deletions(-) diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 671fac40e8e..d48c3d2524f 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,5 +1,2 @@ -DIST gnome-control-center-3.22.2-patchset.tar.xz 8204 BLAKE2B 5e0c32a2bc48d620def362967ec064772060f9a7d313998c2e970485ff99daf61841532335cb6fa987cf9319a5142b6731173fe400e5081df73ea505e4688dda SHA512 f20b4e53f82fcf31c635aa070e1af7f69a125eb4f67b1ac9e1e9f594da4649031d9e4cc6021a674abfee0046fe1af944f73ed68451db9fc7b168dcd6e765afe7 -DIST gnome-control-center-3.22.2.tar.xz 7277380 BLAKE2B 0966189d3f1e791e11920261bfc37c6ae77af0a4f312263b6623850becd3ba1ad22e886d6a96cc3cdfccc492dc998c6891d583ce8d55f9a4e08daa5de829f55e SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a DIST gnome-control-center-3.24.2-patchset.tar.xz 8496 BLAKE2B 8bdbfcef3917ec12e82e7a5ea163f14954f9793b806c4a827620d1f693220527540f1b8a8ac0f121dae0bc8fc687f1974544b35cccd0b9e50474386c28d9ddbf SHA512 967258cf003c013881a2555be7624bad227d898cff72fe2899243692f7a06730e5dc79a849728cce6f9a7234a74b2b8433d1689c2846e8389eb9813fe5df1da1 -DIST gnome-control-center-3.24.2.tar.xz 7269112 BLAKE2B 41049a7176eb3de146d8ac8034cce9cdc7365eec11f6db9a1bd21964c5a30b73c22debcd48058ad72cf6ac24bf60e1956ec203502a3dadcceb83350461302387 SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0 DIST gnome-control-center-3.24.3.tar.xz 7302120 BLAKE2B 026ad3bb34c2bfc2f7a6d398a3c47bc3f620a3f947a0cb43336b437b4926e7a360e287d6020dc0e82eda43955cfb38ffcd7ed94593adac119d7413f63bc437c8 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild deleted file mode 100644 index 0ac1e28bd66..00000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit 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/"; -SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"; - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh 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.22.0:3[X,wayland?] - >=gnome-base/gsettings-desktop-schemas-3.21.4 - >=gnome-base/gnome-desktop-3.21.2: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 - >=sys-apps/accountsservice-0.6.39 - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99:= - - virtual/libgudev - 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-4.0.0[client] - ) - gnome-online-accounts? ( - >=media-libs/grilo-0.3.0:0.3= - >=net-libs/gnome-online-accounts-3.21.5:= ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - kerberos? ( app-crypt/mit-krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-1.2.0 - >=net-misc/networkmanager-1.2.0:=[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 -# -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 -# Also we need newer driver versions to allow wacom and libinput drivers to -# not collide -# -# system-config-printer provides org.fedoraproject.Config.Printing service and interface -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy -RDEPEND="${COMMON_DEPEND} - || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) - 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] ) - >=gnome-base/libgnomekbd-3 - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) - - !<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 - sys-devel/autoconf-archive -" -# Needed for autoreconf -# gnome-base/gnome-common -# sys-devel/autoconf-archive - -PATCHES=( - # From gnome-3-22 branch - "${WORKDIR}"/${P}-patchset/${PV}-fix-build-without-wayland.patch # bug 613192 - "${WORKDIR}"/${P}-patchset/${PV}-fix-dual-gpu-crash.patch - # Make some panels and dependencies optional; requires eautoreconf - # https://bugzilla.gnome.org/686840, 697478, 700145 - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-optional.patch - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-wayland-optional.patch - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-keep-panels-optional.patch - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-networkmanager-optional.patch - # Fix some absolute paths to be appropriate for Gentoo - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-gentoo-paths.patch -) - -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 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.24.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild deleted file mode 100644 index 55324932108..00000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit 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/"; -SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"; - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~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) -# display panel requires colord -# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.22.0:3[X,wayland?] - >=gnome-base/gsettings-desktop-schemas-3.21.4 - >=gnome-base/gnome-desktop-3.21.2:3= - >=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit] - >=x11-misc/colord-0.1.34:0= - - >=dev-libs/libpwquality-1.2.2 - dev-libs/libxml2:2 - gnome-base/libgtop:2= - media-libs/fontconfig - >=sys-apps/accountsservice-0.6.39 - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99:= - - virtual/libgudev - 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-4.0.0[client] - ) - gnome-online-accounts? ( - >=media-libs/grilo-0.3.0:0.3= - >=net-libs/gnome-online-accounts-3.21.5:= ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - kerberos? ( app-crypt/mit-krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-1.2.0 - >=net-misc/networkmanager-1.2.0:=[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 -# -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 -# Also we need newer driver versions to allow wacom and libinput drivers to -# not collide -# -# system-config-printer provides org.fedoraproject.Config.Printing service and interface -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy -RDEPEND="${COMMON_DEPEND} - || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) - 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] ) - >=gnome-base/libgnomekbd-3 - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) - - !<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 - sys-devel/autoconf-archive -" -# Needed for autoreconf -# gnome-base/gnome-common -# sys-devel/autoconf-archive - -PATCHES=( - # Make some panels and dependencies optional; requires eautoreconf - # https://bugzilla.gnome.org/686840, 697478, 700145 - "${WORKDIR}"/${P}-patchset/${PV}-optional.patch - "${WORKDIR}"/${P}-patchset/${PV}-optional-wayland.patch - "${WORKDIR}"/${P}-patchset/${PV}-optional-networkmanager.patch - "${WORKDIR}"/${P}-patchset/${PV}-optional-cups.patch - # Fix some absolute paths to be appropriate for Gentoo - "${WORKDIR}"/${P}-patchset/${PV}-gentoo-paths.patch - # https://bugzilla.gnome.org/show_bug.cgi?id=780544 - "${WORKDIR}"/${P}-patchset/${PV}-fix-without-gdkwayland.patch -) - -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 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)" -}
