old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 14 insertions, 134 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/Manifest b/xfce-base/xfce4-settings/Manifest
index ed0f72dbaea3..bf1054094b29 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfce4-settings-4.11.2-upower-0.99.patch 2630 SHA256 021876788c5076799dd1f9cf5208fccdec9eda6191d35184fc3895d7468158f3 SHA512 9c8a50c0ef155081d4b17486602ff125dfb0444eb07a32b1436e419a5b94a215151b47e57aaebee5db3044436078fc1a112effbb74d3ef175fa5c9109aab20c8 WHIRLPOOL efc357d5641d779f89cf353156699adcfbb9a822895d478a5f06a7b3fe681d1741b2706d6f81350ab04f801639a1b3de2ec0a011f681699ef1a081cb680e59a2
 DIST xfce4-settings-4.10.1.tar.bz2 777735 SHA256 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 SHA512 cf2d3255a0c862b0d016a8653fd1ba94c86b9da36b894dd7ad733d6758b9e023807aa93b1e43deeb0f6a34c6db23507f6fe32b6b7a98fa3e0d3bc7577da429f7 WHIRLPOOL 82f6e28e5d6519fc37c2265efc759054d7208fe38374acb07b40f281f7b802e47e5230a78066e7dac0727453ed14017abc8b0c6afd069eed1f164c607ff1f2ad
-DIST xfce4-settings-4.11.2.tar.bz2 869865 SHA256 2745fc11fe6e856344a6a7c1ae9c12e1f0f21cc6d56c5a46bd16987a7e10081f SHA512 677633cc6c965b85092662a3d2e38f1775d6af8d6b91a3e650eee394f96364216b9614a3a0af24b7848857108b0d42b3cecfc2770e9759e0803b3a32e05db362 WHIRLPOOL cdfd5a2ba217afda5a091f9350f01cc2295ef955c8dcd0bdb25fb1f819a8767a0ed0e44227eb95566dc3f1e575237efa0c4fbc291e248842a23b0a9a65781bb1
 DIST xfce4-settings-4.11.3.tar.bz2 928068 SHA256 f9e40c039f3a06111b5b596abfe462ee067d98e46c6640bf33d3b6e76bc6cd34 SHA512 edde5cd41e42da1a5a20a89f906907fef3e09bc795c3713426e1e7a38570aabeca3cda33a768455f5c5c866cb3842eec771109e3e10cc8431b0c01b512a06e06 WHIRLPOOL 0f1fefaa501c3b4b472b0796f150e7e897472c6fd8856a25ee35f3827af75a408706d4e35289f958199e8c104bb0dd7be5571c535dc54561813188b6b554ec57
 EBUILD xfce4-settings-4.10.1.ebuild 1419 SHA256 efe4385a1b5cdbd574454280736f274005b2be13dc89d814043274e027bbb14e SHA512 a9a22e04566405d987199fbf8855854e6022dbc60698d8ab3a72966b681fdf70b4e0df562719b2ea2d9e6cb71ff9ba013d269734bf0af1e61cbc3542b1d62083 WHIRLPOOL e5acf5ac8f8587ea4d34023bbda1afc7123305d4c9f0ff8f188cfa181269ed571c93053bc267af8c761f4bf29d544920e626e26bc0bc0a59416855f7ad51cc44
-EBUILD xfce4-settings-4.11.2-r1.ebuild 1601 SHA256 f5f89ee20281bdf250bbb3978e91d92dca483c0e83463b2657a51cfdf7a4c116 SHA512 2cc175821614eca6893782f19a6e6e1796bc81ed6fdabacee46b97da38860f63bae5989d4a40267dd5ea489a234fd90da11edca9e601b0458c5fd4f470c2efa7 WHIRLPOOL 0ecb4a4450c1bc03f075d791f668e49f3fd818d8fb3387ff1fee3bd1a0601ddf387275f37a72a08b50c7c1c00dc61e0b1680a244b4c53734c29282d594797b13
 EBUILD xfce4-settings-4.11.3.ebuild 1547 SHA256 46815830db31878e487aac1bd9ce0ee67321bc5583cba4174d8d2f889d13b107 SHA512 543d09e1f93bfbaa466a4c71ca9e5c3a3e759381f72bb7e8b9b6bca749620d5852c5e9b3c10ba3a56f5d589668a95b48710cb84b8137c42e4dfc6397dc025f84 WHIRLPOOL 0a38cbfed32d858da70b1a996de86a1de718823c2fa457e7ed33bed262ff232ab884c21a9a90c65b9b58e9002842118e438c7b7c83ec4efa362b743862ff09f7
