fix fileroller and engrampa. PR https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/104 thanks to brakarov

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

5 files changed, 144 insertions, 11 deletions

diff --git a/xfce-extra/thunar-archive-plugin/ChangeLog b/xfce-extra/thunar-archive-plugin/ChangeLog
index 1fa451282433..f5ec94b1514a 100644
--- a/xfce-extra/thunar-archive-plugin/ChangeLog
+++ b/xfce-extra/thunar-archive-plugin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/thunar-archive-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.30 2014/04/22 13:57:25 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.31 2015/05/19 16:48:22 perfinion Exp $
+
+*thunar-archive-plugin-0.3.1-r1 (19 May 2015)
+
+  19 May 2015; Jason Zaman <perfinion@gentoo.org>
+  +files/0.3.1-add-engrampa-support.patch, +files/0.3.1-fix-file-roller.patch,
+  +thunar-archive-plugin-0.3.1-r1.ebuild:
+  fix fileroller and engrampa. PR https://github.com/gentoo/gentoo-portage-
+  rsync-mirror/pull/104 thanks to brakarov
 
   22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
   -thunar-archive-plugin-0.3.0.ebuild:
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index f55a19c01b50..58c48eb48f9f 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.3.1-add-engrampa-support.patch 2009 SHA256 10f5ceac953ea0c3f5551f47d4fca09445c5cab9b343fb70380d451f29387f8a SHA512 031e795a761dac036ebefa9f545212a04fbe028d7caedc72f7d4f29c49a7b748f30fb49d0edd635ec66c91b41ee03134cafb404080c079063c54140405e9c769 WHIRLPOOL 44bec3a2a96a7291f257e3c6fea322980f98772947a6323ef93967d908e403870e9b8f33589a818ad3faca3e8953cdeba728deb35a195df3bbb418362a8e898c
+AUX 0.3.1-fix-file-roller.patch 524 SHA256 59210e2fce9c49871d69e31845097e4200ffdd08766d0be25ffe80c62a77d9f6 SHA512 0f08fd5e83132194d37c9fe36bc894774592f2469bb3c48e062265d6e2f01332d04f711808fa25c2c0bb65c34e35983f7b5b1e322087a4bebe8368a3cb5aea50 WHIRLPOOL b27105da84b53708826768edf4daaddff469fb2af24c5c08f74d5799cdd7f93dc1506814b7295fb715875c2d8b5326253bd0a7e32bd907764282fc6244f6a8e2
 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 1032 SHA256 d97c2fd9fd4dd3a1d922dbe861649631420ace6127022aac7048fb37e2f67568 SHA512 a0cc6808c6202693ed2abea86915f422a43d8e52b8a537786fe9666454c6ed1c2ea8557a5274e6ad6d66dc0c1095a485852785b4aa4130470a573bdb27f0f3c5 WHIRLPOOL 3635ef73dcea61596c1b186118b0104eaec2b4f1e26dc35d329915de7a70182f462027f4f20c34c54d9d6fac389e211e6e435a940e16d1da3bde78f596fdfc68
 EBUILD thunar-archive-plugin-0.3.1.ebuild 888 SHA256 ef5055673bcc8b311738e57b06bcc8e58a911352562af84e5fea4e39be78dc4e SHA512 a67b8b54f286817d9ac98dd8f00012909bea45219514e0661a16176b717d701116100d615513e34996dfc556ff44d6f7ffbcec90a1b0a9547caaeb6cd7760ee2 WHIRLPOOL 354a76e08e2f1d995fc398b56dabc47c10ecfe1e2cd476eb931131ab2939cd2c5f0ce43563ae3c5dfa48f2d268ce985ce951fbf89c29fb9f60824ab0d1e58dbc
