Fix bug 302900

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 74 insertions, 3 deletions

diff --git a/app-text/rarian/ChangeLog b/app-text/rarian/ChangeLog
index e6620b5e1e67..6da07352684b 100644
--- a/app-text/rarian/ChangeLog
+++ b/app-text/rarian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/rarian
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.41 2009/10/07 15:54:33 leio Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.42 2010/03/12 12:27:24 pacho Exp $
+
+*rarian-0.8.1-r1 (12 Mar 2010)
+
+  12 Mar 2010; Pacho Ramos <pacho@gentoo.org> +rarian-0.8.1-r1.ebuild,
+  +files/rarian-0.8.1-fix-old-doc.patch:
+  Fix bug 302900. Thanks to Rafał Mużyło for reporting and the patch.
 
   07 Oct 2009; Mart Raudsepp <leio@gentoo.org>
   -files/rarian-0.6.0-posix-getopt.patch,
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 4559ae0660fe..477d974638f6 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rarian-0.8.1-fix-old-doc.patch 629 RMD160 5a93e3dc68131f951eac5294b34ebb47c28995d1 SHA1 4c0cebd42771d7c80f0851c75032c98d22796140 SHA256 2ac6f3d6df8f221fa36fbe4a86ee9a9c6d4d8a829d58d1d85afff1c9b959ad65
 DIST rarian-0.8.1.tar.bz2 324441 RMD160 2e4c0a4d22a4e0c41d4d3dc8e4a5ad080ee3b6ce SHA1 9b3f1bad1cdbb0de51d6f74431b20eb3647edc5a SHA256 aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577
+EBUILD rarian-0.8.1-r1.ebuild 1045 RMD160 08067c29ec191f329558da18ffcedd75ab88a05f SHA1 01bad3c3a1230f7d74da4fe5db23732603034f24 SHA256 2c1a37bf7fccd657d2a99ca6f1d128410d147fe1c6f73248fe5be6abf4a7798c
 EBUILD rarian-0.8.1.ebuild 914 RMD160 ffb9641cc2f66af7f1bdc94cb8507bb0b37cd249 SHA1 a1151564b79fb361b30d5f8edd77179b273759bf SHA256 b3b3a1491de1f404aa599ffb94e9625f55d4a6b2e0747d8b89f6b225dc6aed2c
-MISC ChangeLog 5255 RMD160 f1c8412c5a71997d6d48d1df5cd0389bef35e14f SHA1 7081cbc607b6e2ca957dd0c98d831b74f43c7027 SHA256 c6a4ca33ab6bcea5d21514b338accf71f377cc8ecf9ddbb1eed253493abe38e0
+MISC ChangeLog 5474 RMD160 10a1a8f7ac6ae58d0d7263abafd97fdd0ef37b39 SHA1 decc5dcb3cb5549904c26fe552f02a163ed5b0ba SHA256 535543dc9b6471cdd0c9263b8dafa076cdcb3955bba1974e8094df30c5904902
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuaMzgACgkQCaWpQKGI+9TU/ACeLjvIrQagE9ez5/nMtfGLk9nS
+Y1MAmgNWzY8R5nNyuFsuyVCL3vWdjNxw
+=cLZ4
+-----END PGP SIGNATURE-----
diff --git a/app-text/rarian/files/rarian-0.8.1-fix-old-doc.patch b/app-text/rarian/files/rarian-0.8.1-fix-old-doc.patch
new file mode 100644
index 000000000000..f84f987d8f10
--- /dev/null
+++ b/app-text/rarian/files/rarian-0.8.1-fix-old-doc.patch
@@ -0,0 +1,13 @@
+--- util/rarian-sk-preinstall.cpp.old	2008-09-01 20:40:21.000000000 +0200
++++ util/rarian-sk-preinstall.cpp	2010-01-30 11:29:39.000000000 +0100
+@@ -96,8 +96,8 @@
+     }
+     if (i == 1) {
+       /* Normal path.  Add file:/ to the start */
+-      new_url = (char *) malloc (sizeof(char) * (strlen (input) + 7));
+-      sprintf (new_url, "file:/%s", input);
++      new_url = (char *) malloc (sizeof(char) * (strlen (input) + 8));
++      sprintf (new_url, "file://%s", input);
+     } else {
+       /* Don't know what to do.  Just copy and append file: to it */
+       new_url = (char *) malloc (sizeof(char) * (strlen(input) + 6));
diff --git a/app-text/rarian/rarian-0.8.1-r1.ebuild b/app-text/rarian/rarian-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..421822877cfd
--- /dev/null
+++ b/app-text/rarian/rarian-0.8.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.8.1-r1.ebuild,v 1.1 2010/03/12 12:27:24 pacho Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A documentation metadata library"
+HOMEPAGE="http://www.freedesktop.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	!<app-text/scrollkeeper-9999"
+
+DOCS="ChangeLog NEWS README"
+
+GCONF=""
+
+src_unpack() {
+	# You cannot run src_unpack from gnome2; it will break the install by
+	# calling gnome2_omf_fix
+	unpack ${A}
+	cd "${S}"
+
+	# Fix uri of omf files produced by rarian-sk-preinstall, see bug #302900
+	epatch "${FILESDIR}/${P}-fix-old-doc.patch"
+
+	# remove unneeded line, bug #240564
+	sed "s/ (foreign dist-bzip2 dist-gzip)//" -i configure || die "sed failed"
+
+	elibtoolize ${ELTCONF}
+}
+
+src_compile() {
+	gnome2_src_compile --localstatedir=/var
+}