recreated Makefile patch to install into the correct directory for version 0.6.7

(Portage version: 2.1.1-r1)

3 files changed, 101 insertions, 3 deletions

diff --git a/app-shells/scsh/ChangeLog b/app-shells/scsh/ChangeLog
index 59ae82cf85ef..dfa18fe17c0c 100644
--- a/app-shells/scsh/ChangeLog
+++ b/app-shells/scsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/scsh
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.21 2006/11/07 05:35:17 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.22 2006/11/07 07:16:53 opfer Exp $
+
+  07 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  +files/0.6.7-Makefile.in-doc-dir-gentoo.patch, scsh-0.6.7.ebuild:
+  recreated Makefile patch to install into the correct directory for version
+  0.6.7
 
   07 Nov 2006; Joshua Jackson <tsunam@gentoo.org> scsh-0.6.7.ebuild:
   Stable x86; bug #151376
diff --git a/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch b/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch
new file mode 100644
index 000000000000..6ec949bb115d
--- /dev/null
+++ b/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch
@@ -0,0 +1,93 @@
+--- Makefile.in.orig	2004-09-24 01:43:55.743685848 +0200
++++ Makefile.in	2004-09-24 01:43:55.745685544 +0200
+@@ -33,7 +33,7 @@
+ host = @host@
+ ### End of `configure' section###
+ 
+-htmldir = $(libdir)/scsh/doc/scsh-manual/html
++htmldir = /usr/share/doc/scsh-0.6.7/scsh-manual/html
+ 
+ # HP 9000 series, if you don't have gcc
+ #   CC = cc
+@@ -358,38 +358,38 @@
+ 	done 
+ 
+ inst-doc:
+-	for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do \
+-		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/; 			\
++	for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do 			\
++	$(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.7/; 		\
+ 	done &&									\
+ 	for f in $(srcdir)/doc/src/*.tex 					\
+ 		$(srcdir)/doc/src/*.dvi						\
+ 		$(srcdir)/doc/src/*.ps;						\
+-		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/;	\
++         do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.7/s48-manual/;\
+ 	done &&									\
+ 	for f in $(srcdir)/doc/src/manual/*.html;				\
+-		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/html/;	\
++    do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.7/s48-manual/html/;\
+ 	done &&									\
+ 	for f in $(srcdir)/doc/scsh-manual/*.tex 				\
+ 		$(srcdir)/doc/scsh-manual/*.sty 				\
+ 		$(srcdir)/doc/scsh-manual/*.dvi					\
+ 		$(srcdir)/doc/scsh-manual/*.ps					\
+ 		$(srcdir)/doc/scsh-manual/*.pdf;				\
+-		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-manual/;	\
++	do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.7/scsh-manual/;\
+ 	done &&									\
+ 	for f in $(srcdir)/doc/scsh-manual/html/*.html 				\
+ 		$(srcdir)/doc/scsh-manual/html/*.gif 				\
+ 		$(srcdir)/doc/scsh-manual/html/*.css;				\
+-		do $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/;			\
++		do $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/;        		\
+ 	done &&									\
+ 	for f in $(srcdir)/doc/scsh-paper/*.tex 				\
+ 		$(srcdir)/doc/scsh-paper/*.sty 					\
+ 		$(srcdir)/doc/scsh-paper/*.dvi					\
+ 		$(srcdir)/doc/scsh-paper/*.ps;					\
+-		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/;	\
++	do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.7/scsh-paper/;	\
+ 	done &&									\
+ 	for f in $(srcdir)/doc/scsh-paper/html/*.html 				\
+ 		$(srcdir)/doc/scsh-paper/html/*.css;				\
+-		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/html;	\
++    do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.7/scsh-paper/html/;\
+ 	done
+ 
+ 
+@@ -412,19 +412,21 @@
+ 	chmod +x $@
+ 
+ dirs:
+-	for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir) $(htmldir); do\
+-		{ mkdir -p $(DESTDIR)$$dir && [ -w $(DESTDIR)$$dir ]; } || {	\
+-			echo "$(DESTDIR)$$dir not a writable directory" >&2;	\
+-			exit 1;						\
+-	}								\
+-	done &&								\
+-	for dir in								\
+-		rts env big opt misc link srfi scsh doc/scsh-manual			\
+-		doc/s48-manual/html doc/scsh-paper/html cig; do			\
+-		{ mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ]; } || {	\
+-			echo "$(DESTDIR)$(LIB)/$$dir not a writable directory" >&2; 	\
+-		exit 1;						  		\
+-		};							  	\
++	for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir) $(htmldir);  \
++		do                                                             \
++	   { mkdir -p $(DESTDIR)$$dir && [ -w $(DESTDIR)$$dir ]; }             \
++	|| { echo "$(DESTDIR)$$dir not a writable directory" >&2; exit 1; };   \
++	done &&								       \
++	for dir in rts env big opt misc link srfi scsh;                        \
++	        do                                                             \
++        { mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ];}   \
++     || { echo "$(DESTDIR)$(LIB)/$$dir not a writable directory" >&2; exit 1;};\
++	done &&                                                                \
++	for dir in                                                             \
++	  scsh-manual/html s48-manual/html scsh-paper/html cig; do      \
++	{ mkdir -p $(DESTDIR)/usr/share/doc/scsh-0.6.7/$$dir; }                \
++     || { echo "mkdir -p $(DESTDIR)/usr/share/doc/scsh-0.6.7/$$dir failed" >&2;\
++	  exit 1;};                                                            \
+ 	done
+ 
+ configure: configure.in
diff --git a/app-shells/scsh/scsh-0.6.7.ebuild b/app-shells/scsh/scsh-0.6.7.ebuild
index 293d4d8eee9c..3ce9a4f4919e 100644
--- a/app-shells/scsh/scsh-0.6.7.ebuild
+++ b/app-shells/scsh/scsh-0.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild,v 1.2 2006/11/07 05:35:17 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild,v 1.3 2006/11/07 07:16:53 opfer Exp $
 
 inherit eutils scsh
 
@@ -22,7 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if ! use scsh; then
-		epatch ${FILESDIR}/0.6.6-Makefile.in-doc-dir-gentoo.patch || die
+		epatch ${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch || die
 	fi
 }