summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2005-06-23 10:31:28 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2005-06-23 10:31:28 +0000
commitbc88f1857519a8274d5bc2628b0cc26366a2823a (patch)
treeba0680c63aa90e29336dcf141621939728364ad6 /app-text/scrollkeeper
parent removed useless line in ebuild (diff)
downloadgentoo-2-bc88f1857519a8274d5bc2628b0cc26366a2823a.tar.gz
gentoo-2-bc88f1857519a8274d5bc2628b0cc26366a2823a.tar.bz2
gentoo-2-bc88f1857519a8274d5bc2628b0cc26366a2823a.zip
Modified patch to avoid installing duplicate doc files (bug #96831)
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-text/scrollkeeper')
-rw-r--r--app-text/scrollkeeper/ChangeLog7
-rw-r--r--app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch13
-rw-r--r--app-text/scrollkeeper/scrollkeeper-0.3.14-r1.ebuild4
3 files changed, 19 insertions, 5 deletions
diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 8853e217ddc5..5fbc91b06585 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.48 2005/06/20 21:49:19 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.49 2005/06/23 10:31:28 leonardop Exp $
+
+ 23 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
+ scrollkeeper-0.3.14-r1.ebuild, files/scrollkeeper-0.3.14-gentoo.patch:
+ Modified patch to stop installing files that are handled by dodoc.
+ Suggestions by TGL on bug #96831.
*scrollkeeper-0.3.14-r1 (20 Jun 2005)
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch
index 7b0c2ef94f64..e112b7e90d24 100644
--- a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch
+++ b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.patch
@@ -1,6 +1,15 @@
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
++++ 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)" ; \
@@ -12,7 +21,7 @@ diff -NurdB scrollkeeper-0.3.14/Makefile.in scrollkeeper-0.3.14-patched/Makefile
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
++++ 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
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.14-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.14-r1.ebuild
index 8ed62a85c6b9..2d6f224d5e0b 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.14-r1.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.14-r1.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-r1.ebuild,v 1.1 2005/06/20 21:49:19 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14-r1.ebuild,v 1.2 2005/06/23 10:31:28 leonardop Exp $
inherit libtool eutils
@@ -54,7 +54,7 @@ src_install() {
insinto /etc/logrotate.d
newins ${FILESDIR}/scrollkeeper-logrotate scrollkeeper
- dodoc AUTHORS INSTALL TODO COPYING* ChangeLog README NEWS
+ dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README TODO scrollkeeper-spec.txt
}
pkg_preinst() {