summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2015-08-17 22:31:50 -0400
committerAlexandre Rostovtsev <tetromino@gentoo.org>2015-08-17 22:31:50 -0400
commit527a634b8cb73e7c5bf6b99df3715028b205cd5d (patch)
treeac4803546b4183070a1b85578ee3db9045843045 /gnome-base/gnome-control-center
parentsys-kernel/ck-sources: Linux patch 4.1.6 (diff)
downloadgentoo-527a634b8cb73e7c5bf6b99df3715028b205cd5d.tar.gz
gentoo-527a634b8cb73e7c5bf6b99df3715028b205cd5d.tar.bz2
gentoo-527a634b8cb73e7c5bf6b99df3715028b205cd5d.zip
gnome-base/gnome-control-center: clean up old
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'gnome-base/gnome-control-center')
-rw-r--r--gnome-base/gnome-control-center/Manifest1
-rw-r--r--gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch63
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild166
3 files changed, 0 insertions, 230 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index a5d6744f3e39..73fca6c151f3 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b WHIRLPOOL 3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5
DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 66ffaf4b1eb0a745a2928035bc1b1e1eac7ea3775941e3a06bfb68ae4c1404c4 SHA512 ef9fa7a8d95bf37bce4e67521db7c35145f9de7bc9e5a9428d1aa0b0031698e38706529b509534e68dbc4cc8c54ba3482cf439e386fe64f3374432efa637512d WHIRLPOOL 15a83613f80cc3e236fd602d5c84a9a844a236de6556b742ee25147ccecfe207914cb2e4c1ac4029065a6bf19bd81ff8257cbd26163ad7df757849c2e0865f38
DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09 WHIRLPOOL e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch
deleted file mode 100644
index 40f09d89bf06..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Thu, 18 Dec 2014 08:04:00 +0100
-Subject: [PATCH] network: Also work with NM 1.0
-
-Remove the NetworkManager version checking altogether. The code was made
-to check for now very old versions of NetworkManager, and anything newer
-than ancient should degrade gracefully if we support newer features.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741661
----
- panels/network/cc-network-panel.c | 19 +++----------------
- 1 file changed, 3 insertions(+), 16 deletions(-)
-
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index 90b265e..28f6158 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -1321,30 +1321,17 @@ static gboolean
- panel_check_network_manager_version (CcNetworkPanel *panel)
- {
- const gchar *version;
-- gchar **split = NULL;
-- guint major = 0;
-- guint micro = 0;
-- guint minor = 0;
- gboolean ret = TRUE;
-
- /* parse running version */
- version = nm_client_get_version (panel->priv->client);
-- if (version != NULL) {
-- split = g_strsplit (version, ".", -1);
-- major = atoi (split[0]);
-- minor = atoi (split[1]);
-- micro = atoi (split[2]);
-- }
--
-- /* is it too new or old */
-- if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
-+ if (version == NULL) {
- ret = FALSE;
-
- /* do modal dialog in idle so we don't block startup */
- panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
- }
-
-- g_strfreev (split);
- return ret;
- }
-
-@@ -1391,8 +1378,8 @@ on_toplevel_map (GtkWidget *widget,
- {
- gboolean ret;
-
-- /* is the user compiling against a new version, but running an
-- * old daemon version? */
-+ /* is the user compiling against a new version, but not running
-+ * the daemon? */
- ret = panel_check_network_manager_version (panel);
- if (ret) {
- manager_running (panel->priv->client, NULL, panel);
---
-2.1.0 \ No newline at end of file
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
deleted file mode 100644
index 5dc401d3e31c..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools bash-completion-r1 eutils 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 +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~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
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.13:3
- >=gnome-base/gsettings-desktop-schemas-3.13.91
- >=gnome-base/gnome-desktop-3.11.3:3=
- >=gnome-base/gnome-settings-daemon-3.8.3[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=
-
- >=gnome-extra/nm-applet-0.9.7.995
- >=net-misc/networkmanager-0.9.8[modemmanager]
- >=net-misc/modemmanager-0.7.990
-
- 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.11.1:= )
- 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.2.6:0.2
- >=net-libs/gnome-online-accounts-3.9.90 )
- i18n? ( >=app-i18n/ibus-1.5.2 )
- kerberos? ( app-crypt/mit-krb5 )
- v4l? (
- media-libs/gstreamer:1.0
- 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}
- || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- >=sys-apps/accountsservice-0.6.30
- x11-themes/gnome-icon-theme-symbolic
- 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
-
- cups? ( sys-apps/sed )
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # Gentoo handles completions in a different directory, bugs #465094 and #477390
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- shell/Makefile.am || die "sed completiondir failed"
-
- # Make some panels and dependencies optional; requires eautoreconf
- # https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-
- # Fix some absolute paths to be appropriate for Gentoo
- epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
- # Fix NM version checking, bug #536224 (from 3.14 branch)
- epatch "${FILESDIR}"/${PN}-3.14.2-networkmanager-version.patch
-
- epatch_user
-
- eautoreconf
-
- # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
- # We need to touch timedated{c,h} to prevent them from being
- # regenerated (bug #415901)
- # Upstream think they should be removed, preventing compilation errors too
- # (https://bugzilla.gnome.org/704822)
- [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
- [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
-
- 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) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable i18n ibus) \
- $(use_enable kerberos) \
- $(use_with v4l cheese) \
- $(use_enable input_devices_wacom wacom)
-}