# ChangeLog for gnome-extra/drwright
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/ChangeLog,v 1.17 2011/11/02 02:24:32 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/ChangeLog,v 1.18 2011/11/25 06:34:09 tetromino Exp $
+
+ 25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -drwright-3.0.2.ebuild:
+ Drop old.
*drwright-3.2.1 (02 Nov 2011)
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/drwright-3.0.2.ebuild,v 1.1 2011/08/19 11:10:13 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME 3 tool that forces you to take regular breaks to prevent RSI"
-HOMEPAGE="http://git.gnome.org/browse/drwright"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
- >=x11-libs/gtk+-3.0.0:3
- >=gnome-base/gnome-settings-daemon-2.91.8
- >=gnome-base/gnome-control-center-2.91.6
- >=x11-libs/libnotify-0.7
- media-libs/libcanberra[gtk3]
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
- sys-devel/gettext
- >=dev-util/intltool-0.35.0
- >=dev-util/pkgconfig-0.12.0
-"
-DOCS="AUTHORS ChangeLog NEWS"
# ChangeLog for gnome-extra/gnome-color-manager
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.9 2011/10/30 01:46:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.10 2011/11/25 06:38:57 tetromino Exp $
+
+ 25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -gnome-color-manager-3.0.0-r2.ebuild,
+ -files/gnome-color-manager-3.0.0-cc-panel.patch,
+ -files/gnome-color-manager-3.0.0-packagename.patch, metadata.xml:
+ Drop old.
*gnome-color-manager-3.2.1 (30 Oct 2011)
+++ /dev/null
-From 66e2933c29964e72fa96f95d518763f2b4e95f79 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 13 May 2011 18:32:16 +0000
-Subject: Ensure we cancel the initial panel startup if the panel was created and destroyed without ever getting control of the mainloop
-
-This can happen if you plug in a color sensor, with the color control center
-panel already open.
-In this case, the g-s-d plugin creates a new instance which seemingly gets
-loaded and unloaded and control is returned to to original instance.
-
-A workaround is either to not have the control panel panel open when pushing in
-the device, or to restart the control center after plugging in the hardware.
----
-diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
-index 34ce173..898004e 100644
---- a/src/cc-color-panel.c
-+++ b/src/cc-color-panel.c
-@@ -61,6 +61,7 @@ struct _CcColorPanelPrivate {
- GSettings *settings;
- guint save_and_apply_id;
- guint apply_all_devices_id;
-+ guint session_startup_id;
- GCancellable *cancellable;
- };
-
-@@ -2270,6 +2271,7 @@ cc_color_panel_startup_idle_cb (CcColorPanel *panel)
- g_debug ("getting installed");
- cc_color_panel_is_color_profiles_extra_installed (panel);
- out:
-+ panel->priv->session_startup_id = 0;
- g_free (colorspace_rgb);
- g_free (colorspace_cmyk);
- return FALSE;
-@@ -2452,6 +2454,8 @@ cc_color_panel_finalize (GObject *object)
- g_source_remove (panel->priv->save_and_apply_id);
- if (panel->priv->apply_all_devices_id != 0)
- g_source_remove (panel->priv->apply_all_devices_id);
-+ if (panel->priv->session_startup_id > 0)
-+ g_source_remove (panel->priv->session_startup_id);
-
- G_OBJECT_CLASS (cc_color_panel_parent_class)->finalize (object);
- }
-@@ -2644,7 +2648,8 @@ cc_color_panel_init (CcColorPanel *panel)
- if(0) cc_color_panel_setup_drag_and_drop (GTK_WIDGET (panel->priv->main_window));
-
- /* do all this after the window has been set up */
-- g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
-+ panel->priv->session_startup_id =
-+ g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
- out:
- return;
- }
---
-cgit v0.9
+++ /dev/null
-diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
-index 34ce173..f4307cc 100644
---- a/src/cc-color-panel.c
-+++ b/src/cc-color-panel.c
-@@ -2150,7 +2150,7 @@ cc_color_panel_is_color_profiles_extra_installed (CcColorPanel *panel)
- GError *error = NULL;
-
- #ifndef HAVE_PACKAGEKIT
-- g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", package_name);
-+ g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", GCM_PREFS_PACKAGE_NAME_COLOR_PROFILES_EXTRA);
- return;
- #endif
-
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild,v 1.1 2011/08/19 11:09:04 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection packagekit raw scanner"
-
-# FIXME: raise libusb:1 to 1.0.9 when available
-# FIXME: fix detection of docbook2man
-COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
- >=dev-libs/libusb-1:1
- >=gnome-base/gnome-control-center-3
- gnome-base/gnome-settings-daemon
-
- media-libs/lcms:2
- >=media-libs/libcanberra-0.10[gtk3]
- media-libs/libexif
- media-libs/tiff
- net-print/cups
-
- || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
- x11-libs/libX11
- x11-libs/libXrandr
- >=x11-libs/gtk+-2.91:3
- >=x11-libs/libnotify-0.7
- >=x11-libs/vte-0.25.1:2.90
-
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- scanner? ( media-gfx/sane-backends )
- packagekit? ( app-admin/packagekit-base )
- raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${RDEPEND}
- media-gfx/shared-color-profiles
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
- app-text/docbook-sgml-dtd:4.1
- app-text/docbook-sgml-utils
- app-text/gnome-doc-utils
- dev-libs/libxslt
- >=dev-util/intltool-0.35
-"
-
-# FIXME: run test-suite with files on live file-system
-RESTRICT="test"
-
-pkg_setup() {
- # Always enable tests since they are check_PROGRAMS anyway
- G2CONF="${G2CONF}
- --disable-static
- --disable-schemas-compile
- --disable-scrollkeeper
- --enable-tests
- $(use_enable packagekit)
- $(use_enable introspection)
- $(use_enable raw exiv)
- $(use_enable scanner sane)"
-}
-
-src_prepare() {
- # Fix build
- epatch "${FILESDIR}/${P}-packagename.patch"
-
- # Upstream renamed 95-gcm-colorimeters.rules to 69-gcm-colorimeters.rules
- # for next release (see commit dc276cbe) to fix colorimeter udev ACLs.
- mv -f rules/{95,69}-gcm-colorimeters.rules || die "mv failed"
- sed -e 's:95-gcm-colorimeters.rules:69-gcm-colorimeters.rules:' \
- -i rules/Makefile.* || die "sed rules/Makefile.* failed"
-
- # Upstream patch to fix a bug in control center panel when plugging in a
- # colorimeter; will be in next release
- epatch "${FILESDIR}/${P}-cc-panel.patch"
-
- gnome2_src_prepare
-}
<use>
<flag name="clutter">Use <pkg>media-libs/clutter</pkg> to render color
gamut representations</flag>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
<flag name="packagekit">Enable support for the distro-neutral package
manager GUI <pkg>app-admin/packagekit</pkg></flag>
</use>