fix kde ark support thanks to Alex Efros, bug 553722

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

5 files changed, 100 insertions, 8 deletions

diff --git a/xfce-extra/thunar-archive-plugin/ChangeLog b/xfce-extra/thunar-archive-plugin/ChangeLog
index 30b66e92c217..10c016939c97 100644
--- a/xfce-extra/thunar-archive-plugin/ChangeLog
+++ b/xfce-extra/thunar-archive-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/thunar-archive-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.33 2015/07/01 16:48:26 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.34 2015/07/05 09:29:36 perfinion Exp $
+
+*thunar-archive-plugin-0.3.1-r2 (05 Jul 2015)
+
+  05 Jul 2015; Jason Zaman <perfinion@gentoo.org>
+  +files/0.3.1-add-support-symlinks.patch, +files/0.3.1-fix-kde-ark.patch,
+  +thunar-archive-plugin-0.3.1-r2.ebuild:
+  fix kde ark support thanks to Alex Efros, bug 553722
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   thunar-archive-plugin-0.3.1-r1.ebuild:
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index c73558f0fd42..5cf46df003ac 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -2,18 +2,31 @@
 Hash: SHA256
 
 AUX 0.3.1-add-engrampa-support.patch 2009 SHA256 10f5ceac953ea0c3f5551f47d4fca09445c5cab9b343fb70380d451f29387f8a SHA512 031e795a761dac036ebefa9f545212a04fbe028d7caedc72f7d4f29c49a7b748f30fb49d0edd635ec66c91b41ee03134cafb404080c079063c54140405e9c769 WHIRLPOOL 44bec3a2a96a7291f257e3c6fea322980f98772947a6323ef93967d908e403870e9b8f33589a818ad3faca3e8953cdeba728deb35a195df3bbb418362a8e898c
+AUX 0.3.1-add-support-symlinks.patch 684 SHA256 b8abe50381849ae9459334b6e9d71a244700a2cbf185508c4f080d3706aeca00 SHA512 5bb183601d2c73cd967a72a2ed3a71e53c2b38b2afe0448f80fb4429df9dba35eeca05da2037496d6f0921590f21d09848e096965d5d8b9b51005ea0798b4eb0 WHIRLPOOL 882941dc39fd91b377ef5c018a0bad91eee9ca4bdd8bce47e67e05b01cf1c621524bdb1d6f3d568c9cd2a4e5f5d5e3e9db3532124cca4be047a7899aa49009ed
 AUX 0.3.1-fix-file-roller.patch 524 SHA256 59210e2fce9c49871d69e31845097e4200ffdd08766d0be25ffe80c62a77d9f6 SHA512 0f08fd5e83132194d37c9fe36bc894774592f2469bb3c48e062265d6e2f01332d04f711808fa25c2c0bb65c34e35983f7b5b1e322087a4bebe8368a3cb5aea50 WHIRLPOOL b27105da84b53708826768edf4daaddff469fb2af24c5c08f74d5799cdd7f93dc1506814b7295fb715875c2d8b5326253bd0a7e32bd907764282fc6244f6a8e2
+AUX 0.3.1-fix-kde-ark.patch 609 SHA256 0f06f03bbc2241ee4da733d4563c5dab2dc59844fe1ff316fd0f108cebecc652 SHA512 43433f9022b1659eccca84d48555f5be997772873aaaeb2fb46fb89904d0d993aff7bd91d850d437ac33c85405ea8e09a05e035547e5d8bce6b9fbb27dea9702 WHIRLPOOL 5ffa0f2b2b4229ca2622ee68e15b977a0ad8e68b509fbec0e77ae3e7327389d9e89bd46e52e33a2d63816eb7ff9ae820c799af0c539bcdc9bdf09433137a2359
 DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 SHA256 9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68 WHIRLPOOL 151a505968b871eae82bff1799464e4c6042e99668ec4752ecfa7537ed6968886134941bfcc7741ad56ba8ebb429c021046a968db92b1bba89bf1a1d2bb4a0d1
 EBUILD thunar-archive-plugin-0.3.1-r1.ebuild 1028 SHA256 bd26823261f375fc67a9e913dfb7342c8686c785a29825a2c9b0fc20b2b284b9 SHA512 c58ec732f62d61287f0869f9fedaa4c5237baba2f075fb5bb7135958229f5aab0802f2ce6612bd0536e00213a74e48fea4dbf59d4a95558d1ba423a1de6ab8ac WHIRLPOOL 16213482a596473b42bab4acca415214004f01504c06e9dd407285f6c4f8229940aeac96e406b45e197bf34bd013675ca0b4d476d84e41bf07ed0029da604ee3