-MISC ChangeLog 16298 SHA256 c2c844cbf7f1ea2944fbf241ca7f5bfda28e4da4252cf5aac9dc7f4b0f5323f4 SHA512 27d16a4c21e146299f0c875fc28ef53c1e4616ede5afc7dc2dd53e662d69a9b76ad979363d2f3679cc77c9e0c8b998fbefcb73a7893aaa766e641f500243d88f WHIRLPOOL c4b9a99b2c17c57d5ad08ba2a7b771c37fbb6e5e91f4092621f109984c693febcea54ab951670f9db1a3f2a8692002f4642932cdabc496a78f33ff0bd1302ba4
+MISC ChangeLog 16445 SHA256 1bd9a74c494cb640309b994893f649e4f676c312528abd19cae093856b60d4ca SHA512 4ea7b425ccba7374555e2d5d0d9d041ea9f800180633d5db5b0eb42b170c683687161c102cc6bc96502d6728d41b62085b75bba8696e7864e96f2ce26e39f03f WHIRLPOOL 6bc10fb9adc43206a2d7e3e37b2c531e19d9f764ed5986e95407ce6b7b009d5fa1554b684c8d8fac778c30d9dd7f021513edb0648be5d6681446c120841b1d1d
 MISC metadata.xml 391 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815 SHA512 61b5f4e2794713eda461738e970a8609eb357618bb260e4aa7c651a5e85680e128ad1aa2600af8cc100ebcfc493028bb8aedc09b860145b4b61fdc7dd1b5ce59 WHIRLPOOL a482a5c406cfd50f608dbaa9c4a58c60d0d0e8ab1ce07e82d9ef51c99145289e6a9b8cb1b8b419077683b08df5be6086236a069fff6527643c4be08126f7e79f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUGBZcAAoJEEdUh39IaPFNZ2kH/2f/nx7atZ3KRo6/asRxZhBk
-wCG1PVzh6BT/0UdQIy0VGWTcpTCszBbcdXEA/oueEWpHKIS+EAGmqTvwBKslJxz0
-srWK4TOCLss0Ple+RkdmPwKK9CqlWQteh0IO7D5z2KdN/9fviYJIOJcPFD6tGimT
-PXLVDCh5OGKT7L+UME3q342/GH0ip3SQk6dEjUpC7j8fIP/v/wUcq1EnooygcVGZ
-zjsR0hJr5ijNvazfF1yRhecIHHBcwcOK4osx3Md0bFOT1DbIzqj+n1lNMqvTefcT
-75lach1pNOoyZ47K1WZLZ71E0aVWuyNZqdajdzmhniBk25z7Ov1gXwdLKxlDMlM=
-=4SQ5
+iQEcBAEBCAAGBQJUGBuDAAoJEEdUh39IaPFNzakIAJuYA57ifFVxlF5k9cRD+z4Q
+XXggwROa45n2M92jgATKEU83E3Kqxk/WhGcL58Bh9yE4ls43yKacxgdQBwKPE7bt
+HIvZLwJbDwGDo6Rjdag27l0Qo900zKK1Wozxzs2GlcWeb1229+8uQLCI4WKDu6un
+76ynT8w33fUr/M1V246VVmPNMC8a0fTxIgC55r9LKbgkX5WZhcj0NMlhejWVI5Lv
+m/2lOwi5s4ab2VgvwxYOdl2XIBm9IB6d4MH3tYUaIVsOX4MMRC3lgsbVg23IPh2M
+LyJqAJObfC/ttN9y4B9pRn0TxIMp+NhdxpjPUKedrK5vOvHrGNBlM3i4U7PsShc=
+=DSG8
 -----END PGP SIGNATURE-----
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 )
-}