| 1 |
markusle 07/09/25 12:26:51 |
| 2 |
|
| 3 |
Modified: ChangeLog singular-3.0.3.ebuild |
| 4 |
Log: |
| 5 |
Added proper emacs support (see bug #193411). |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.19 sci-mathematics/singular/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/ChangeLog?rev=1.19&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/ChangeLog?rev=1.19&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/ChangeLog?r1=1.18&r2=1.19 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v |
| 18 |
retrieving revision 1.18 |
| 19 |
retrieving revision 1.19 |
| 20 |
diff -u -r1.18 -r1.19 |
| 21 |
--- ChangeLog 8 Aug 2007 13:50:04 -0000 1.18 |
| 22 |
+++ ChangeLog 25 Sep 2007 12:26:50 -0000 1.19 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for sci-mathematics/singular |
| 25 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.18 2007/08/08 13:50:04 markusle Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.19 2007/09/25 12:26:50 markusle Exp $ |
| 28 |
+ |
| 29 |
+ 24 Sep 2007; Markus Dittrich <markusle@g.o> |
| 30 |
+ +files/60singular-gentoo.el, singular-3.0.3.ebuild: |
| 31 |
+ Added proper emacs support (see bug #193411). Thanks much to |
| 32 |
+ Christian Faulhammer <opfer@g.o> for his patches. |
| 33 |
|
| 34 |
08 Aug 2007; Markus Dittrich <markusle@g.o> singular-3.0.3.ebuild: |
| 35 |
Disabled building of MP for now since configure fails on amd64 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 sci-mathematics/singular/singular-3.0.3.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: singular-3.0.3.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- singular-3.0.3.ebuild 8 Aug 2007 13:50:04 -0000 1.2 |
| 52 |
+++ singular-3.0.3.ebuild 25 Sep 2007 12:26:50 -0000 1.3 |
| 53 |
@@ -1,8 +1,8 @@ |
| 54 |
# Copyright 1999-2007 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild,v 1.2 2007/08/08 13:50:04 markusle Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild,v 1.3 2007/09/25 12:26:50 markusle Exp $ |
| 58 |
|
| 59 |
-inherit eutils flag-o-matic autotools multilib |
| 60 |
+inherit eutils elisp-common flag-o-matic autotools multilib |
| 61 |
|
| 62 |
PV_MAJOR=${PV%.*} |
| 63 |
MY_PV=${PV//./-} |
| 64 |
@@ -21,11 +21,11 @@ |
| 65 |
|
| 66 |
DEPEND=">=dev-lang/perl-5.6 |
| 67 |
>=dev-libs/gmp-4.1-r1 |
| 68 |
- emacs? ( || ( virtual/xemacs |
| 69 |
- virtual/emacs ) ) |
| 70 |
+ emacs? ( virtual/emacs ) |
| 71 |
boost? ( dev-libs/boost )" |
| 72 |
|
| 73 |
S="${WORKDIR}"/${MY_PN}-${MY_PV} |
| 74 |
+SITEFILE=60${PN}-gentoo.el |
| 75 |
|
| 76 |
src_unpack () { |
| 77 |
unpack ${A} |
| 78 |
@@ -54,6 +54,11 @@ |
| 79 |
econf $(use_enable emacs) \ |
| 80 |
${myconf} || die "econf failed" |
| 81 |
emake -j1 || die "make failed" |
| 82 |
+ |
| 83 |
+ if use emacs; then |
| 84 |
+ cd "${WORKDIR}"/${MY_PN}/${MY_PV}/emacs/ |
| 85 |
+ elisp-compile *.el || die "elisp-compile failed" |
| 86 |
+ fi |
| 87 |
} |
| 88 |
|
| 89 |
src_install () { |
| 90 |
@@ -76,10 +81,6 @@ |
| 91 |
dobin ${MY_PN}* gen_test change_cost solve_IP \ |
| 92 |
toric_ideal LLL || die "failed to install binaries" |
| 93 |
|
| 94 |
- if use emacs; then |
| 95 |
- dobin E${MY_PN} || die "failed to install ESingular" |
| 96 |
- fi |
| 97 |
- |
| 98 |
# install libraries |
| 99 |
insinto /usr/$(get_libdir)/${PN} |
| 100 |
doins *.so || die "failed to install libraries" |
| 101 |
@@ -102,15 +103,31 @@ |
| 102 |
die "failed to install info files" |
| 103 |
fi |
| 104 |
|
| 105 |
- # install emacs specific stuff |
| 106 |
+ # install emacs specific stuff here, as we did a directory change |
| 107 |
+ # some lines above! |
| 108 |
if use emacs; then |
| 109 |
- insinto /usr/share/${PN}/emacs |
| 110 |
- doins emacs/* && doins emacs/.emacs* || \ |
| 111 |
- die "failed to set up emacs files" |
| 112 |
+ elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* || \ |
| 113 |
+ die "elisp-install failed" |
| 114 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 115 |
fi |
| 116 |
} |
| 117 |
|
| 118 |
pkg_postinst() { |
| 119 |
einfo "The authors ask you to register as a SINGULAR user." |
| 120 |
einfo "Please check the license file for details." |
| 121 |
+ |
| 122 |
+ if use emacs; then |
| 123 |
+ echo |
| 124 |
+ ewarn "Please note that the ESingular emacs wrapper has been" |
| 125 |
+ ewarn "removed in favor of full fledged singular support within" |
| 126 |
+ ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs" |
| 127 |
+ ewarn "and you should be good to go! See bug #193411 for more info." |
| 128 |
+ echo |
| 129 |
+ fi |
| 130 |
+ |
| 131 |
+ use emacs && elisp-site-regen |
| 132 |
+} |
| 133 |
+ |
| 134 |
+pkg_postrm() { |
| 135 |
+ use emacs && elisp-site-regen |
| 136 |
} |
| 137 |
|
| 138 |
|
| 139 |
|
| 140 |
-- |
| 141 |
gentoo-commits@g.o mailing list |
Archives