+EBUILD thunar-archive-plugin-0.3.1-r2.ebuild 1083 SHA256 fbeb48098f6f99663f24f84c720b7caa2fadc6084ba02c1075e3da627b4f25cd SHA512 f62d2c320408a606190c74f787a4eabd52f3479bde28b74a63c515c5da916408f1bec14ca6cfd17fe3e70e24a9ceb82e96b6a4d52b238e8468480b3e2c710eef WHIRLPOOL d4925c0bfc8cec5c1f3b4d58ee6bbaee681defd322bf8a7f6228dfad6db257219f2afecad6aeef9dd2751cb8601d9f9056153111824b6f39941ded27a0663bf9
 EBUILD thunar-archive-plugin-0.3.1.ebuild 888 SHA256 ef5055673bcc8b311738e57b06bcc8e58a911352562af84e5fea4e39be78dc4e SHA512 a67b8b54f286817d9ac98dd8f00012909bea45219514e0661a16176b717d701116100d615513e34996dfc556ff44d6f7ffbcec90a1b0a9547caaeb6cd7760ee2 WHIRLPOOL 354a76e08e2f1d995fc398b56dabc47c10ecfe1e2cd476eb931131ab2939cd2c5f0ce43563ae3c5dfa48f2d268ce985ce951fbf89c29fb9f60824ab0d1e58dbc
