summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-06-07 12:48:01 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-06-07 12:48:01 +0000
commit958c5c5fc0f049aa53becc17be8cb33ca6102202 (patch)
tree254fc09d43204d39630fcc4cff2997e338c1b7f2 /sci-mathematics
parentStable on ppc wrt bug 224867 (diff)
downloadgentoo-2-958c5c5fc0f049aa53becc17be8cb33ca6102202.tar.gz
gentoo-2-958c5c5fc0f049aa53becc17be8cb33ca6102202.tar.bz2
gentoo-2-958c5c5fc0f049aa53becc17be8cb33ca6102202.zip
Fixed bad emacs and info files paths (see bug #225119).
(Portage version: 2.1.5.4)
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/singular/ChangeLog6
-rw-r--r--sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff8
2 files changed, 9 insertions, 5 deletions
diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 3e8e7e7b0fa4..595d7861e94e 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/singular
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.21 2008/05/17 09:42:07 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.22 2008/06/07 12:48:00 markusle Exp $
+
+ 07 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+ files/singular-3.0.4.2-gentoo.diff:
+ Fixed bad emacs and info files paths (see bug #225119).
17 May 2008; Markus Dittrich <markusle@gentoo.org>
singular-3.0.4.2.ebuild:
diff --git a/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff
index a9482a63b14f..4500c2964e8e 100644
--- a/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff
+++ b/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff
@@ -33,7 +33,7 @@ diff -Naur Singular-3-0-4/kernel/feResource.cc Singular-3-0-4.new/kernel/feResou
- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", ""},
- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", ""},
- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/html", ""},
-+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/share/singular/singular.hlp", ""},
++ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/share/info/singular.info.bz2", ""},
+ {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/share/singular/singular.idx", ""},
+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/share/doc/PFSUBST/html", ""},
#ifdef ix86_Win
@@ -50,8 +50,8 @@ diff -Naur Singular-3-0-4/kernel/feResource.cc Singular-3-0-4.new/kernel/feResou
{"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR", "%b/Singular", ""},
- {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", ""},
- {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", ""},
-+ {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%r/share/singular/emacs/.emacs-singular", ""},
-+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/share/singular/emacs", ""},
++ {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular", ""},
++ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", ""},
#elif defined(TSINGULAR)
{"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR", "%b/Singular", ""},
#ifdef ix86_Win
@@ -60,7 +60,7 @@ diff -Naur Singular-3-0-4/kernel/feResource.cc Singular-3-0-4.new/kernel/feResou
#endif
#else
- {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", ""},
-+ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/share/singular/emacs", ""},
++ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", ""},
#endif
{NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
};