Version bump to 2.26.3, and fix compilation error due to missing header for src/fr-enum-types.c

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 123 insertions, 12 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index 1152a2ed88c9..08a66a7c8f00 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.257 2009/05/18 21:27:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.258 2009/07/07 19:06:59 mrpouet Exp $
+
+*file-roller-2.26.3 (07 Jul 2009)
+
+  07 Jul 2009; Romain Perier <mrpouet@gentoo.org>
+  +file-roller-2.26.3.ebuild,
+  +files/file-roller-2.26.3-typedefs-header-typo.patch:
+  Version bump to 2.26.3, and fix compilation error due to missing header
+  for src/fr-enum-types.c
 
 *file-roller-2.26.2 (18 May 2009)
 
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 02549e814ab6..b2adf89d2005 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX file-roller-2.10.3-use_bin_tar.patch 504 RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 SHA1 a40077b5ace4be970dae46b44aa5b8ce19a75780 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052
+AUX file-roller-2.26.3-typedefs-header-typo.patch 657 RMD160 0983884e248c8a74575d9227e634eaca33f9281a SHA1 009191a3c8aa4e1baa39b202e1ca47a9bfcddb86 SHA256 59ed9069d44da40ea496659fb7eacab76c59f7308b09f399bf7150c323f72e27
 AUX rpm2cpio-file-roller 2556 RMD160 c123c4f046a5844d75a90f4a1edb308b17d99bd9 SHA1 81558e086339f4bdb373ebd4bc33215ec31debae SHA256 75dc7413d516d1f315534662c5a098c7973866b4d125547cd2696190818b8b6a
 DIST file-roller-2.24.3.tar.bz2 1484687 RMD160 494bb520c86cb81d543370a7c621783b8a42ef0e SHA1 afba08f5b09414506a42dd5d8679748392dfa7a3 SHA256 c15956b5348b4066f4e244be10db6f4ef802d316103d1d870c56d4347eb4dca1
 DIST file-roller-2.26.1.tar.bz2 1563081 RMD160 c930052e98957a7f4cc29897c0d6a880fa9a46b9 SHA1 a95c3add34612ad8f5423989bc421ffb682665f0 SHA256 4bfc1cd9405c91850034e07b1c0c69c4e1067e4bda5c8135f70085e578cf6918
 DIST file-roller-2.26.2.tar.bz2 1565897 RMD160 7697cc08cb493da99d21afb913f5e1a57ca8de9c SHA1 4989d1e2d5c7f13e9e5612625ae9ea5770f551cb SHA256 e93055dfb149396903204539d0754a9e3b76e52e7668ac2f744b0820041a61ac
+DIST file-roller-2.26.3.tar.bz2 1561967 RMD160 4c8cb579c4849a6cdc92250df5b447f575be76a6 SHA1 92760312c9dddec695851170c289f692c2521176 SHA256 06ec16ab8b1c9d0a1b3d40d2d63cd8170776bcc44ffa1f48e0403a9e23aef769
 EBUILD file-roller-2.24.3.ebuild 2167 RMD160 6325392bc460fea18ce511c2e7689c8be13bfa52 SHA1 951e1d7f2aa05bbfbe566024720346dabc77fd13 SHA256 f3683c9ed9e179007d93cc335a35e83bf685ef13b2b62888b574cc775965f078
 EBUILD file-roller-2.26.1.ebuild 2300 RMD160 972301dad142cf095ed1448e55e07289d6dbf797 SHA1 5097083c969bf83e311d8760225e6c43edbb7917 SHA256 df7851b34cdc2c48c2177daff7ae69476cc05c4af359f8edb501d2e739d03871
 EBUILD file-roller-2.26.2.ebuild 2291 RMD160 ffe24c681bf491f6a175d4d689de63d89ea86c08 SHA1 74be4b4978366eb40e592a78a40fd734691779ef SHA256 f36591ac80341482abd5020fa843486d8427da04d5a196f1c8cba34c292251dc
