tetromino    14/05/13 14:49:46

  Modified:             ChangeLog
  Added:                cinnamon-settings-daemon-2.2.2-r1.ebuild
  Removed:              cinnamon-settings-daemon-2.2.2.ebuild
  Log:
  Make colord really optional (bug #510238, thanks to Ben Kohler).
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
CF0ADD61)

Revision  Changes    Path
1.2                  gnome-extra/cinnamon-settings-daemon/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog   6 May 2014 03:08:29 -0000       1.1
+++ ChangeLog   13 May 2014 14:49:46 -0000      1.2
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/cinnamon-settings-daemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: 
/var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.1 
2014/05/06 03:08:29 tetromino Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.2 
2014/05/13 14:49:46 tetromino Exp $
+
+*cinnamon-settings-daemon-2.2.2-r1 (13 May 2014)
+
+  13 May 2014; Alexandre Rostovtsev <[email protected]>
+  -cinnamon-settings-daemon-2.2.2.ebuild,
+  +cinnamon-settings-daemon-2.2.2-r1.ebuild,
+  files/cinnamon-settings-daemon-2.2.2-optional.patch:
+  Make colord really optional (bug #510238, thanks to Ben Kohler).
 
 *cinnamon-settings-daemon-2.2.2 (06 May 2014)
 



1.1                  
gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: cinnamon-settings-daemon-2.2.2-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild,v
 1.1 2014/05/13 14:49:46 tetromino Exp $

EAPI="5"
GNOME2_LA_PUNT="yes"

inherit autotools eutils gnome2

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
        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/udev[gudev]

        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.2.2-optional.patch"
        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)
}




Reply via email to