commit: c5df152887a3531158b277c4b93d1da877749dc7 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Jun 25 15:05:45 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Jun 25 16:26:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5df1528
gnome-extra/cinnamon-control-center: Drop old Package-Manager: portage-2.3.0_rc1 gnome-extra/cinnamon-control-center/Manifest | 2 - .../cinnamon-control-center-2.6.0-r1.ebuild | 107 --------------------- .../cinnamon-control-center-2.6.0-optional.patch | 99 ------------------- 3 files changed, 208 deletions(-) diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest index a298eb0..74c10e5 100644 --- a/gnome-extra/cinnamon-control-center/Manifest +++ b/gnome-extra/cinnamon-control-center/Manifest @@ -1,3 +1 @@ -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.1.tar.gz 4090162 SHA256 595076ef89949c31357cd45f41818df1f6b7350a2b810f107e0b88cd9870e273 SHA512 e0f21bc29128b56d2024ea5bd9dff70a917259437804f4aad0942ee1313090b70e6811d1b54513b4639c0bff0230efcb2847a42fcf9ad183b24a3cbfeda976de WHIRLPOOL 47d3255eeddd782fb5c87ff82ed5d8ab8588b8066b9da9344abcfa259d0b481e06f676cefa43563f28ddc75d2c8112b30712b4ae52f750e03f779b1a73108c7b diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild deleted file mode 100644 index 3eab01b..0000000 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild +++ /dev/null @@ -1,107 +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 - >=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 - - app-arch/xz-utils -" -# Needed for autoreconf -# gnome-base/gnome-common - -src_prepare() { - # make some panels optional - epatch "${FILESDIR}"/${PN}-2.6.0-optional.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-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.6.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch deleted file mode 100644 index b76405c..0000000 --- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 144bf78..a83e1eb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11) - PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) - - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14) - PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION - libxklavier >= 5.1 libgnomekbdui >= 2.91.91) -@@ -197,15 +196,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.14) -+ 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) -@@ -408,6 +443,13 @@ fi - #else - # AC_MSG_NOTICE([ Using ConsoleKit for session tracking]) - #fi -+ -+if test "x$build_color" = "xtrue"; then -+ AC_MSG_NOTICE([** Colord support (Color management panel)]) -+else -+ AC_MSG_NOTICE([ Colord support disabled]) -+fi -+ - if test "x$build_wacom" = "xtrue"; then - AC_MSG_NOTICE([** Wacom support (Wacom panel)]) - else -diff --git a/panels/Makefile.am b/panels/Makefile.am -index 76fbc88..466c2c6 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -18,6 +18,12 @@ else - disabled_panels += network - endif - -+if BUILD_COLOR -+enabled_panels += color -+else -+disabled_panels += color -+endif -+ - if BUILD_WACOM - enabled_panels += wacom - else
