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

Package-Manager: portage-2.1.1-r1

diff --git a/app-shells/scsh/ChangeLog b/app-shells/scsh/ChangeLog
index 59ae82cf85ef03df5bff0bfaf075943401526da2..dfa18fe17c0c73724c8004b62c83b7b53cb584cc 100644 (file)
--- 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/Manifest b/app-shells/scsh/Manifest
index 5386d4a999504c48f5f5a84a333e469609d722a7..7c3e0bb9f091d554ed1bc330161ff9c9b94e93a2 100644 (file)
--- a/app-shells/scsh/Manifest
+++ b/app-shells/scsh/Manifest
@@ -5,20 +5,24 @@ AUX 0.6.6-Makefile.in-doc-dir-gentoo.patch 4096 RMD160 a59b4f30ce82a27083fea6c13
 MD5 25a51584ef070208fc80b2b78c9e4bbe files/0.6.6-Makefile.in-doc-dir-gentoo.patch 4096
 RMD160 a59b4f30ce82a27083fea6c130f25264011c4e67 files/0.6.6-Makefile.in-doc-dir-gentoo.patch 4096
 SHA256 dd03955a4fdcac99a1e05026b780fb70aea37eb806c2e38861a5e27a043cf653 files/0.6.6-Makefile.in-doc-dir-gentoo.patch 4096
+AUX 0.6.7-Makefile.in-doc-dir-gentoo.patch 4096 RMD160 39b7eccdb62d98a26f25af9b0185a44b3ac36072 SHA1 bfb62bfa7a085d23aa4de3bcbc0e3a9607e3608f SHA256 36ae0151832b064e1a8bf2eaf54ca8f73fa7a2c7511d3ada19fc16b12eca19f3
+MD5 497e481bdec7c05c70a814ab8cd3edd1 files/0.6.7-Makefile.in-doc-dir-gentoo.patch 4096
+RMD160 39b7eccdb62d98a26f25af9b0185a44b3ac36072 files/0.6.7-Makefile.in-doc-dir-gentoo.patch 4096
+SHA256 36ae0151832b064e1a8bf2eaf54ca8f73fa7a2c7511d3ada19fc16b12eca19f3 files/0.6.7-Makefile.in-doc-dir-gentoo.patch 4096
 DIST scsh-0.6.6.tar.gz 4332223
 DIST scsh-0.6.7.tar.gz 4367439 RMD160 f017c5a157cd1a3ad5daeaecba43ce84784c7e51 SHA1 a1eaf0d0593e14914824898a0c3ec166429affd7 SHA256 c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f
 EBUILD scsh-0.6.6.ebuild 986 RMD160 68481b54a6fef55d70acb6bcab05de3888f1270f SHA1 7058ffe3f9a26a3afa9af205cdf51f3078f91365 SHA256 04f49be128dd897209c3824d4115126ff946ed497fc430eacb5635e26f800909
 MD5 6dcf0816aa1a2650be35cc061bb25ecc scsh-0.6.6.ebuild 986
 RMD160 68481b54a6fef55d70acb6bcab05de3888f1270f scsh-0.6.6.ebuild 986
 SHA256 04f49be128dd897209c3824d4115126ff946ed497fc430eacb5635e26f800909 scsh-0.6.6.ebuild 986
-EBUILD scsh-0.6.7.ebuild 986 RMD160 78d904db9f7ea3d04f0f5036ff4ba4048de9d609 SHA1 fb08883cfdd24dee6c1e2cc12d27ea79cb7fceda SHA256 7d7806c6fd50df76ecae20c8c3661d3f010f824b395d1c5f7f26f0543a18366f
-MD5 c7be327d6ce3dc23af2b0e408a121aed scsh-0.6.7.ebuild 986
-RMD160 78d904db9f7ea3d04f0f5036ff4ba4048de9d609 scsh-0.6.7.ebuild 986
-SHA256 7d7806c6fd50df76ecae20c8c3661d3f010f824b395d1c5f7f26f0543a18366f scsh-0.6.7.ebuild 986
-MISC ChangeLog 3043 RMD160 42afc6b13d2aad2e5b4436cd927998b9e4d5d2ce SHA1 a0204b786300df8aaed4fd5f7e085eaadb4051a8 SHA256 2f31c4574ad888f027d4f2e7fa60718f3a4ea9ba00f2ab73c79f32bc8b549e63
-MD5 9216a6ff3f3ae432ad2b84715138933f ChangeLog 3043
-RMD160 42afc6b13d2aad2e5b4436cd927998b9e4d5d2ce ChangeLog 3043
-SHA256 2f31c4574ad888f027d4f2e7fa60718f3a4ea9ba00f2ab73c79f32bc8b549e63 ChangeLog 3043
+EBUILD scsh-0.6.7.ebuild 985 RMD160 ace3b3f6f923ae74aad147ac6a8ceac484341edb SHA1 791582f09e20e6442558cf3e9149d965e83ace07 SHA256 eaf0347c3ebecddb647508fb660428c99b116f11a8e5a78b061851738d5abc23
+MD5 5c66e0f00397bc3e03c3fa2cef5589fe scsh-0.6.7.ebuild 985
+RMD160 ace3b3f6f923ae74aad147ac6a8ceac484341edb scsh-0.6.7.ebuild 985
+SHA256 eaf0347c3ebecddb647508fb660428c99b116f11a8e5a78b061851738d5abc23 scsh-0.6.7.ebuild 985
+MISC ChangeLog 3251 RMD160 4d4fcee94ae87315194171584147cc5294581319 SHA1 66fd8549f747797f7b908c2441b10647abac2b82 SHA256 7dd7f4c71836417cdb50b2b66be3988aa7f9fcbd5a101c6505f80b1f575dcae3
+MD5 f3dac867e7a9ff2e56b495c18be9b0c9 ChangeLog 3251
+RMD160 4d4fcee94ae87315194171584147cc5294581319 ChangeLog 3251
+SHA256 7dd7f4c71836417cdb50b2b66be3988aa7f9fcbd5a101c6505f80b1f575dcae3 ChangeLog 3251
 MISC metadata.xml 955 RMD160 c0f00f39f9e7331380fec91ef848a6dcfa655669 SHA1 fc221146e8d33b79157db784fc88330ea49c5ee7 SHA256 300a893b10a5eaeaed0bc11a8dcdbee1870132fd6c305c762c1537ce92f9e5d2
 MD5 8c153b306d4485bac0a7bc7f26dea78f metadata.xml 955
 RMD160 c0f00f39f9e7331380fec91ef848a6dcfa655669 metadata.xml 955
@@ -32,7 +36,7 @@ SHA256 8d8aa02d5a49a3718f1e12822464c20e873292b793248b4df4aca478eef9f15d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUBsp2ZWR0Jhg/EsRAluUAJ9AaJnd2hmswxCpdUWC0H1eMopg7gCfTVy6
-LrG9dg0gtmxYqk/jAbmUlu8=
-=AxfE
+iD8DBQFFUDLsNQqtfCuFneMRAmHKAKCMLrI1dzBIWMlxqYdJL9KUS2GtdgCfcSKy
+FqeBMDAJrSZD2CeaeLRRPfw=
+=ijPB
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..6ec949b
--- /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 293d4d8eee9cdcf847041c081c21cbdaf00ba51a..3ce9a4f4919e429e88886336198e76c79922e75d 100644 (file)
--- 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
 }