old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 6 insertions, 123 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 006f4547dd31..98f2b0502a24 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.124 2014/09/16 10:52:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.125 2014/09/16 11:14:25 ssuominen Exp $
+
+  16 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-settings-4.11.2-upower-0.99.patch,
+  -xfce4-settings-4.11.2-r1.ebuild:
+  old
 
 *xfce4-settings-4.11.3 (16 Sep 2014)
 
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch
deleted file mode 100644
index a1704ba4fb2a..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=10918
-
-From 5247716c9105dc68a737757da5a2b260538945a9 Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Wed, 28 May 2014 07:55:39 +0300
-Subject: [PATCH] Update for Upower 0.99
-
-Upower changed a singal handler.
----
- xfsettingsd/displays-upower.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/xfsettingsd/displays-upower.c b/xfsettingsd/displays-upower.c
-index bbb3028..e1fab38 100644
---- a/xfsettingsd/displays-upower.c
-+++ b/xfsettingsd/displays-upower.c
-@@ -34,9 +34,15 @@
- 
- 
- static void             xfce_displays_upower_dispose                        (GObject                 *object);
-+
-+#if UP_CHECK_VERSION(0, 99, 0)
- static void             xfce_displays_upower_property_changed               (UpClient                *client,
-+                                                                             GParamSpec              *pspec,
-                                                                              XfceDisplaysUPower      *upower);
--
-+#else
-+static void             xfce_displays_upower_property_changed               (UpClient                *client,
-+                                                                             XfceDisplaysUPower      *upower);
-+#endif
- 
- 
- struct _XfceDisplaysUPowerClass
-@@ -95,10 +101,17 @@ xfce_displays_upower_init (XfceDisplaysUPower *upower)
- {
-     upower->client = up_client_new ();
-     upower->lid_is_closed = up_client_get_lid_is_closed (upower->client);
-+#if UP_CHECK_VERSION(0, 99, 0)
-+    upower->handler = g_signal_connect (G_OBJECT (upower->client),
-+                                        "notify",
-+                                        G_CALLBACK (xfce_displays_upower_property_changed),
-+                                        upower);
-+#else
-     upower->handler = g_signal_connect (G_OBJECT (upower->client),
-                                         "changed",
-                                         G_CALLBACK (xfce_displays_upower_property_changed),
-                                         upower);
-+#endif
- }
- 
- 
-@@ -122,8 +135,14 @@ xfce_displays_upower_dispose (GObject *object)
- 
- 
- static void
-+#if UP_CHECK_VERSION(0, 99, 0)
- xfce_displays_upower_property_changed (UpClient           *client,
-+                                       GParamSpec         *pspec,
-                                        XfceDisplaysUPower *upower)
-+#else
-+xfce_displays_upower_property_changed (UpClient           *client,
-+                                       XfceDisplaysUPower *upower)
-+#endif
- {
-     gboolean lid_is_closed;
- 
--- 
-1.9.3
-
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild
deleted file mode 100644
index 4a982cd4d102..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild,v 1.2 2014/07/24 10:53:39 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug libcanberra libnotify upower +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.8
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=x11-proto/inputproto-1.4
-	x11-proto/xproto"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-upower-0.99.patch )
-
-	XFCONF=(
-		$(use_enable upower upower-glib)
-		$(use_enable libnotify)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}