Add slot operators. Disable unused startup-notification support, https://bugzilla.xfce.org/show_bug.cgi?id=11837.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 40 insertions, 35 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 17aa25c15379..d003e3a95b40 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.178 2015/04/20 17:01:56 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.179 2015/04/20 21:46:52 mgorny Exp $
+
+  20 Apr 2015; Michał Górny <mgorny@gentoo.org> thunar-1.6.7.ebuild:
+  Add slot operators. Disable unused startup-notification support,
+  https://bugzilla.xfce.org/show_bug.cgi?id=11837.
 
 *thunar-1.6.7 (20 Apr 2015)
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 00955226ffb8..cad4f8993e1d 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -6,25 +6,25 @@ DIST Thunar-1.6.6.tar.bz2 2160158 SHA256 b9a55104b18ae01c5190d7ea02cbd7ba56d7aff
 DIST Thunar-1.6.7.tar.bz2 2108500 SHA256 e35f05d5413ffd26bfe866f47b1d199045e3b42912da47c831d3689e12336ee5 SHA512 cbb20429891e299e74cf1f1b0d958659d290eb265b3ea3535ebe34e3683f6d57a0dbf581eab5638699d3b23b866dee33d890c672fe2edf45ab35534d043508ce WHIRLPOOL ec2dfb0725dd46780da5927fb245b95bbc009cc12f921b86bba3d81826a711879f333fcbe67b3f124a5f5f6c324075e47e35fbca576f2cb500afb6b8c9200b83
 EBUILD thunar-1.6.3.ebuild 2115 SHA256 74c1fa7a99f891f25d730902173a92229d79275781c1ee45ad4cf975f37449ad SHA512 a1d1a86dc50e1fc0cf0344a7a053d5d9889000d6b6cb7575d79d4b4d59e82327210d13b2c49b58a27499364ff83f4c1074d894e5e44d9d8effa4c73a66b7af95 WHIRLPOOL 1b395f42107c9a0043ecacbc459e106b64e1efb7b70e8f392e4c517cf84ae311c57292dcc7421545143555d482f0eb53c623907b950b886fea75854ae1591a6a
 EBUILD thunar-1.6.6.ebuild 2124 SHA256 53346aa71c5c0cdf23017c0ab5d55fbb2472a450adb95eb99157381a7a43ba53 SHA512 cd5ff1d988640f7317a7858b0325541f169551c9df97a6cde8d36f38639826d659c1197a1a035e186a82ffed0059809d804cfe49725850446dfc8b8fa09239c7 WHIRLPOOL 51abf1825c76bd7dff67f57d451c6451c29ec8efafeb3e720c8fd6bd3a5f3ee2273db5cc3c575e1f8208bdca9d715e27094eb935e2c4f2ccd1763e3c8a24c135
