now with 1 less segfault

Package-Manager: portage-2.1.4.4

4 files changed, 60 insertions, 12 deletions

diff --git a/app-text/rarian/ChangeLog b/app-text/rarian/ChangeLog
index 912b19a1b8f2..4a6e82c8c148 100644
--- a/app-text/rarian/ChangeLog
+++ b/app-text/rarian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/rarian
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.19 2008/03/23 15:43:22 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.20 2008/03/30 21:06:20 compnerd Exp $
+
+*rarian-0.8.0-r1 (30 Mar 2008)
+
+  30 Mar 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/rarian-0.8.0-info-segfault.patch, +rarian-0.8.0-r1.ebuild:
+  Revbump with a patch to fix a segfault
 
 *rarian-0.8.0 (23 Mar 2008)
 
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 53a5535972ab..220b1088f689 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rarian-0.6.0-posix-getopt.patch 1284 RMD160 6443e95fcdca98b2673cdcb4bfaed0dc3c9b5ea2 SHA1 56286711d1e8a5c074132837bd208b9a5e7085f2 SHA256 374d0340c4241d9759fe538e857e685b1ee85d0a6de6c493da42ce34eb5f4c11
 AUX rarian-0.6.0-reg-return.patch 1742 RMD160 67f19f8ef7907ab74e2fedbb702e01395d8dd72d SHA1 3ce654d23a3e9b9da6f8dad2511b4473892b78f8 SHA256 5553c36fb7c74873397e8e1b70f4c419f98d96bebf49950f878a357ee663345e
+AUX rarian-0.8.0-info-segfault.patch 326 RMD160 8dc640144efc62233663c9c5663f014808a506ed SHA1 86e7833e1a7e50004621f33561b97ba1a1c68b10 SHA256 8b70b458e2d28778cae35867b3af90c2ca7e1a640988f1eff5c686ed08782ee5
 DIST rarian-0.6.0.tar.bz2 312258 RMD160 167c02f58e493c624d0eedb1137928c7a7cc452a SHA1 7bf1fce5cc2bfd4584fb776d20d3a379e888b81a SHA256 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029
 DIST rarian-0.8.0.tar.bz2 338724 RMD160 28545ad9afbef3f0c6e1b80ee294833c31a32d56 SHA1 ee19a6c1300a51adec765f02351b1779477fc462 SHA256 93f97611ead9a5ed4aed468532c0543f0f8cdfed350f94ba8b0f789a10a1de9c
 EBUILD rarian-0.6.0-r1.ebuild 987 RMD160 9b4259a21f7b6ed273897528707624525d9295a5 SHA1 77ed34b89f98b6e6d3209b93e532ad347b505947 SHA256 f6e09680868e6dd5be639ee29bd08737b640dc338a7972cecaa560a8af0f0a65
+EBUILD rarian-0.8.0-r1.ebuild 947 RMD160 2fd2d8e5f48068cb4e3cac6837762a6ef80a2ecc SHA1 a8a0cbb7384822f931104c4579abfa4dd447a5ad SHA256 0d04bcd68077edc3ab7c43a26e17c2c55be3d4a13b2be92b4083d9d4bfca74a6
 EBUILD rarian-0.8.0.ebuild 885 RMD160 7a4ef2eea9a23e4fe8d3f19d34ab14bbc7e45ca4 SHA1 16a61b24d7f02ed76d61a8e8c4fc53f2f123e948 SHA256 ac7d50c3f8ea3484d1dcacdaaa1be749506fc4fad5426770aa4c1a3564cca6e9
-MISC ChangeLog 2661 RMD160 a0c41295e2c2b9ec6ca10410db8c18cdaee09b7a SHA1 1004032b7eee1a5131e3329a2e771e4489a9b6fd SHA256 fb91ddaa1672a55cc7243229177f228fd1d2aaf2be9cc77c4de3b796ed1b79df
+MISC ChangeLog 2863 RMD160 ac03d541cd00aae51dcf1d7156752277db91de89 SHA1 129e0e9828d2f0cc6609356fa6c419ce8f655fb9 SHA256 400d9b07975e1e3f25e0683c63cf9cf1f9d1cd31ed0c00f66ca9fa1e381b45ef
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkfmepcACgkQkeYb6olFHJedYACg2YfyjacXlxOsk7j0eOyMeYoZ
-bIsAn2iheJQk9FtiwcsoFezPyddHW9ky
-=wZ/U
------END PGP SIGNATURE-----
diff --git a/app-text/rarian/files/rarian-0.8.0-info-segfault.patch b/app-text/rarian/files/rarian-0.8.0-info-segfault.patch
new file mode 100644
index 000000000000..5260d2e30d55
--- /dev/null
+++ b/app-text/rarian/files/rarian-0.8.0-info-segfault.patch
@@ -0,0 +1,14 @@
+--- librarian/rarian-info.c	2008-03-30 12:43:17.000000000 -0700
++++ librarian/rarian-info.c	2008-03-30 12:44:22.000000000 -0700
+@@ -668,8 +668,10 @@ rrn_info_find_from_uri (char *uri, char 
+     l = l->next;
+   }
+   
+-  return best_result->reg;
++  if (best_result)
++     return best_result->reg;
+ 
++  return NULL;
+ }
+ 
+ void 
diff --git a/app-text/rarian/rarian-0.8.0-r1.ebuild b/app-text/rarian/rarian-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..225bf190ea7c
--- /dev/null
+++ b/app-text/rarian/rarian-0.8.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.8.0-r1.ebuild,v 1.1 2008/03/30 21:06:20 compnerd Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A documentation metadata library"
+HOMEPAGE="http://www.freedesktop.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~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}"
+
+	# Only GNU getopt supports long options
+	# Scrollkeeper didn't support them, so we'll punt them for now
+	epatch "${FILESDIR}/${PN}-0.6.0-posix-getopt.patch"
+
+	epatch "${FILESDIR}/${PN}-0.8.0-info-segfault.patch"
+
+	elibtoolize ${ELTCONF}
+}