Modified patch to fix collision-protect feature. See bug #74105. Removing obsolete ebuilds/patches.

(Portage version: 2.0.51.22-r1)

13 files changed, 34 insertions, 375 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 3fa9ed7c0f39..033330d54fae 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/scrollkeeper
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.46 2005/01/01 16:35:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.47 2005/05/30 03:04:29 leonardop Exp $
+
+  29 May 2005; Leonardo Boshell <leonardop@gentoo.org>
+  scrollkeeper-0.3.14.ebuild, files/scrollkeeper-0.3.14-gentoo.patch:
+  Modified patch to avoid failure with 'collision-protect' feature; thanks
+  to Harald van Dijk. Resolves bug #74105.
 
   01 Jul 2004; Tom Gall <tgall@gentoo.org> scrollkeeper-0.3.14.ebuild:
   stable on ppc64 bug #54799
@@ -28,10 +33,11 @@
   change descriptions (#41393)
 
   12 Feb 2004; L. Boshell <leonardop@gentoo.org> scrollkeeper-0.3.14.ebuild,
-  files/scrollkeeper-0.3.14-gcc2_fix.patch :
+  files/scrollkeeper-0.3.14-gcc2_fix.patch:
   Added patch to make it compile under gcc-2.
   
-  10 Feb 2004; foser <foser@gentoo.org> scrollkeeper-0.3.14.ebuild, metadata.xml :
+  10 Feb 2004; foser <foser@gentoo.org> scrollkeeper-0.3.14.ebuild,
+  metadata.xml:
   Dep on intltool-0.29 and up for XML-Parser dep (#41096)
   Add metadata.xml, add to gnome herd for now
 
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.11-r1 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.11-r1
deleted file mode 100644
index fd45668c41d2..000000000000
--- a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33ea7a193adcb2ff9534da68a0f8bd7f scrollkeeper-0.3.11.tar.gz 437816
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.12 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.12
deleted file mode 100644
index c09b70568ec8..000000000000
--- a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d8eb0717345f09281d52e2523ae4f94 scrollkeeper-0.3.12.tar.gz 541937
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.10-gentoo.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.10-gentoo.diff
deleted file mode 100644
index 8d35ca35792c..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.10-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.old	Wed May  1 15:55:59 2002
-+++ Makefile.in	Wed May  1 15:56:07 2002
-@@ -222,7 +222,6 @@
- 
- install-data-am: install-dtdsHEADERS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.10.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.10.diff
deleted file mode 100644
index 8d35ca35792c..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.10.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.old	Wed May  1 15:55:59 2002
-+++ Makefile.in	Wed May  1 15:56:07 2002
-@@ -222,7 +222,6 @@
- 
- install-data-am: install-dtdsHEADERS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.11-gentoo.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.11-gentoo.diff
deleted file mode 100644
index 9adc5cb04d90..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.11-gentoo.diff
+++ /dev/null
@@ -1,128 +0,0 @@
---- scrollkeeper/extract/dtds/Makefile.in.old	Wed May  1 15:55:59 2002
-+++ scrollkeeper/extract/dtds/Makefile.in	Wed May  1 15:56:07 2002
-@@ -222,7 +222,6 @@
- 
- install-data-am: install-dtdsHEADERS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
-
-diff -u -Nur --exclude CVS orig/scrollkeeper-0.3.6/libs/extract.c scrollkeeper-0.3.6/libs/extract.c
---- scrollkeeper-0.3.6/libs/extract.c      2002-03-21 06:08:51.000000000 +0100
-+++ scrollkeeper-0.3.6/libs/extract.c   2002-09-02 21:33:16.000000000 +0200
-@@ -49,8 +49,8 @@
-        FILE *res_fid;
-        char *doctype;
-        char command[1024];
--       pid_t pid;
-        char temp1[PATHLEN], temp2[PATHLEN], errors[PATHLEN];
-+       int temp1_fd, temp2_fd, errors_fd;
- #endif
-        struct stat buf;
-
-@@ -69,11 +69,22 @@
- #ifdef SOLARIS
-                doc = docbParseFile(input_file, NULL);
- #else
--               pid = getpid();
--
--               snprintf(temp1, PATHLEN, "/var/tmp/scrollkeeper-extract-1-%ld.xml", (long)pid);
--               snprintf(temp2, PATHLEN, "/var/tmp/scrollkeeper-extract-2-%ld.xml", (long)pid);
--               snprintf(errors, PATHLEN, "/var/tmp/scrollkeeper-extract-errors-%ld", (long)pid);
-+               snprintf(temp1, PATHLEN, "/var/tmp/scrollkeeper-extract-1.xml.XXXXXX");
-+               snprintf(temp2, PATHLEN, "/var/tmp/scrollkeeper-extract-2.xml.XXXXXX");
-+               snprintf(errors, PATHLEN, "/var/tmp/scrollkeeper-extract-errors.XXXXXX");
-+
-+               temp1_fd = mkstemp(temp1);
-+               if (temp1_fd == -1) {
-+                   sk_message(outputprefs, SKOUT_DEFAULT, SKOUT_QUIET, "(apply_stylesheets)", _("Cannot open temporary file: %s : %s\n"), temp1, strerror(errno));
-+                   return 0;
-+               }
-+
-+               errors_fd = mkstemp(errors);
-+               if (errors_fd == -1) {
-+                   sk_message(outputprefs, SKOUT_DEFAULT, SKOUT_QUIET, "(apply_stylesheets)", _("Cannot open temporary file: %s : %s\n"), errors, strerror(errno));
-+                   return 0;
-+               }
-+               close(errors_fd);
-
-                snprintf(command, 1024, "sgml2xml -xlower -f%s %s > %s", errors, input_file, temp1);
-                system(command);
-@@ -83,6 +94,7 @@
-                fid = fopen(input_file, "r");
-                if (fid == NULL) {
-                        sk_message(outputprefs, SKOUT_DEFAULT, SKOUT_QUIET, "(apply_stylesheets)", _("Cannot read file: %s : %s\n"),input_file, strerror(errno));
-+                       close(temp1_fd);
-                        return 0;
-                }
-
-@@ -106,14 +118,26 @@
-                }
-
-                if (doctype == NULL) {
-+                       close(temp1_fd);
-                        unlink(temp1);
-                        return 0;
-                }
-
--               fid = fopen(temp1, "r");
--               res_fid = fopen(temp2, "w");
-+               temp2_fd = mkstemp(temp2);
-+               if (temp2_fd == -1) {
-+                       close(temp1_fd);
-+                       unlink(temp1);
-+                       sk_message(outputprefs, SKOUT_DEFAULT, SKOUT_QUIET, "(apply_stylesheets)", _("Cannot create temporary file: %s : %s\n"),temp2, strerror(errno));
-+                       return 0;
-+               }
-+
-+               fid = fdopen(temp1_fd, "r");
-+               res_fid = fdopen(temp2_fd, "w");
-+
-                if (fid == NULL || res_fid == NULL) {
-+                       close(temp1_fd);
-                        unlink(temp1);
-+                       close(temp2_fd);
-                        unlink(temp2);
-                        return 0;
-                }
-
-
---- scrollkeeper-0.3.6/cl/src/get-cl.c   2002-03-21 06:08:51.000000000 +0100
-+++ scrollkeeper-0.3.6/cl/src/get-cl.c   2002-09-02 21:31:43.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <locale.h>
-+#include <fcntl.h>
-
- /* cycles through five temporary filenames of the form /tmp/scrollkeeper-templfile.x,
-    where x is number from 0 to 4 and returns the first one that does not exist or the
-@@ -36,6 +37,7 @@
- {
-     char path[PATHLEN], *filename;
-     int i, num;
-+     int fd;
-      struct stat buf;
-      time_t prev;
-
-@@ -82,6 +84,17 @@
-     check_ptr(filename, "scrollkeeper-get-cl");
-     snprintf(filename, PATHLEN, "/tmp/scrollkeeper-tempfile.%d", num);
-
-+     unlink(filename);
-+
-+     fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_TRUNC | O_NONBLOCK,
-+               S_IRWXU | S_IRGRP | S_IROTH);
-+
-+     if (fd < 0) {
-+             fprintf (stderr, _("scrollkeeper-get-cl: Cannot open temporary file: %s\n"), filename);
-+             exit (EXIT_FAILURE);
-+     }
-+     close(fd);
-+
-      return filename;
- }
-
-
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.12-gentoo.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.12-gentoo.diff
deleted file mode 100644
index fb483cbd1906..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.12-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- extract/dtds/Makefile.in.old	2003-01-24 06:52:13.000000000 +0100
-+++ extract/dtds/Makefile.in	2003-01-24 06:52:39.000000000 +0100
-@@ -297,7 +297,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-gentoo.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.diff
deleted file mode 100644
index fb483cbd1906..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- extract/dtds/Makefile.in.old	2003-01-24 06:52:13.000000000 +0100
-+++ extract/dtds/Makefile.in	2003-01-24 06:52:39.000000000 +0100
-@@ -297,7 +297,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-gentoo.patch b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch
new file mode 100644
index 000000000000..7b0c2ef94f64
--- /dev/null
+++ b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch
@@ -0,0 +1,23 @@
+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-05-29 21:08:22.000000000 -0500
+@@ -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-05-29 21:07:19.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.9.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.9.diff
deleted file mode 100644
index 8d35ca35792c..000000000000
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.9.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.old	Wed May  1 15:55:59 2002
-+++ Makefile.in	Wed May  1 15:56:07 2002
-@@ -222,7 +222,6 @@
- 
- install-data-am: install-dtdsHEADERS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
deleted file mode 100644
index 7908a6fb2390..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild,v 1.17 2005/01/01 16:35:07 eradicator Exp $
-
-IUSE="nls"
-
-inherit libtool debug
-
-DESCRIPTION="ScrollKeeper is a cataloging system for documentation on open systems."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://scrollkeeper.sourceforge.net"
-
-SLOT="0"
-LICENSE="FDL-1.1 LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha amd64"
-
-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-sgml-utils-0.6.6"
-
-DEPEND="${RDEPEND}
-	 >=dev-util/intltool-0.17
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -l -p1 < ${FILESDIR}/${P}-gentoo.diff || die
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	use nls || {
-		myconf="${myconf} --disable-nls"
-		# Not existing can cause ./configure to fail in some cases.
-		touch ${S}/intl/libintl.h
-	}
-
-	# hack around some to make sure we find the libxml2 includes. odd bug.
-	#CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
-
-	econf \
-		--localstatedir=/var \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL TODO COPYING* ChangeLog README NEWS
-}
-
-pkg_preinst() {
-	if [ -d ${ROOT}/usr/share/scrollkeeper/Templates ]
-	then
-		rm -rf ${ROOT}/usr/share/scrollkeeper/Templates
-	fi
-}
-
-pkg_postinst() {
-	echo ">>> 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
-	echo ">>> Rebuilding Scrollkeeper database..."
-	scrollkeeper-rebuilddb -q -p ${ROOT}/var/lib/scrollkeeper
-	echo ">>> 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
-
-		einfo ">>> Scrollkeeper ${PV} unmerged, if you removed the package"
-		einfo ">>> you might want to clean up /var/lib/scrollkeeper."
-	fi
-}
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
deleted file mode 100644
index 1e1767f182b5..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild,v 1.18 2005/01/01 16:35:07 eradicator Exp $
-
-IUSE="nls"
-
-inherit libtool
-
-DESCRIPTION="ScrollKeeper is a cataloging system for documentation on open systems."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://scrollkeeper.sourceforge.net"
-
-SLOT="0"
-LICENSE="FDL-1.1 LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-
-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-sgml-utils-0.6.6"
-
-DEPEND="${RDEPEND}
-	 >=dev-util/intltool-0.17
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -p0< ${FILESDIR}/${P}-gentoo.diff || die
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	use nls || {
-		myconf="${myconf} --disable-nls"
-		# Not existing can cause ./configure to fail in some cases.
-		touch ${S}/intl/libintl.h
-	}
-
-	# hack around some to make sure we find the libxml2 includes. odd bug.
-	#CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
-
-	econf \
-		--localstatedir=/var \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL TODO COPYING* ChangeLog README NEWS
-}
-
-pkg_preinst() {
-	if [ -d ${ROOT}/usr/share/scrollkeeper/Templates ]
-	then
-		rm -rf ${ROOT}/usr/share/scrollkeeper/Templates
-	fi
-}
-
-pkg_postinst() {
-	echo ">>> 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
-	echo ">>> Rebuilding Scrollkeeper database..."
-	scrollkeeper-rebuilddb -q -p ${ROOT}/var/lib/scrollkeeper
-	echo ">>> 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
-
-		einfo ">>> Scrollkeeper ${PV} unmerged, if you removed the package"
-		einfo ">>> you might want to clean up /var/lib/scrollkeeper."
-	fi
-}
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
index 7c376832de8d..e84ad0c88185 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.17 2005/01/30 05:11:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild,v 1.18 2005/05/30 03:04:29 leonardop Exp $
 
 inherit libtool eutils
 
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.patch
 	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 }