summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-11-15 22:58:49 +0100
committerPacho Ramos <pacho@gentoo.org>2015-11-15 23:30:16 +0100
commit58fb57358e8d7fbc9aa2cbb53adef6b809a157c1 (patch)
tree3afa0c962dc6d28bd95906b922bd8e2256b83d9d
parentgnome-extra/cinnamon-settings-daemon: Version bump (diff)
downloadgentoo-58fb57358e8d7fbc9aa2cbb53adef6b809a157c1.tar.gz
gentoo-58fb57358e8d7fbc9aa2cbb53adef6b809a157c1.tar.bz2
gentoo-58fb57358e8d7fbc9aa2cbb53adef6b809a157c1.zip
gnome-extra/cinnamon-settings-daemon: Drop old
Package-Manager: portage-2.2.24
-rw-r--r--gnome-extra/cinnamon-settings-daemon/Manifest2
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild105
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild105
-rw-r--r--gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch82
4 files changed, 0 insertions, 294 deletions
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index a6f7e9d56a78..051d20a0ecb1 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,4 +1,2 @@
-DIST cinnamon-settings-daemon-2.4.3.tar.gz 2998895 SHA256 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 SHA512 a70b04fbbddf735582043554c809f6dc098b58938b7245de8b1398ac4a38e9483f43e8b08ec7810d81cc3afabbad74045a1abfa6d2ed4e8b672f5df971e7c916 WHIRLPOOL 9416bd0af5f1bc27358768d46c6d51c25f49436825ac201b01c6986b80aebb78a91baaa79e72bc0577f818330bf19046e5f3dcdafb245779ddc47f3714d47eea
-DIST cinnamon-settings-daemon-2.6.2.tar.gz 2990964 SHA256 a97b85a2f9aafdc9c7c7facc97e422d7bc9531a920ac2e685fd82c56c01d8dec SHA512 72fc93ff27fc8b565349069a4713ac13f13dd600da64e9f35f35c9b2eb625afbc71bd5d1586653ad4f08cd3b65dbad9110aa21be24a6194eae40f367646608c9 WHIRLPOOL ed1d0a89465333c476e60cf9f49ef8e98e4dc2fcb65acc773fc662f06054f37d88407d04276b9d419ed017b5ed6af52731d97de4744a19b4c13af18df20b9fba
DIST cinnamon-settings-daemon-2.6.3.tar.gz 2992102 SHA256 b71a515f9eed5efd35ef134f291a9dd9674d81026b23c85377493b53ec1cf0ae SHA512 ff6ec6be7a134414a525bd5dce6d90570800d0dbfc5f1641b02fbe17389bcf32d47832f5fcd736cdff8dfa09f129f998acd99d9358b1edf5315edb91c8b553ba WHIRLPOOL 9d2fb909fca23f7db2124e56e285e6c7623a9e7d710309f92894a2ab19b6a5a7e92b4e5c947e0cc74513eec30f7fa7bc7464997a1fdc3ff27ad19040579efdb0
DIST cinnamon-settings-daemon-2.8.1.tar.gz 2934995 SHA256 2e01f7e8900043f8efb28f33814e70ca12eb12b7d49061ce6d059c1a0b0344a0 SHA512 a8c1c685ecc6c03e274b2d26c214f24a9300e8ac4355f7d1f6f81ffb4393b079f7e40d1f1d5cb06509e298d55b4d20ca51e9821cd2894b234512d1287daf3689 WHIRLPOOL 2a029e3a22af1e3a5b9edfc82184244d5c1d8eb61107466110fc1d33ab3e641651d42ee2675c65db78475edcd03e053468d4b2d019e381046cbf8cdab7c74d85
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
deleted file mode 100644
index b19bf96237a9..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.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"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-2.91.1
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-1.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=media-sound/pulseaudio-0.9.16:0=
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.7.8:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.9:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-proto/kbproto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- epatch "${FILESDIR}"/${PN}-2.4.3-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- # Fix intltool unittest
- cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog MAINTAINERS README"
-
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- unset DISPLAY
- Xemake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
deleted file mode 100644
index b32337369467..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.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"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.6.3:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=media-sound/pulseaudio-0.9.16:0=
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-proto/kbproto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- # Fix intltool unittest
- cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog MAINTAINERS README"
-
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- unset DISPLAY
- Xemake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
deleted file mode 100644
index 894642781e67..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 0bfad0d65540acc6598c694904cdb9f7032c952d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 5 May 2014 21:50:25 -0400
-Subject: [PATCH] Make colord and wacom support optional and non-automagic
-
----
- configure.ac | 20 +++++++++++++++++---
- plugins/Makefile.am | 7 ++++++-
- 2 files changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6a17530..e5a752c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -260,15 +260,28 @@ fi
- dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(color,
-+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+ enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+ build_color=true
-+fi
-
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
-
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+ enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
-
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-
-@@ -604,6 +617,7 @@ echo "
- LCMS DICT support: ${have_new_lcms}
- Libnotify support: ${have_libnotify}
-
-+ Colord support: ${build_color}
- Wacom support: ${build_wacom}
-
- Smartcard support: ${have_smartcard_support}
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index b9cb3a6..f37eec0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins = \
- automount \
- background \
- clipboard \
-- color \
- cursor \
- dummy \
- datetime \
-@@ -23,6 +22,12 @@ enabled_plugins = \
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
---
-2.2.1
-