commit: d692f30f1421cdb335c5278321dbebb0f06821ea Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Nov 15 21:43:12 2015 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Nov 15 22:29:52 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d692f30f
gnome-extra/cinnamon-control-center: Drop old Package-Manager: portage-2.2.24 gnome-extra/cinnamon-control-center/Manifest | 1 - .../cinnamon-control-center-2.4.2-r2.ebuild | 105 -------------------- .../cinnamon-control-center-2.4.2-r3.ebuild | 110 --------------------- .../cinnamon-control-center-2.6.0.ebuild | 100 ------------------- .../cinnamon-control-center-2.2.5-optional.patch | 93 ----------------- ...ntrol-center-2.4.2-networkmanager-version.patch | 46 --------- 6 files changed, 455 deletions(-) diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest index 7f2d57b..7d2f6dd 100644 --- a/gnome-extra/cinnamon-control-center/Manifest +++ b/gnome-extra/cinnamon-control-center/Manifest @@ -1,4 +1,3 @@ -DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621 DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84 DIST cinnamon-control-center-2.8.0.tar.gz 4090227 SHA256 ce4bca5044a65605c24d77118036394728c9bf4cfc424a4acf0e1f0c190f55bb SHA512 c3e5789dea3527310508bc51d2a7c4f9df8bb295419a6576075cc41471a53f7ca349de4946dc6df198706be1528caff7ad81b5c02619da98cdb7e383398905b1 WHIRLPOOL 32f1f52534e0697605f8dbce528558661e5ef6c8b517d371eceaa1c032a36b5c4232340fc8d66d85044adff09da52cdbd9e950ddcb42829de9012470bb32778b diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild deleted file mode 100644 index af72f34..0000000 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild +++ /dev/null @@ -1,105 +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 eutils gnome2 - -DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop" -HOMEPAGE="http://cinnamon.linuxmint.com/"; -SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups input_devices_wacom" -KEYWORDS="amd64 x86" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# FIXME: modemmanager is not optional -# networkmanager is not optional - -COMMON_DEPEND=" - >=dev-libs/glib-2.31:2 - dev-libs/libxml2:2 - >=gnome-base/libgnomekbd-2.91.91:0= - >=gnome-extra/cinnamon-desktop-1.0:0= - >=gnome-extra/cinnamon-menus-1.0:0= - >=gnome-extra/cinnamon-settings-daemon-1.0:0= - >=gnome-extra/nm-applet-0.9.8 - media-libs/fontconfig - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-1.1[glib] - >=net-misc/modemmanager-0.7 - >=net-misc/networkmanager-0.9.8[modemmanager] - >=sys-auth/polkit-0.103 - || ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils ) - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.4.1:3 - >=x11-libs/libnotify-0.7.3:0= - x11-libs/libX11 - x11-libs/libxklavier - colord? ( >=x11-misc/colord-0.1.8:0= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/gtk+-3.8:3 - >=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 ) - x11-themes/gnome-icon-theme - 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-extra/cinnamon-settings-daemon[input_devices_wacom] ) -" - -DEPEND="${COMMON_DEPEND} - app-text/iso-codes - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - - 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 optional - epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch - - # Fix NM version checking, bug #536850 - epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch - - epatch_user - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # --enable-systemd doesn't do anything in $PN-2.2.5 - gnome2_src_configure \ - --disable-update-mimedb \ - --disable-static \ - --enable-documentation \ - --without-libsocialweb \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(use_enable input_devices_wacom wacom) -} diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild deleted file mode 100644 index c0fc713..0000000 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild +++ /dev/null @@ -1,110 +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 eutils gnome2 - -DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop" -HOMEPAGE="http://cinnamon.linuxmint.com/"; -SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-2.6.0-pyongyang.tar.xz"; - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups input_devices_wacom" -KEYWORDS="amd64 x86" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# FIXME: modemmanager is not optional -# networkmanager is not optional - -COMMON_DEPEND=" - >=dev-libs/glib-2.31:2 - dev-libs/libxml2:2 - >=gnome-base/libgnomekbd-2.91.91:0= - >=gnome-extra/cinnamon-desktop-1.0:0= - >=gnome-extra/cinnamon-menus-1.0:0= - >=gnome-extra/cinnamon-settings-daemon-1.0:0= - >=gnome-extra/nm-applet-0.9.8 - media-libs/fontconfig - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-1.1[glib] - >=net-misc/modemmanager-0.7 - >=net-misc/networkmanager-0.9.8[modemmanager] - >=sys-auth/polkit-0.103 - || ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils ) - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.4.1:3 - >=x11-libs/libnotify-0.7.3:0= - x11-libs/libX11 - x11-libs/libxklavier - colord? ( >=x11-misc/colord-0.1.8:0= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/gtk+-3.8:3 - >=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 ) - x11-themes/gnome-icon-theme - 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-extra/cinnamon-settings-daemon[input_devices_wacom] ) -" - -DEPEND="${COMMON_DEPEND} - app-text/iso-codes - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - - 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 optional - epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch - - # Fix NM version checking, bug #536850 - epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch - - # North Korea causes build failure - cp "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.png panels/datetime/data/ || die - epatch "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.patch - - epatch_user - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # --enable-systemd doesn't do anything in $PN-2.2.5 - gnome2_src_configure \ - --disable-update-mimedb \ - --disable-static \ - --enable-documentation \ - --without-libsocialweb \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(use_enable input_devices_wacom wacom) -} diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild deleted file mode 100644 index 7b7384f..0000000 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild +++ /dev/null @@ -1,100 +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 eutils gnome2 - -DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop" -HOMEPAGE="http://cinnamon.linuxmint.com/"; -SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups input_devices_wacom" -KEYWORDS="~amd64 ~x86" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# FIXME: modemmanager is not optional -# networkmanager is not optional - -COMMON_DEPEND=" - >=dev-libs/glib-2.31:2 - dev-libs/libxml2:2 - >=gnome-base/libgnomekbd-2.91.91:0= - >=gnome-extra/cinnamon-desktop-1.0:0= - >=gnome-extra/cinnamon-menus-1.0:0= - >=gnome-extra/cinnamon-settings-daemon-1.0:0= - >=gnome-extra/nm-applet-0.9.8 - media-libs/fontconfig - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-1.1[glib] - >=net-misc/modemmanager-0.7 - >=net-misc/networkmanager-0.9.8[modemmanager] - >=sys-auth/polkit-0.103 - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.4.1:3 - >=x11-libs/libnotify-0.7.3:0= - x11-libs/libX11 - x11-libs/libxklavier - colord? ( >=x11-misc/colord-0.1.14:0= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/gtk+-3.8:3 - >=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 ) - x11-themes/gnome-icon-theme - 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-extra/cinnamon-settings-daemon[input_devices_wacom] ) -" - -DEPEND="${COMMON_DEPEND} - app-text/iso-codes - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - - 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 optional - epatch "${FILESDIR}"/${PN}-2.6.0-optional.patch - - epatch_user - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # --enable-systemd doesn't do anything in $PN-2.2.5 - gnome2_src_configure \ - --disable-static \ - --enable-documentation \ - --without-libsocialweb \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(use_enable input_devices_wacom wacom) -} diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch deleted file mode 100644 index e6a1f41..0000000 --- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index b900c53..0656e18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 - cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) - PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION - libxklavier >= 5.1 libgnomekbdui >= 2.91.91) -@@ -182,15 +181,51 @@ if test x"$enable_cups" != x"no" ; then - AC_SUBST(CUPS_LIBS) - fi - -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) -+ build_color=true -+fi -+if test "x$build_color" = xtrue ; then -+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) -+ - build_wacom=false --PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES -+AC_ARG_ENABLE(wacom, -+ AC_HELP_STRING([--disable-wacom], -+ [disable wacom management panel]), -+ [case "${enableval}" in -+ yes) WANT_WACOM=yes ;; -+ no) WANT_WACOM=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; -+ esac], -+ [WANT_WACOM=yes]) dnl Default value -+ -+if test x$WANT_WACOM = xyes; then -+ PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES - cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION - xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION - cinnamon-desktop -- gtk+-3.0 >= 3.8.0], -- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) -- -+ gtk+-3.0 >= 3.8.0]) -+ build_wacom="true" -+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])] -+fi - AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") -+AC_SUBST(WACOM_PANEL_CFLAGS) -+AC_SUBST(WACOM_PANEL_LIBS) - - # This is a hard-dependency for the region and user-accounts panels - PKG_CHECK_MODULES(ISOCODES, iso-codes) -diff --git a/panels/Makefile.am b/panels/Makefile.am -index ff8ea98..4a7fba7 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -3,7 +3,6 @@ NULL = - enabled_panels = \ - common \ - screen \ -- color \ - display \ - region \ - universal-access \ -@@ -15,6 +14,12 @@ enabled_panels = \ - - disabled_panels = $(NULL) - -+if BUILD_COLOR -+enabled_panels += color -+else -+disabled_panels += color -+endif -+ - if BUILD_WACOM - enabled_panels += wacom - else diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch deleted file mode 100644 index 7c2078f..0000000 --- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- panels/network/cc-network-panel.c.old 2015-01-17 16:35:04.395520484 +0100 -+++ panels/network/cc-network-panel.c 2015-01-17 16:36:11.706685966 +0100 -@@ -1311,30 +1311,18 @@ - 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; - } - -@@ -1381,8 +1369,9 @@ - { - 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);
