Remove old

(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)

6 files changed, 8 insertions, 212 deletions

diff --git a/app-text/rarian/ChangeLog b/app-text/rarian/ChangeLog
index 4bb69733bc99..e6620b5e1e67 100644
--- a/app-text/rarian/ChangeLog
+++ b/app-text/rarian/ChangeLog
@@ -1,6 +1,13 @@
 # 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.40 2009/03/02 18:46:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.41 2009/10/07 15:54:33 leio Exp $
+
+  07 Oct 2009; Mart Raudsepp <leio@gentoo.org>
+  -files/rarian-0.6.0-posix-getopt.patch,
+  -files/rarian-0.6.0-reg-return.patch,
+  -files/rarian-0.8.0-info-segfault.patch, -rarian-0.6.0-r1.ebuild,
+  -rarian-0.8.0-r1.ebuild:
+  Remove old
 
   02 Mar 2009; Raúl Porcel <armin76@gentoo.org> rarian-0.8.1.ebuild:
   arm/s390/sh stable
diff --git a/app-text/rarian/files/rarian-0.6.0-posix-getopt.patch b/app-text/rarian/files/rarian-0.6.0-posix-getopt.patch
deleted file mode 100644
index edb55f23fcef..000000000000
--- a/app-text/rarian/files/rarian-0.6.0-posix-getopt.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur a/util/rarian-sk-update.in b/util/rarian-sk-update.in
---- a/util/rarian-sk-update.in	2007-09-01 18:22:35 +0100
-+++ b/util/rarian-sk-update.in	2007-10-18 15:27:42 +0100
-@@ -258,10 +258,7 @@
- # They are inherited from scrollkeeper :(
- 
- # We use TEMP as set -- seems to nuke the return value of getopt
--TEMP=`getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
--    --longoptions="clean-index,omf-dir:,resulting-dir:,help,version" -- "$@"` \
--    || print_usage
--
-+TEMP=`getopt "o:r:p:cvqnhV" "$@"`
- if [ $? != 0 ] ; then
- 	print_usage
- 	exit 0
-@@ -271,12 +268,12 @@
- 
- while true; do
-     case "$1" in
--		-o | --omf-dir )
-+		-o )
- 			convert_dir=$2
- 			update_output_dir=1
- 			shift 2
- 			;;
--		-r | --result-dir )
-+		-r )
- 			output_dir=$2
- 			overload_update=1
- 			shift 2
-@@ -288,7 +285,7 @@
- 		-q )
- 			shift
- 			;;
--        --clean-index )
-+        -c )
-         	clean_index=1
- 			shift
-             ;;	      
-@@ -299,9 +296,9 @@
- 			# Scrollkeeper compat.  Actually do nothing
- 			shift
- 			;;
--	        -p )
--	                statedir=$2
--	                shift 2
-+	    -p )
-+	        statedir=$2
-+	        shift 2
- 			;;
- 		-V | --version )
- 			print_version
-@@ -416,4 +413,4 @@
- fi
- rm -rf $tmpdir
- 
--fi # ENABLE_OMF_READ
-\ No newline at end of file
-+fi # ENABLE_OMF_READ
diff --git a/app-text/rarian/files/rarian-0.6.0-reg-return.patch b/app-text/rarian/files/rarian-0.6.0-reg-return.patch
deleted file mode 100644
index 50bdf2d27480..000000000000
--- a/app-text/rarian/files/rarian-0.6.0-reg-return.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Patch from comment #2 on https://bugs.freedesktop.org/show_bug.cgi?id=12279
-Fixes crash on sparc and ia64 and might fix weird issues on other arches as this is about memory clobbering
-
---- rarian-0.6.0.old/librarian/rarian-reg-full.c	2007-10-16 16:33:02.685297000 +0100
-+++ rarian-0.6.0/librarian/rarian-reg-full.c	2007-10-16 16:38:24.553412000 +0100
-@@ -59,6 +59,8 @@
-     reg->heritage    = NULL;
-     reg->lang = NULL;
-     reg->children = NULL;
-+	
-+	return (reg);
- }
- 
- RrnRegFull *
---- rarian-0.6.0.old/librarian/rarian-reg-utils.c	2007-10-16 16:33:02.683296000 +0100
-+++ rarian-0.6.0/librarian/rarian-reg-utils.c	2007-10-16 16:38:43.173230000 +0100
-@@ -36,7 +36,7 @@
- static void     process_sect_pair (RrnSect *sect, char *key, char *value);
- static int      rrn_reg_add_sect (RrnReg *reg, RrnSect *sect);
- static void     process_path (RrnReg *reg);
--static char *   process_section_path (char *owner_path, RrnSect *section);
-+static void     process_section_path (char *owner_path, RrnSect *section);
- 
- 
- RrnReg *
-@@ -58,6 +58,8 @@
-     reg->lang = NULL;
-     reg->ghelp_name = NULL;
-     reg->children = NULL;
-+
-+	return (reg);
- }
- 
- RrnReg *
-@@ -748,7 +750,7 @@
- 
- }
- 
--static char *
-+static void
- process_section_path (char *owner_path, RrnSect *section)
- {
- 	char *tmp = NULL;
---- rarian-0.6.0.old/librarian/rarian-info.c	2007-10-16 16:33:02.684297000 +0100
-+++ rarian-0.6.0/librarian/rarian-info.c	2007-10-16 16:37:02.125582000 +0100
-@@ -614,13 +614,13 @@
-       if (!section || (*section && l->reg->section && !strcmp (l->reg->section, section))) {
- 	return l->reg;
-       } else {
--	best_result = l->reg;
-+	best_result = l;
-       }
-     }
-     l = l->next;
-   }
-   
--  return best_result;
-+  return best_result->reg;
- 
- }
- 
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
deleted file mode 100644
index 5260d2e30d55..000000000000
--- a/app-text/rarian/files/rarian-0.8.0-info-segfault.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.6.0-r1.ebuild b/app-text/rarian/rarian-0.6.0-r1.ebuild
deleted file mode 100644
index 43e9d09aadab..000000000000
--- a/app-text/rarian/rarian-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.6.0-r1.ebuild,v 1.11 2008/05/03 21:37:17 dirtyepic 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 ~mips 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}/${P}-posix-getopt.patch"
-
-	# Fix memory clobbering leading to outright crash on sparc and ia64
-	epatch "${FILESDIR}/${P}-reg-return.patch"
-
-	elibtoolize ${ELTCONF}
-}
diff --git a/app-text/rarian/rarian-0.8.0-r1.ebuild b/app-text/rarian/rarian-0.8.0-r1.ebuild
deleted file mode 100644
index fc550328de00..000000000000
--- a/app-text/rarian/rarian-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.9 2008/11/13 19:00:59 ranger 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 ~mips 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}
-}
-
-src_compile() {
-	gnome2_src_compile --localstatedir=/var
-}