-MISC ChangeLog 4209 SHA256 a887f66aaecbfb7b5c95b217a79b3f953f9fd384b3ebd6ea6a018918075da268 SHA512 53e25324f27f4c2b041dd34fcf3fabeabdb9cc8522ee6838e6700fdf2610e8b0e9a0648742f76e3d129cbc3853177534771422cd7d06cafc45e249b3221b7606 WHIRLPOOL 712b9fe962282f13516b5a83f44e86c8d75ec61d9f473439e2390cacdf6009a899fb2b981735d6aebae7a8325b3064fe3d174276dcaa4e58bc8f347bcaa75128
+MISC ChangeLog 4547 SHA256 65f3b74aa96a5e2d692d0ba106afe86234fd62e0903ca5a0af328af79ef3b134 SHA512 b2bbed374bab13ca7758929833d64dd952e19590a0518f98d59c9f07323e86678be86d4a16a8c8cf98f18cb45bed96e6d16e418058ddd1fa4d2eda428c802a28 WHIRLPOOL 7ee9f8e0c1aa762674bf3a9dfc70ff9502e637ec746f98683a8263082bd5f65ab355e2f27c623f0f6dabd83ce90f52bf67943ca3ca8825f79229a0264894affb
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTVnVFAAoJEEdUh39IaPFNUSUH/j+Ol9/3hE53WW9+hApgHBnz
-Y6eOYSPaAqn/Y6gBRJe7nhF/ykCO9iPBaUGAZtGziZl8RMNQzJJeuhtRNpHnqn36
-2VUDxrMAcgdvODV1Sm2h9mgb4Mn8Dn1BbMdSli95oj76BCnWnhveISIZ34luYbby
-wKTS0nSUj2FI5Yl///LhazgV2tXQq7GX6Pns7H2oryYwnLREWarUJGxJWIraV9Ft
-4VUY+UeaWJjbqEsBfShEWWaiZD4PJ8ccHruCx0P+4YEvXMPt3Yn1Lnah+vm8atFf
-rDjtP+WuAj7MCCbL1x8d6tmn0WJGqCoWLgbqKga8ReOPets+AIYB3sw4krmLdnA=
-=P85g
+iQJ8BAEBCABmBQJVW2ldXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9ViqoP/2pmZ3SwLB5GYimk59sJcR2H
+TuOY28PTkWG6nL5pZS0NbH+lN2tqME2t8N5SnephCywjr3TwSDMXAFtKoLs7kTsn
+6A9RV7EH4d5JqbVcUXiiiTk6AjCPVCHKh/jtbySUjNfyHnkJi4/eCLZjfr7AX17E
+2wmlzM0YC025Szb92kau/rxbKy4znfM7ty/kfmrFGRzRuqk8fZCSilxTwWu3Rc55
+o8Cj8zbSqyC+wJX7c8PCTCQ7aMhyluScop3yA6a8JOn7dRgqrNHZ35TGctiuxx/P
+niMNJ692QIxViHPFl3cYjDFMu0SUE1FhSxxjBseiV8s/giLHr3U8mwzLHW/XtwdC
+eqvD7ZTGkg3kcoAXxu93/I4whejAe6SgkrRmws26Nyuvp+fyY3x6nK7Lb8vUScWN
+K1EbsogWZh362qZv4MB5f4+HpkCJM9kqTMZq/xnGhzsm6KQVcSnRb/VKJRrq/d14
+ks5ArSl7Jnlf9dKBRwnRuw0TdiA7nSWJYISIYjjDfB5P3QbWLVUaRqp8Epr3OlGj
+f4y4k20Z/zmLGkZ9reJYar2c6lRaD2QH39rVO+eo6K2EIFub128zpffEim8bAp+U
+ATdRMSw6YDqDNHWP5vHJIOEiOzfFCZ2sGKgicKYBuk/3FkrPtdIXCaDNDDOKQ2Lk
+wk/m3JJBPjbWTNGY5YFj
+=NA7n
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch
new file mode 100644
index 000000000000..becccda1ac59
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch
@@ -0,0 +1,68 @@
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 4da529c..ec49cba 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -3,7 +3,8 @@
+ wrapperdir = $(libexecdir)/thunar-archive-plugin
+ wrapper_SCRIPTS =							\
+ 	ark.tap								\
+-	file-roller.tap
++	file-roller.tap							\
++	engrampa.tap
+ 
+ # Install symlink to 'gnome-file-roller.tap'
+ install-exec-hook:
+diff --git a/scripts/engrampa.tap b/scripts/engrampa.tap
+index e69de29..a9d9c10 100755
+--- a/scripts/engrampa.tap
++++ b/scripts/engrampa.tap
+@@ -0,0 +1,48 @@
++#!/bin/sh
++#
++# engrampa.tap - Wrapper script to create and extract archive files
++#                   in Thunar, via the thunar-archive-plugin, using the
++#                   engrampa archive manager.
++#
++# $Id: 0.3.1-add-engrampa-support.patch,v 1.1 2015/05/19 16:48:22 perfinion Exp $
++#
++# Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>.
++#
++# This program is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the Free
++# Software Foundation; either version 2 of the License, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++# more details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
++# Place, Suite 330, Boston, MA  02111-1307  USA.
++#
++
++# determine the action and the folder, $@ then contains only the files
++action=$1; shift;
++folder=$1; shift;
++
++# check the action
++case $action in
++create)
++	exec engrampa "--default-dir=$folder" --add "$@"
++	;;
++
++extract-here)
++	exec engrampa "--extract-to=$folder" --force "$@"
++	;;
++
++extract-to)
++	exec engrampa --extract "$@"
++	;;
++
++*)
++	echo "Unsupported action '$action'" >&2
++	exit 1
++esac
++
+
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-file-roller.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-file-roller.patch
new file mode 100644
index 000000000000..094480212f12
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-file-roller.patch
@@ -0,0 +1,15 @@
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 4da529c..2ba8dec 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -9,8 +9,8 @@ wrapper_SCRIPTS =							\
+ 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 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/thunar-archive-plugin-0.3.1-r1.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..16685f6d1619
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
@@ -0,0 +1,31 @@
+# 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-r1.ebuild,v 1.1 2015/05/19 16:48:22 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-file-roller.patch )
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+}