now with 1 less segfault

(Portage version: 2.1.4.4)

3 files changed, 57 insertions, 1 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/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}
+}