aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tom111@gmx.de>2010-03-17 16:10:53 +0100
committerThomas Kahle <tom111@gmx.de>2010-03-17 16:11:34 +0100
commit1bd1ee9e0d9462d72c9e227452f73873b7755782 (patch)
treee355cdd55a2e72644c442855d8405efa79341ea5 /sci-mathematics/Macaulay2
parentsci-chemistry/votca-csg: version bump (diff)
downloadsci-1bd1ee9e0d9462d72c9e227452f73873b7755782.tar.gz
sci-1bd1ee9e0d9462d72c9e227452f73873b7755782.tar.bz2
sci-1bd1ee9e0d9462d72c9e227452f73873b7755782.zip
QA for sci-mathematics/Macaulay2
Diffstat (limited to 'sci-mathematics/Macaulay2')
-rw-r--r--sci-mathematics/Macaulay2/ChangeLog4
-rw-r--r--sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild19
-rw-r--r--sci-mathematics/Macaulay2/Manifest6
-rw-r--r--sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el10
4 files changed, 33 insertions, 6 deletions
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 480506eff..b29b2e1ae 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -20,6 +20,10 @@
Version bump
+ 17 Mar 2010; Thomas Kahle <tom111@gmx.de> files/70Macaulay2-gentoo.el,
+ Macaulay2-1.3.1-r3.ebuild:
+ Fixing QA issues: Better emacs integration, no pre-stripping
+
04 Mar 2010; Thomas Kahle <tom111@gmx.de> Macaulay2-1.3.1-r3.ebuild:
QA/Ebuild improvements
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild
index d2b4ad757..2903c80bb 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild
@@ -63,7 +63,9 @@ src_configure (){
fi
CPPFLAGS="-I/usr/include/frobby" \
- ./configure --prefix="${D}/usr" --disable-encap \
+ ./configure --prefix="${D}/usr" \
+ --disable-encap \
+ --disable-strip \
--with-unbuilt-programs="4ti2 gfan normaliz" \
|| die "failed to configure Macaulay"
}
@@ -71,6 +73,11 @@ src_configure (){
src_compile() {
# Parallel build not yet supported
emake -j1 || die "failed to build Macaulay"
+
+ if use emacs; then
+ cd "${S}/Macaulay2/emacs"
+ elisp-compile *.el || die "elisp-compile failed"
+ fi
}
src_test() {
@@ -81,7 +88,15 @@ src_install () {
emake install || die "install failed"
- use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ # Remove emacs files and install them in the
+ # correct place if use emacs
+
+ rm -rf "${D}"/usr/share/emacs/site-lisp
+ if use emacs; then
+ cd "${S}/Macaulay2/emacs"
+ elisp-install ${PN} *.elc *.el || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
}
pkg_postinst() {
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index c4ba76ccf..02d5c5180 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,6 +1,6 @@
-AUX 70Macaulay2-gentoo.el 57 RMD160 07b266ed45b28e5ebe7ee8e46ea73571a401dea3 SHA1 877ac4fd55e2b42922212bce587c2aa68e010bf2 SHA256 427d14300a958b0970837191006641f5e1c9952cf3492c640bc1e8c223b221f5
+AUX 70Macaulay2-gentoo.el 597 RMD160 bdf3a30bb4d15a77e0dff86c866134d06c443fa0 SHA1 d4a4036042ab13bc20d8be90b559e9168bfc0ef5 SHA256 e5583d11e6ab662261abb32e90fcf31ccf6bd56f2b23b691b9255d1b8d8acb2f
AUX paths-of-dependencies.patch 2437 RMD160 9b63baeee97428406bed8bfbf67cf6fead95974a SHA1 cf245ad8bcdbe119e127242119b2b96342100035 SHA256 bffbaaf077f99f1e135fe0eff61be702c6eb138f4b4ae715cec8c5be62ee8046
DIST Macaulay2-1.3.1.tar.bz2 3737431 RMD160 ce29e95d5b1b5409e368054f2edf0e5bd04d0dd3 SHA1 5a0f6b830b7a3a7cf045ac10e64ca2e3cb199600 SHA256 c07104d3a0edb70d61d3a221f7c8b0d23e0cca2d30b27127fe8ec7f763a2b4b1
-EBUILD Macaulay2-1.3.1-r3.ebuild 2140 RMD160 809c41fbd4fe84d24559af4e9f4fc36c8ef85578 SHA1 4dca3f6b333b47034e8f0df92990e8fd5172e6b6 SHA256 42273fdfa4be82d1c23b93e6afcec8f88bb30c5c90e8938120b2a5aa90ff0a02
-MISC ChangeLog 1940 RMD160 7bca2201edd8de62c12d2762ce921e3e404c985b SHA1 04863794e0d54e3b5505fadf154344ec818f1660 SHA256 60294120497ffcf0f5e7b0426a2f6928ca8a44e180bdccf69734853e564e41b5
+EBUILD Macaulay2-1.3.1-r3.ebuild 2489 RMD160 6f7ca3274ab3f45b528c033f4ba800d4c9a79e57 SHA1 f525a578c8665fcd3706bbfbc718acb3b6854e70 SHA256 15dc9102a3eb9b6559b1186fa64855485a6830c8d54bceab5635c1c97b4bfed8
+MISC ChangeLog 2106 RMD160 6d679602fb5c8adbb640c78a9757ada8c4726bc2 SHA1 3f7522688244daec7dab8dbeb5405aaf3ef6dfba SHA256 d1676ed2dc3a06d1e72f92ba2d2a972e495d1a070b934db1021fd9f82a62aa8e
MISC metadata.xml 361 RMD160 273db3a009b85938f85e60ea0d34d6fc625f9477 SHA1 7f6e903d81af55b08c7dbb9feb4f7ad39852a23e SHA256 71a0f19b08b1e752e754bbc5faf15880601d00c5b9df2bc5ca5a3b8e93e83b7f
diff --git a/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el b/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
index 84c0a8c8c..ac86e2132 100644
--- a/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
+++ b/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
@@ -1,3 +1,11 @@
;; sci-mathematics/Macaulay2 init file
-(load "M2-init")
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/Macaulay2")
+
+(defvar M2-exe "/usr/bin/M2" "*The default Macaulay2 executable name.")
+(autoload 'M2 "M2.el" "Run Macaulay 2 in a buffer." t)
+(autoload 'Macaulay2 "M2" "Run Macaulay 2 in a buffer, non-interactive." t)
+(autoload 'M2-mode "M2" "Macaulay 2 editing mode" t)
+(autoload 'm2-mode "M2" "Macaulay 2 editing mode, name in lower case" t)
+(autoload 'm2-comint-mode "M2" "Macaulay 2 command interpreter mode, name in lower case" t)
+(setq auto-mode-alist (append auto-mode-alist '(("\\.m2$" . M2-mode)))) \ No newline at end of file