Fix Categories= line of desktop entry for the setting dialog wrt #455362 by Alexander Mezin

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

4 files changed, 41 insertions, 29 deletions

diff --git a/xfce-extra/xfce4-notifyd/ChangeLog b/xfce-extra/xfce4-notifyd/ChangeLog
index 9a7e42e67058..9d6a2d57b60f 100644
--- a/xfce-extra/xfce4-notifyd/ChangeLog
+++ b/xfce-extra/xfce4-notifyd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-notifyd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/ChangeLog,v 1.17 2012/11/28 12:42:34 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/ChangeLog,v 1.18 2013/02/05 12:07:35 ssuominen Exp $
+
+  05 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-notifyd-0.2.2.ebuild, +files/xfce4-notifyd-0.2.2-categories.patch:
+  Fix Categories= line of desktop entry for the setting dialog wrt #455362 by
+  Alexander Mezin
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-notifyd-0.2.2.ebuild:
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index cfab92702788..466e9256ff7d 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST xfce4-notifyd-0.2.2.tar.bz2 338974 SHA256 b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168
-EBUILD xfce4-notifyd-0.2.2.ebuild 841 SHA256 cbe11916bbad2a10c58d17606e731c42daf4eccc034f3b7ab0a001cdaec11ad3 SHA512 f24348eb58e6dcd974d3787df17fd2d52b9626f23144f85c432daad54375b86e6324aec25c3b7d23163cc860e84bf39636a22afe878cc72c2a37ef27b549e5b2 WHIRLPOOL f73dd9de5ebf72359f8daeee12fb799e236a9402ab8705206e3ffbe5e6c35b817a51a2fa09eba3b422d62e2b975a969f8e98e9c6718640230ada48348df15ce4
-MISC ChangeLog 3953 SHA256 208ad06fbed1a4ec430d90a258054759e642e2201f48a0482c9b1883e888a977 SHA512 e948781ad199fe8902b4d093bac7d652c9abc1189843216ee7bfb939053f31d9f888b5addd6c1095f54fa893a1869f8900a69ab355b3afa5be53fbf71cd953a4 WHIRLPOOL c5f61508db12783d40e7f8ed8f29c415d18cadab57732e46eb2c900a4b1231d8d050ec852143657dbcf48085d84a87a442ed7ef6accdb536b06006e5557173a7
+AUX xfce4-notifyd-0.2.2-categories.patch 726 SHA256 93f8208873e86fd172893985aa46c82d5d8d2753299dfd960e9f9f0f223d7472 SHA512 7cb0ea2cf829f8956eced18f4d83ede9d7b0bdd6fa5543201df92affb16f9f94b2ac387ed35ec14122e5d7eaf714b2146ca4662c11f8abe30c461c78672dded1 WHIRLPOOL 4ec39e198c15ae6fa40c295e18872cfbac23e99aad6381cf373e362376586cc45df9ab562dff1ed56398200780fc8f760c85303d07086069d8027ff2ba767cbd
+DIST xfce4-notifyd-0.2.2.tar.bz2 338974 SHA256 b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168 SHA512 16424263c11c531ae52881520226d694a4470473d04e4f44af2e4b87372042422a2b777e764a12978ef57ed7aaed710cd41b15945849b184ce01730d2fd6bf9e WHIRLPOOL 92df48f54af586f90df8220a78420e6430df009141b226ef4d3038e2f50fe42bd51e88087dba184546661dc345ff1debf73e14fcac29f2ae0ca94066c187d880
+EBUILD xfce4-notifyd-0.2.2.ebuild 894 SHA256 468f65de39c70c88e2e899f395deedc5d50d9e0e8f7faa2b9004a5cae15848b3 SHA512 bd10c834e92dfaa861f752f98d7d7b08dbe528d9d09253f23a0541d2d69f515cfa25a83432d31d1723ad234fd71a7336e97903d7167dfc57dc8b1eedef958167 WHIRLPOOL 3eb24eb74790c32c1c7a228be1011f91e0803d51033e0fba548fc36d89a5b04e5f6a1221ef03bc1c1ab1de07c4b15f35f6851d4f658289864db4f5ca4504b6ba
+MISC ChangeLog 4179 SHA256 9575aec1eb02e9a06df80a1068427cd2662068e5975280442193f1edf81916fd SHA512 ba4423bd644b1c76d6d79005595b42c1503fb8aa7b1d1ec5db68342bf6c9401eb630cf44a609f2bf371de74cab29bd6a762e2b97145c56a8c5372b1372422c1b WHIRLPOOL e0553181dec4032da4930f50509032e25332cb2c76303eb2d27f21e461ebea3aaaf09144c1d56a613b064285d356c8c0c5e60c475041805d0867e36b0d5952dc
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQtgaFAAoJEEdUh39IaPFN6lQH/jUv//htrRIBAhPmN8zsUzK3
-E4aHT5G1yCm1MhmyHiYYZbMPy4BysQbfE/Ee2qwk0AYOJYZX0x2naCfhQkJueUrI
-cNZIa1NbObRpc+GImKP19doL3kLcdqrJMBelmAETSPIKXPwT8Ho0LDHi6/UW4Q6q
-c2p0mOzkTK9Al5WlYm5K/kiD5S3kYLpVN9OsT5ReM2fhSZY7gRuxK6HQB366LB29
-Q+JfkB/yJXEnqdBgD9TDEt3PyBrBZzKdIZ9emjK50+5Gy1kMSbqEX9rtcbQC6h5s
-2cLbdMmRvsxl3YOKxzjBJW04raRqFBf6SO/tx77fde1PlbTLhc4UGk0Mo9gAyso=
-=Wvqk
------END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-notifyd/files/xfce4-notifyd-0.2.2-categories.patch b/xfce-extra/xfce4-notifyd/files/xfce4-notifyd-0.2.2-categories.patch
new file mode 100644
index 000000000000..d3bc9125e0cb
--- /dev/null
+++ b/xfce-extra/xfce4-notifyd/files/xfce4-notifyd-0.2.2-categories.patch
@@ -0,0 +1,19 @@
+From 75d5cdaa4be0b9b25da13655db77e2caebdbf570 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Fri, 27 Jan 2012 20:31:12 +0000
+Subject: Show dialog in settings category.
+
+---
+diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.desktop.in b/xfce4-notifyd-config/xfce4-notifyd-config.desktop.in
+index 51d4827..9fa3ac2 100644
+--- a/xfce4-notifyd-config/xfce4-notifyd-config.desktop.in
++++ b/xfce4-notifyd-config/xfce4-notifyd-config.desktop.in
+@@ -8,5 +8,5 @@ Terminal=false
+ StartupNotify=true
+ Type=Application
+ OnlyShowIn=XFCE;
+-Categories=X-XFCE;Settings;DesktopSettings;
++Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
+ X-XfcePluggable=true
+--
+cgit v0.9.0.3
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.2.ebuild
index abbab2a7afd0..d49281870a7c 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.2.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.2.ebuild
@@ -1,31 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.2.ebuild,v 1.4 2012/11/28 12:42:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.2.ebuild,v 1.5 2013/02/05 12:07:35 ssuominen Exp $
 
 EAPI=5
 inherit xfconf
 
 DESCRIPTION="Notification daemon for the Xfce desktop environment"
 HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-RDEPEND=">=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/xfconf-4.8
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=sys-apps/dbus-1.6
 	>=x11-libs/gtk+-2.14:2
-	>=sys-apps/dbus-1.4.1
-	>=dev-libs/dbus-glib-0.88"
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/xfconf-4.8"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-categories.patch )
 	XFCONF=( $(xfconf_use_debug) )
 	DOCS=( AUTHORS NEWS README TODO )
 }