-EBUILD thunar-1.6.7.ebuild 2127 SHA256 2c13412cc096ab3aea8e219e8979e06f64f010ecf07101147fe5c1626c877555 SHA512 b2ba25209617448477f6c21a37631ec473c65dee4d682ff1e9ba954aa05c78c6284305b491d11f0edeb7b4403335ac4ed68a769378833510ac2809f4e5b3a53d WHIRLPOOL 3e81b14b8d78e25e865c071f7217cd5bc7ad0a885626594b113bb2c1a5acc6cada9646779f7e2381bcb9f7304ac5aeb391a0916e221a28aac90b21db6629c04a
-MISC ChangeLog 22308 SHA256 b3c2e85c73a6635ecbca0b0c1038e0c1024bfd3b2735c7efa26c782e7d0c6fdb SHA512 3f5ecf8df4d810588522702b9a68e993b9bf8845a6fc594beb034c2d97677fe5f2e42676c0a02f351b336001a4f964a198bd6e7ff1fca92494ce3cb9cff188c9 WHIRLPOOL 225e6de307eccb6edfb611d25f7deadea26e7e737274007b342c3ecaf259e38a4f5c6284b43862e61ca68a1036a3ab774ffef451ab62b00c5c48afedcbed2b6f
+EBUILD thunar-1.6.7.ebuild 2167 SHA256 82935df40b960d6c32f06468ea25db2b447f16599c6fb70c50baaa822c784d62 SHA512 5ba3f601ffd3879d2e34f7905a04f357f8c61403d8329cbae03ac3a681230655d5c30212cd2df0f8a1e5d3c04c87d805e75c0a17ca2fa65b6174a0dfe74f7322 WHIRLPOOL 96300a3c4b576feea0e7d135ddd159d19751d0f662b421e6ade0adf82efa944c953145dcb4d6a9fd6b9aec8928b6c704ed8f71bc08d039b19a07e8734a664220
+MISC ChangeLog 22495 SHA256 dc5b6225c153f8674bcd0825d1b4521fdea4eb8955920eea0440a623641f0604 SHA512 0ea19c84d15d9f040cf17c8ec4b57676504c724d0998902536547b94c0ac4bc8ab5d590cc56303a931279d1cbab02af0341d522066bbd45cae368e38952471df WHIRLPOOL efc631b64076c27d2d3146ae148c64d997f190b66a3aba217d1e85a04a38256ef4b955c046c7364dd3437d91c06b05f89f6e6bcd9664dcb0502da8d7e0db6eb4
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVNTELXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vfx8QAKudYPQNvL5XxzP24aXaeQEX
-6E3IUpRizvI2HMNzuDBKslmciteVTtZLk6DXGWtAXVdqC/Zzx5rjYhhVuz0/YqaW
-xH43hMG/tOiAHT9IppJTNu05v9Fm+q3vabsE+nWLSVIpgnKqTzYC23BTn7BGUrJU
-Ywy9BvmoIorPZMD/05JQImv8vad5P6WMqJ+vwQaX6Zc+SuH4iPKJMi1/hyv0RKiV
-8gWmV+KaZ/1wcVhV0BAEQhflIze8g4WM65GFt5mh9Z/KYsCX3VaM9h5Pv8p5vJoE
-iZH5g/wF58Z+D5pfgxYgoDNXJxoBoaHqyLz4MFle2R8R9+qo8RzkK6ZVbatjgqNg
-PwX+vvmxLhcBMRX8arRUGrmOcV0YLyESMSI2tivgDCGAsqQxO43+ih/vli3bGhjr
-mjqe269DOkU/VX5Hq9uDIt+WmRHAo1Z/cKlZIYjJ+Mdpe+lR7itL7eq7cbo4s+Pg
-tPpZ89D7nPpubhaFQoNqiIR4NR9rA2HM/+XUS0uqsJiWELpVTpkJzpl3uHphvNqL
-ozkzNhBiTTDJfVJk99ZrpK40RvzAbutFUt+AwPbOurnzoiMbv4EbcYnSbGc4fRiD
-U4LyIjZlt6FwP2j5Y6iyIbkE8eyVF/9AX7zDVw9Es87fXZSDN5bjlda5DcJfR3XL
-Dl2FfG3/78cSGh16VwBc
-=eZjh
+iQJ8BAEBCABmBQJVNXPNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObBUP/033gMQl+b+4bKIQzPQ960Pu
+T39ISF9yCZazVI9gSVUuPMXLF5t+7yG3aGavHBMIlMPZhOLaUhmW+cH8x+2KOgdN
++p3JQYsvmzQZkt5Rbrcgj60e+9Y2P3RX09/yT8wGHniqCECaqGhT5vEMdZhBJ527
++YK/Q7XV/BHXHUv3wgOM8bvu8tLTdhnaqenj8fc5PY+dRkLxipR+eIKGQmGGgZvq
+/QWd/fi59Hc37ga4dyPXJJYw00bq04mUc87JRKur4IU4C0fRXG1qAsW80/Yurenq
+be5Lk/9mywgvb4GW+0ySqkezHT3Q5AKIvud9b9FkkuI75dQHoa1xkf5/16WUF0VV
+rolRkfNlLUiUg70aXsPpBMo21m9YGxOt1wOfHyiJH8V7Nu9McgzrTt7A8R7qS/GK
+cBzp7le2r2oakotiZm2yBiPIUDme3HuhURBDtFe9KZRITUGXMAoRh/qrWh/fxAwo
+MKpjbWa7K3VRhHe1ylJfgeZE2P9IbR+kgLGWaHnr2AMw+feStdRJaR7hYpA49UrV
+uOPNDWX25Nd5C184TktClCHjXlUy/Fe8YqO/S3Zw7hfsGRGvLV+FaHVuL88pJJAW
+TRWe3vNtjMDRRsaAuxGsU8xSSJjxUF1YeShgU+SNE/Bei6zunYduaiEWrHBm0p68
+78FqEe0CdOypwSiVwOBc
+=TdKf
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/thunar/thunar-1.6.7.ebuild b/xfce-base/thunar/thunar-1.6.7.ebuild
index fcc0315252d1..c77d7441f707 100644
--- a/xfce-base/thunar/thunar-1.6.7.ebuild
+++ b/xfce-base/thunar/thunar-1.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.6.7.ebuild,v 1.1 2015/04/20 17:01:56 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.6.7.ebuild,v 1.2 2015/04/20 21:46:52 mgorny Exp $
 
 EAPI=5
 inherit virtualx xfconf
@@ -14,24 +14,23 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus debug exif libnotify pcre startup-notification test udisks +xfce_plugins_trash"
+IUSE="+dbus debug exif libnotify pcre test udisks +xfce_plugins_trash"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
 COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.30
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-2.24:2
-	>=xfce-base/exo-0.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10.1
-	>=xfce-base/xfconf-4.10
-	dbus? ( >=dev-libs/dbus-glib-0.100 )
-	exif? ( >=media-libs/libexif-0.6.19 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pcre? ( >=dev-libs/libpcre-6 )
-	startup-notification? ( x11-libs/startup-notification )
+	>=dev-libs/glib-2.30:=
+	>=x11-libs/gdk-pixbuf-2.14:=
+	>=x11-libs/gtk+-2.24:2=
+	>=xfce-base/exo-0.10:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10.1:=
+	>=xfce-base/xfconf-4.10:=
+	dbus? ( >=dev-libs/dbus-glib-0.100:= )
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	pcre? ( >=dev-libs/libpcre-6:= )
 	udisks? ( virtual/libgudev:= )
-	xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10 )"
+	xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10:= )"
 RDEPEND="${COMMON_DEPEND}
 	>=dev-util/desktop-file-utils-0.20-r1
 	x11-misc/shared-mime-info
@@ -53,7 +52,9 @@ pkg_setup() {
 	XFCONF=(
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable dbus)
-		$(use_enable startup-notification)
+		# no code uses this, it's all in libxfce4ui now
+		# https://bugzilla.xfce.org/show_bug.cgi?id=11837
+		--disable-startup-notification
 		$(use_enable udisks gudev)
 		$(use_enable libnotify notifications)
 		$(xfconf_use_debug)