-MISC ChangeLog 33387 RMD160 8bb8a476b3031921724cdee26a5e477fe282db72 SHA1 93d7d07acb433c2463ae8317095653e3e0cfd440 SHA256 53eada2989568839db64d390ead81303fcd9904541bafe716d4f629b81c99b19
+EBUILD file-roller-2.26.3.ebuild 2433 RMD160 78cc1849e257d4c108e135d762a34bb8022a7697 SHA1 c916dba5a24c1e3b579138bb3359c1297fdc1927 SHA256 90452af6dd209a5aa3967401cc445e3ebe4cf038dbd7e711cebcf88512fbdc68
+MISC ChangeLog 33663 RMD160 3ab6af5e8f18b52037b7db5bda0fa049a68344b6 SHA1 712c83d0f343580e39a2c345a5c4a7650344d229 SHA256 ff56f90bf1cadd46abba15ca8b442b67e52589908897fdfd0f5f187666a3faa3
 MISC metadata.xml 312 RMD160 3826a5dad37bd2c9a06bc83d820ad73fc982cbe9 SHA1 3b783bbd0a5e2ac14242664bc3b21d4753086121 SHA256 96d7fa4361428c9ed083d5a4a0294091735633b8f4a03ffa58413e417b3bfba6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoR0rwACgkQ1fmVwcYIWAawVQCaA8c5QggG4OMnDhFCETzkisRp
-JcQAn1nmmah+zZpuvDbuRvzgtVkjeYTu
-=29zc
------END PGP SIGNATURE-----
diff --git a/app-arch/file-roller/file-roller-2.26.3.ebuild b/app-arch/file-roller/file-roller-2.26.3.ebuild
new file mode 100644
index 000000000000..570a85e9c0de
--- /dev/null
+++ b/app-arch/file-roller/file-roller-2.26.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.26.3.ebuild,v 1.1 2009/07/07 19:06:59 mrpouet Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="archive manager for GNOME"
+HOMEPAGE="http://fileroller.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nautilus"
+
+RDEPEND=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.13
+	gnome-base/gconf
+	nautilus? ( gnome-base/nautilus )"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig
+	app-text/gnome-doc-utils"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-scrollkeeper
+		--disable-run-in-place
+		--disable-static"
+
+	if ! use nautilus ; then
+		G2CONF="${G2CONF} --disable-nautilus-actions"
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Use absolute path to GNU tar since star doesn't have the same
+	# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
+	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
+
+	# Fix compilation error, due to a bad file generated using glib-mkenums
+	epatch "${FILESDIR}"/${P}-typedefs-header-typo.patch
+
+	# use a local rpm2cpio script to avoid the dep
+	sed -e "s/rpm2cpio/rpm2cpio-file-roller/g" \
+		-i src/fr-command-rpm.c || die "sed failed"
+
+	# Fix intltoolize broken file, see upstream #577133 and #579464
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+}
+
+src_install() {
+	gnome2_src_install
+	dobin "${FILESDIR}/rpm2cpio-file-roller" || die "dobin failed"
+}
+
+pkg_postinst() {
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format support, see ${HOMEPAGE}"
+	elog "and install the relevant package."
+	elog
+	elog "for example:"
+	elog "  7-zip   - app-arch/p7zip"
+	elog "  ace     - app-arch/unace"
+	elog "  arj     - app-arch/arj"
+	elog "  lzma    - app-arch/lzma"
+	elog "  lzop    - app-arch/lzop"
+	elog "  cpio    - app-arch/cpio"
+	elog "  iso     - app-cdr/cdrtools"
+	elog "  jar,zip - app-arch/zip and app-arch/unzip"
+	elog "  lha     - app-arch/lha"
+	elog "  rar     - app-arch/unrar"
+	elog "  rpm     - app-arch/rpm"
+	elog "  unstuff - app-arch/stuffit"
+	elog "  zoo     - app-arch/zoo"
+}
diff --git a/app-arch/file-roller/files/file-roller-2.26.3-typedefs-header-typo.patch b/app-arch/file-roller/files/file-roller-2.26.3-typedefs-header-typo.patch
new file mode 100644
index 000000000000..d45000d6ef00
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.26.3-typedefs-header-typo.patch
@@ -0,0 +1,24 @@
+Fix compilation error, due to src/fr-enum-types.c which was bad generated using
+glib-mkenums. "../../src/typedefs.h" didn't exist.
+
+ src/fr-enum-types.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/fr-enum-types.c b/src/fr-enum-types.c
+index df260be..8418183 100644
+--- a/src/fr-enum-types.c
++++ b/src/fr-enum-types.c
+@@ -1,10 +1,10 @@
+ 
+ /* Generated data (by glib-mkenums) */
+ 
+-#include <glib-object.h>
++/* enumerations from "typedefs.h" */
++#include "fr-enum-types.h"
++#include "typedefs.h"
+ 
+-/* enumerations from "../../src/typedefs.h" */
+-#include "../../src/typedefs.h"
+ GType
+ fr_compression_get_type (void)
+ {