-MISC ChangeLog 4789 SHA256 d8bef20fe8f38c175f076642a8beb980c541c3e2f4c01b240c2a299ca1d188df SHA512 08e5266395ba7484a45aab51b3507463d59952803d0a33f9c7d9377a155287350acba78d30e5875b0c5efb287b5d5bcfe21205bb255bd010a710ddabb4923a63 WHIRLPOOL ef595275bb469610a7c62aaee1bbd1591505bf10d6654ef445841601e6f7ac57e316d9ef3a2e9f35e8388be1aba4aa4be000fb27871efe661267fb7794ac81dd
+MISC ChangeLog 5061 SHA256 59948a00ae4421d79b2baecaf992a8eb71dd1b8be3e1b9597b56665b12adf186 SHA512 0cb2733129e9c06116c88ae1822ad053a01988216f8c57e176567bcb3b232d06a76a85bcac0112471bfaa4bcf432382f33d9a0a24859d963eecf8c34c0d43933 WHIRLPOOL 8f676d5730b9acf567c67283b59da737f4e56577a349eae6c1bed14ff88157bf35fff77196b27d9ba26bf12300e1d6ee692874989e89f5a4a8edeeb3a53fd0ba
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUGVYACgkQG9wOWsQutdasggQApAqrA02cWao83w9eLhVM9yx1
-GHDULoSIf/xxqQPmQZQWCxFRnyZY4jhDkwBzA86kFyvL2yJEHlK4eceRq/sEeu5X
-s+8/gOoZeRb1qztkwi12dGCah/gkCm1oE+lo7VIm4WmZwhVd1nC2ZLqmYH9XeBB9
-ow9V+d0gRwPzmhSdc2s=
-=1Bl8
+iQJ8BAEBCABmBQJVmPkBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V6cUQALTmKBk8DWyF99ICVANR5ftj
+J//AKLDvLxvRDXCBpEZiTOzBl7QzqUYvJxCxg957wENIrS1MacjiM4jS45nDRQNw
+W1UwH3u2w7M0X8Lwc2TrLY2ihqkj0UbjqR9tE4vwM+20Q12u9uMR4iDHlD4WjXnf
+w078Krar9HXNBMGZis2MB/csorBV63xTVv/0cul+hYNvf5UX65AsWFaCDMTpOIQL
+erkTTv4+/jz8gvccOdGqYeh7ZvOniS/vzk3qft8M/Oerenwr+4uvlGP+1942/sr/
+xOb7JaKYOPr74CHtHDDSK8ZAs5vKlGQYbXApuQr0ErayiqFfgCB9vafq46ahf2CU
+1CBruMZM5S4bHBSfU9H5WPFGP5perBc20JSU1ueQBO3mzRlAQAx5FzXQ7WStJmZV
+lpR16C1Ha10/oe67S5OM9pDNnA7bF7H7WG/GjxKvBKSMraSw+QuK4wjS7k6kqu6d
+Y7AnVk6Qjniczv4RKVEONo+H3Pf2ebaIyFp0AQchllzY/hj1sDy/jRIDrMbaMYoD
+CadDiFW6xOVz+YqJ+We2q9Jf4WGp5tI1j3xHCCO6rO0e2rRySAbTAMVZ26M2AbrD
+v+kCYFYZGuJ/bwBT80EUk5jfEkAMSLEBWr8wSYjTU4xW0WWd9OK+iK3s9j+BgCnP
+z5bhBm9KipxhZtBC+LwZ
+=L38H
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-add-support-symlinks.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-support-symlinks.patch
new file mode 100644
index 000000000000..bbe5f566a4c5
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-support-symlinks.patch
@@ -0,0 +1,15 @@
+diff -ur thunar-archive-plugin-0.3.1.old/scripts/Makefile.am thunar-archive-plugin-0.3.1/scripts/Makefile.am
+--- thunar-archive-plugin-0.3.1.old/scripts/Makefile.am	2013-05-11 13:48:30.000000000 +0400
++++ thunar-archive-plugin-0.3.1/scripts/Makefile.am	2015-07-05 12:55:32.052090677 +0400
+@@ -9,8 +9,9 @@
+ install-exec-hook:
+ 	$(mkinstalldirs) $(DESTDIR)$(wrapperdir)
+ 	-( cd $(DESTDIR)$(wrapperdir) ; \
+-		test -f gnome-file-roller.tap \
+-		|| ln -sf file-roller.tap gnome-file-roller.tap )
++		ln -sf ark.tap kde4-ark.tap; \
++		ln -sf file-roller.tap gnome-file-roller.tap; \
++		ln -sf file-roller.tap org.gnome.FileRoller.tap; )
+ 
+ EXTRA_DIST =								\
+ 	$(wrapper_SCRIPTS)						\
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-kde-ark.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-kde-ark.patch
new file mode 100644
index 000000000000..e95fbbe0e407
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-kde-ark.patch
@@ -0,0 +1,22 @@
+diff -ur thunar-archive-plugin-0.3.1.old/scripts/ark.tap thunar-archive-plugin-0.3.1/scripts/ark.tap
+--- thunar-archive-plugin-0.3.1.old/scripts/ark.tap	2013-05-11 13:48:30.000000000 +0400
++++ thunar-archive-plugin-0.3.1/scripts/ark.tap	2015-07-05 12:56:25.288680104 +0400
+@@ -30,15 +30,15 @@
+ # check the action
+ case $action in
+ create)
+-	exec ark --add "$@"
++	exec ark --dialog --add "$@"
+ 	;;
+ 
+ extract-here)
+-	exec ark --extract-to "$folder" "$@"
++	exec ark --batch --destination "$folder" "$@"
+ 	;;
+ 
+ extract-to)
+-	exec ark --extract "$@"
++	exec ark --batch --dialog --autodestination "$@"
+ 	;;
+ 
+ *)
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..cb8d50ed5fe3
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild,v 1.1 2015/07/05 09:29:36 perfinion Exp $
+
+EAPI=5
+
+EAUTORECONF="yes"
+inherit xfconf
+
+DESCRIPTION="Archive plug-in for the Thunar filemanager"
+HOMEPAGE="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
+SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=xfce-base/libxfce4util-4.8:=
+	>=xfce-base/exo-0.6:=
+	>=xfce-base/thunar-1.2:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/0.3.1-add-engrampa-support.patch
+		"${FILESDIR}"/0.3.1-fix-kde-ark.patch
+		"${FILESDIR}"/0.3.1-add-support-symlinks.patch
+		)
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+}