As talked with Gilles days ago, drop old versions as they are no needed and it allows us to finally solve bug #256379 (I have tried to mail and contact m68k team without success). Also make repoman happier.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

8 files changed, 14 insertions, 576 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 1da6decfbdfe..9bbff26c08b6 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/scrollkeeper
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.97 2010/07/20 15:07:37 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.98 2011/05/06 13:18:54 pacho Exp $
+
+  06 May 2011; Pacho Ramos <pacho@gentoo.org> -scrollkeeper-0.3.14-r2.ebuild,
+  -files/scrollkeeper-0.3.14-gcc2_fix.patch,
+  -files/scrollkeeper-0.3.14-gentoo.patch,
+  -files/scrollkeeper-0.3.14-nls.patch, -scrollkeeper-9999.ebuild,
+  scrollkeeper-9999-r1.ebuild, -files/scrollkeeper-logrotate:
+  As talked with Gilles days ago, drop old versions as they are no needed and
+  it allows us to finally solve bug #256379 (I have tried to mail and contact
+  m68k team without success). Also make repoman happier.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org>
   scrollkeeper-0.3.14-r2.ebuild, scrollkeeper-9999.ebuild,
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gcc2_fix.patch b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gcc2_fix.patch
deleted file mode 100644
index 94c440cc9ba7..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gcc2_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -NurB scrollkeeper-0.3.14-orig/libs/install.c scrollkeeper-0.3.14/libs/install.c
---- scrollkeeper-0.3.14-orig/libs/install.c	2004-02-12 09:34:02.000000000 -0500
-+++ scrollkeeper-0.3.14/libs/install.c	2004-02-12 09:35:31.000000000 -0500
-@@ -499,6 +499,7 @@
- 				    int id, int add_toc, char outputprefs, char **complete_cat_token)
- {
-     xmlNodePtr node, new_node, s_node;
-+    xmlChar *categorycode;
- 
-     if (sect_node == NULL ||
-         cat_token == NULL)
-@@ -520,8 +521,6 @@
-     	if (xmlStrcmp(node->name, (xmlChar *)"sect"))
- 	    continue;
- 	
--	xmlChar *categorycode;
--	
- 	categorycode = xmlGetProp(node, (xmlChar *)"categorycode");
- 	if (categorycode == NULL)
- 	    continue;
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch
deleted file mode 100644
index e112b7e90d24..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -NurdB scrollkeeper-0.3.14/Makefile.in scrollkeeper-0.3.14-patched/Makefile.in
---- scrollkeeper-0.3.14/Makefile.in	2003-12-06 03:17:51.000000000 -0500
-+++ scrollkeeper-0.3.14-patched/Makefile.in	2005-06-23 03:57:41.000000000 -0500
-@@ -609,7 +609,7 @@
- 
- info-am:
- 
--install-data-am: install-scrollkeeperdocDATA
-+install-data-am:
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
-@@ -675,8 +675,6 @@
- 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
- 	PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
- 		echo "`date +\"%b %d %X\"` Installing ScrollKeeper `scrollkeeper-config --version`..." >> $(DESTDIR)$(localstatedir)/log/scrollkeeper.log
--	PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
--		$(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p $(DESTDIR)$(scrollkeeper_localstate_dir)
- 
- # Remove generated files
- uninstall-local:
-diff -NurdB scrollkeeper-0.3.14/extract/dtds/Makefile.in scrollkeeper-0.3.14-patched/extract/dtds/Makefile.in
---- scrollkeeper-0.3.14/extract/dtds/Makefile.in	2003-12-06 03:18:01.000000000 -0500
-+++ scrollkeeper-0.3.14-patched/extract/dtds/Makefile.in	2005-06-23 03:55:49.000000000 -0500
-@@ -361,7 +361,6 @@
- 
- install-data-am: install-dtdsHEADERS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am:
- 
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-nls.patch b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-nls.patch
deleted file mode 100644
index f3b92e2791f1..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-nls.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-Index: scrollkeeper-0.3.14/buildtools/separate.c
-===================================================================
---- scrollkeeper-0.3.14.orig/buildtools/separate.c
-+++ scrollkeeper-0.3.14/buildtools/separate.c
-@@ -25,9 +25,14 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <errno.h>
--#include <libintl.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- typedef struct {
- 	char *filename;
- 	char *locale;
-@@ -306,9 +311,11 @@ main (int argc, char *argv[])
- 	int locale_num, i;
- 	int locale_tree_error=0;
- 
-+#ifdef ENABLE_NLS
-     	setlocale (LC_ALL, "");
-     	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
-     	textdomain (PACKAGE);
-+#endif
-     
-     	if (argc != 3) {
-     		usage();
-Index: scrollkeeper-0.3.14/libs/database.c
-===================================================================
---- scrollkeeper-0.3.14.orig/libs/database.c
-+++ scrollkeeper-0.3.14/libs/database.c
-@@ -23,12 +23,17 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <errno.h>
--#include <libintl.h>
- #include <dirent.h>
- #include <scrollkeeper.h>
- 
- #define PATHLEN		256
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#define _(String) gettext (String)
-+#else
-+#define _(String) String
-+#endif
- 
- /*
-  * Create a directory.  Send errors to appropriate places (STDOUT and log 
-Index: scrollkeeper-0.3.14/libs/error.c
-===================================================================
---- scrollkeeper-0.3.14.orig/libs/error.c
-+++ scrollkeeper-0.3.14/libs/error.c
-@@ -22,11 +22,17 @@
- #include <scrollkeeper.h>
- #include <errno.h>
- #include <string.h>
--#include <libintl.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <time.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#define _(String) gettext (String)
-+#else
-+#define _(String) String
-+#endif
-+
- /*
-  * sk_warning:
-  *               This is a general purpose function for sending error and 
-Index: scrollkeeper-0.3.14/libs/extract.c
-===================================================================
---- scrollkeeper-0.3.14.orig/libs/extract.c
-+++ scrollkeeper-0.3.14/libs/extract.c
-@@ -18,7 +18,6 @@
- 
- #include <config.h>
- #include <locale.h>
--#include <libintl.h>
- #include <libxslt/xslt.h>
- #include <libxslt/xsltInternals.h>
- #include <libxslt/transform.h>
-@@ -33,6 +32,13 @@
- #include <errno.h>
- #include <sys/stat.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#define _(String) gettext (String)
-+#else
-+#define _(String) String
-+#endif
-+
- extern int xmlLoadExtDtdDefaultValue;
- 
- int apply_stylesheets (char *input_file, char *type, int stylesheet_num,
-Index: scrollkeeper-0.3.14/libs/install.c
-===================================================================
---- scrollkeeper-0.3.14.orig/libs/install.c
-+++ scrollkeeper-0.3.14/libs/install.c
-@@ -25,11 +25,15 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <errno.h>
--#include <libintl.h>
- #include <dirent.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
- #define _(String) gettext (String)
-+#else
-+#define _(String) String
-+#endif
- 
- #define SEP		"|"
- #define PATHLEN		256
-Index: scrollkeeper-0.3.14/libs/uninstall.c
-===================================================================
---- scrollkeeper-0.3.14.orig/libs/uninstall.c
-+++ scrollkeeper-0.3.14/libs/uninstall.c
-@@ -23,11 +23,15 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
--#include <libintl.h>
- #include <locale.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
- #define _(String) gettext (String)
-+#else
-+#define _(String) String
-+#endif
- 
- #define PATHLEN		256
- 
-Index: scrollkeeper-0.3.14/libs/update-url.c
-===================================================================
---- scrollkeeper-0.3.14.orig/libs/update-url.c
-+++ scrollkeeper-0.3.14/libs/update-url.c
-@@ -23,10 +23,14 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
--#include <libintl.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
- #define _(String) gettext (String)
-+#else
-+#define _(String) String
-+#endif
- 
- int update_doc_url_in_omf_file(char *omf_name, char *url, char *omf_new_name)
- {
-Index: scrollkeeper-0.3.14/cl/src/preinstall.c
-===================================================================
---- scrollkeeper-0.3.14.orig/cl/src/preinstall.c
-+++ scrollkeeper-0.3.14/cl/src/preinstall.c
-@@ -23,10 +23,15 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
--#include <libintl.h>
- #include <locale.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- static xmlExternalEntityLoader defaultEntityLoader = NULL;
- 
- static void usage()
-@@ -41,9 +46,11 @@ main (int argc, char *argv[])
-     char *omf_name, *url, *omf_new_name;
-     int i;
-     
-+#ifdef ENABLE_NLS
-     setlocale (LC_ALL, "");
-     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
-     textdomain (PACKAGE);
-+#endif
-     
- 	
-     if (argc < 3) {
-Index: scrollkeeper-0.3.14/cl/src/get-cl.c
-===================================================================
---- scrollkeeper-0.3.14.orig/cl/src/get-cl.c
-+++ scrollkeeper-0.3.14/cl/src/get-cl.c
-@@ -25,7 +25,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <libintl.h>
- #include <libxml/tree.h>
- #include <scrollkeeper.h>
- #include <errno.h>
-@@ -37,6 +36,12 @@
- #include <utime.h>
- #include <pwd.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- /*
-  * make_local_tmpdir:
-  * @dirname: directory name.
-@@ -198,9 +203,11 @@ int main(int argc, char **argv)
- 	xmlDocPtr merged_tree;
-         char outputprefs=0;
- 
-+#ifdef ENABLE_NLS
-     	setlocale (LC_ALL, "");
-     	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
-     	textdomain (PACKAGE);
-+#endif
- 
-     	usage(argc, argv);
- 
-Index: scrollkeeper-0.3.14/cl/src/scrollkeeper-install.c
-===================================================================
---- scrollkeeper-0.3.14.orig/cl/src/scrollkeeper-install.c
-+++ scrollkeeper-0.3.14/cl/src/scrollkeeper-install.c
-@@ -25,10 +25,15 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <errno.h>
--#include <libintl.h>
- #include <dirent.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- static xmlExternalEntityLoader defaultEntityLoader = NULL;
- 
- static void usage()
-@@ -47,9 +52,11 @@ main (int argc, char *argv[])
-     char outputprefs=0;
-     int i;
-     
-+#ifdef ENABLE_NLS
-     setlocale (LC_ALL, "");
-     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
-     textdomain (PACKAGE);
-+#endif
- 
-     if (argc == 1) {
- 	usage();
-Index: scrollkeeper-0.3.14/cl/src/scrollkeeper-uninstall.c
-===================================================================
---- scrollkeeper-0.3.14.orig/cl/src/scrollkeeper-uninstall.c
-+++ scrollkeeper-0.3.14/cl/src/scrollkeeper-uninstall.c
-@@ -23,10 +23,15 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
--#include <libintl.h>
- #include <locale.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- static void usage()
- {
-     printf(_("Usage: scrollkeeper-uninstall [-v] [-q] [-p <SCROLLKEEPER_DB_DIR>] <OMF FILE>\n"));
-@@ -41,9 +46,11 @@ main (int argc, char *argv[])
-     char outputprefs=0;
-     int i;
-  
-+#ifdef ENABLE_NLS
-     setlocale (LC_ALL, "");
-     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
-     textdomain (PACKAGE);
-+#endif
-     
-     if (argc == 1)
- 	usage();
-Index: scrollkeeper-0.3.14/cl/src/update.c
-===================================================================
---- scrollkeeper-0.3.14.orig/cl/src/update.c
-+++ scrollkeeper-0.3.14/cl/src/update.c
-@@ -24,12 +24,17 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--#include <libintl.h>
- #include <locale.h>
- #include <dirent.h>
- #include <unistd.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- static char **av;
- static char config_omf_dir[PATHLEN];
- static xmlExternalEntityLoader defaultEntityLoader = NULL;
-@@ -361,9 +366,11 @@ int main(int argc, char **argv)
- 
-     av = argv;
-     
-+#ifdef ENABLE_NLS
-     setlocale (LC_ALL, "");
-     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
-     textdomain (PACKAGE);
-+#endif
- 
-     scrollkeeper_dir[0] = '\0';
-     omf_dir[0] = '\0';
-Index: scrollkeeper-0.3.14/extract/src/scrollkeeper-extract.c
-===================================================================
---- scrollkeeper-0.3.14.orig/extract/src/scrollkeeper-extract.c
-+++ scrollkeeper-0.3.14/extract/src/scrollkeeper-extract.c
-@@ -18,13 +18,18 @@
- 
- #include <config.h>
- #include <locale.h>
--#include <libintl.h>
- #include <scrollkeeper.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <errno.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- static void usage()
- {
- 	printf(_("Usage: scrollkeeper-extract <xml file> <stylesheet 1> <output file 1> <stylesheet 2> <output file 2> ...\n"));
-@@ -38,9 +43,11 @@ main (int argc, char *argv[])
- 	char *extension;
-         char outputprefs=0;
- 
-+#ifdef ENABLE_NLS
- 	setlocale (LC_ALL, "");
-   	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
-   	textdomain (PACKAGE);
-+#endif
- 
- 	num = (argc-2)/2;
- 
-Index: scrollkeeper-0.3.14/scripts/gen-docuid.c
-===================================================================
---- scrollkeeper-0.3.14.orig/scripts/gen-docuid.c
-+++ scrollkeeper-0.3.14/scripts/gen-docuid.c
-@@ -17,13 +17,18 @@
-  */
- 
- #include <config.h>
--#include <libintl.h>
- #include <locale.h>
- #include <stdio.h>
- #include <string.h>
- #include <uuid.h>
- #include <scrollkeeper.h>
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#else
-+#define _(x) x
-+#endif
-+
- int
- main (int argc, char *argv[])
- {
-@@ -32,9 +37,11 @@ main (int argc, char *argv[])
- 
- 	if (argc > 1)
- 	{
-+#ifdef ENABLE_NLS
- 	     setlocale (LC_ALL, "");
- 	     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
- 	     textdomain (PACKAGE);
-+#endif
- 
- 	     if (strcmp (argv[1], "--help") == 0)
- 	     {
diff --git a/app-text/scrollkeeper/files/scrollkeeper-logrotate b/app-text/scrollkeeper/files/scrollkeeper-logrotate
deleted file mode 100644
index 013366432930..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/files/scrollkeeper-logrotate,v 1.1 2005/06/20 21:49:19 leonardop Exp $
-#
-# Scrollkeeper logrotate snippet for Gentoo Linux
-# contributed by Gad Kadosh
-#
-
-/var/log/scrollkeeper.log {
-  rotate 1
-  size=100k
-}
-
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild
deleted file mode 100644
index a8c18ca957ca..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild,v 1.18 2010/07/20 15:07:37 jer Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="cataloging system for documentation on open systems"
-HOMEPAGE="http://scrollkeeper.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.1 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/libxml2-2.4.19
-	>=dev-libs/libxslt-1.0.14
-	>=sys-libs/zlib-1.1.3
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/docbook-xsl-stylesheets"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-gcc2_fix.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable nls) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/scrollkeeper-logrotate scrollkeeper
-
-	dodoc AUTHORS ChangeLog NEWS README TODO scrollkeeper-spec.txt
-}
-
-pkg_preinst() {
-	if [[ -d ${ROOT}/usr/share/scrollkeeper/Templates ]] ; then
-		rm -rf "${ROOT}"/usr/share/scrollkeeper/Templates
-	fi
-}
-
-pkg_postinst() {
-	einfo "Installing catalog..."
-	"${ROOT}"/usr/bin/xmlcatalog --noout --add "public" \
-		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
-		"`echo "${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" | sed -e "s://:/:g"`" \
-		"${ROOT}"/etc/xml/catalog
-	einfo "Rebuilding Scrollkeeper database..."
-	scrollkeeper-rebuilddb -q -p "${ROOT}"/var/lib/scrollkeeper
-	einfo "Updating Scrollkeeper database..."
-	scrollkeeper-update -v &> "${T}"/foo
-}
-
-pkg_postrm() {
-	if [[ ! -x ${ROOT}/usr/bin/scrollkeeper-config ]] ; then
-		# SK is being removed, not upgraded.
-		# Remove all generated files
-		einfo "Cleaning up ${ROOT}/var/lib/scrollkeeper..."
-		rm -rf "${ROOT}"/var/lib/scrollkeeper
-		rm -rf "${ROOT}"/var/log/scrollkeeper.log
-		rm -rf "${ROOT}"/var/log/scrollkeeper.log.1
-		"${ROOT}"/usr/bin/xmlcatalog --noout --del \
-			"${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
-			"${ROOT}"/etc/xml/catalog
-
-		elog "Scrollkeeper ${PV} unmerged, if you removed the package"
-		elog "you might want to clean up /var/lib/scrollkeeper."
-	fi
-}
diff --git a/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
index 2cf8c0fb2f4e..fead596da7cf 100644
--- a/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild,v 1.7 2010/07/20 15:07:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild,v 1.8 2011/05/06 13:18:54 pacho Exp $
 
 DESCRIPTION="Dummy scrollkeeper for testing rarian"
 HOMEPAGE="http://gnome.gentoo.org"
@@ -11,5 +11,5 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbs
 IUSE=""
 
 DEPEND="=app-text/scrollkeeper-dtd-1.0"
-
+RDEPEND=""
 PDEPEND="app-text/rarian"
diff --git a/app-text/scrollkeeper/scrollkeeper-9999.ebuild b/app-text/scrollkeeper/scrollkeeper-9999.ebuild
deleted file mode 100644
index 5e3fd16b722b..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-9999.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-9999.ebuild,v 1.19 2010/07/20 15:07:36 jer Exp $
-
-DESCRIPTION="Dummy scrollkeeper for testing rarian"
-HOMEPAGE="http://gnome.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-PDEPEND="app-text/rarian"