alpha/ia64/sparc stable wrt #358407

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 7 insertions, 68 deletions

diff --git a/xfce-extra/thunar-archive-plugin/ChangeLog b/xfce-extra/thunar-archive-plugin/ChangeLog
index 0c1d7bb0e9a5..e989745ab65e 100644
--- a/xfce-extra/thunar-archive-plugin/ChangeLog
+++ b/xfce-extra/thunar-archive-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/thunar-archive-plugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.17 2011/03/22 20:49:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.18 2011/04/23 17:48:28 ssuominen Exp $
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+  thunar-archive-plugin-0.3.0.ebuild:
+  alpha/ia64/sparc stable wrt #358407
 
   22 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
   thunar-archive-plugin-0.3.0.ebuild:
diff --git a/xfce-extra/thunar-archive-plugin/files/thunar-archive-plugin-0.2.4-7zlzmaxz.patch b/xfce-extra/thunar-archive-plugin/files/thunar-archive-plugin-0.2.4-7zlzmaxz.patch
deleted file mode 100644
index 2e3c65e1a329..000000000000
--- a/xfce-extra/thunar-archive-plugin/files/thunar-archive-plugin-0.2.4-7zlzmaxz.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6136
---- thunar-archive-plugin-0.2.4-old/thunar-archive-plugin/tap-provider.c	2007-01-20 12:41:50.000000000 +0200
-+++ thunar-archive-plugin-0.2.4/thunar-archive-plugin/tap-provider.c	2010-01-10 01:05:12.857875928 +0200
-@@ -97,6 +97,8 @@
- 
- 
- static const gchar TAP_MIME_TYPES[][34] = {
-+  "application/x-7z-compressed",
-+  "application/x-7z-compressed-tar",
-   "application/x-ar",
-   "application/x-arj",
-   "application/x-bzip",
-@@ -108,9 +110,13 @@
-   "application/x-gzip",
-   "application/x-lha",
-   "application/x-lhz",
-+  "application/x-lzma",
-+  "application/x-lzma-compressed-tar",
-   "application/x-rar",
-   "application/x-rar-compressed",
-   "application/x-tar",
-+  "application/x-xz",
-+  "application/x-xz-compressed-tar",
-   "application/x-zip",
-   "application/x-zip-compressed",
-   "application/zip",
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.2.4-r2.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.2.4-r2.ebuild
deleted file mode 100644
index b77967537842..000000000000
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.2.4-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 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.2.4-r2.ebuild,v 1.14 2011/01/23 17:13:22 ssuominen Exp $
-
-EAPI=3
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Archive plug-in for Thunar, filemanager of the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/0.2/${P}.tar.bz2
-	mirror://gentoo/${PN}-0.2.4-thunarx-2.patch.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"
-
-COMMON_DEPEND="xfce-base/thunar"
-RDEPEND="${COMMON_DEPEND}
-	|| ( app-arch/xarchiver app-arch/file-roller kde-base/ark app-arch/squeeze )"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-7zlzmaxz.patch )
-
-	if has_version ">=xfce-base/thunar-1.1.0"; then
-		PATCHES+=( "${WORKDIR}"/${PN}-0.2.4-thunarx-2.patch )
-	fi
-
-	XFCONF=(
-		--disable-dependency-tracking
-		$(xfconf_use_debug)
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
-}
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild
index 02e27c197090..d6d1284428b9 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.0.ebuild,v 1.5 2011/03/22 20:49:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild,v 1.6 2011/04/23 17:48:28 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/0.3/${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"
+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.6