| 1 |
keri 07/10/04 06:22:39 |
| 2 |
|
| 3 |
Modified: mozart-1.3.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add proper support for emacs. Closes #194604 |
| 6 |
(Portage version: 2.1.3.11) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 dev-lang/mozart/mozart-1.3.2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: mozart-1.3.2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- mozart-1.3.2.ebuild 29 Sep 2007 05:49:54 -0000 1.6 |
| 22 |
+++ mozart-1.3.2.ebuild 4 Oct 2007 06:22:39 -0000 1.7 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.6 2007/09/29 05:49:54 keri Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.7 2007/10/04 06:22:39 keri Exp $ |
| 28 |
|
| 29 |
-inherit eutils |
| 30 |
+inherit elisp-common eutils |
| 31 |
|
| 32 |
MY_P="mozart-${PV}.20060615" |
| 33 |
|
| 34 |
@@ -21,12 +21,15 @@ |
| 35 |
sys-devel/bison |
| 36 |
sys-devel/flex |
| 37 |
sys-libs/zlib |
| 38 |
+ emacs? ( virtual/emacs ) |
| 39 |
gdbm? ( sys-libs/gdbm ) |
| 40 |
tcl? ( tk? ( |
| 41 |
dev-lang/tk |
| 42 |
dev-lang/tcl ) )" |
| 43 |
RDEPEND="${DEPEND}" |
| 44 |
|
| 45 |
+SITEFILE=50${PN}-gentoo.el |
| 46 |
+ |
| 47 |
S="${WORKDIR}"/${MY_P} |
| 48 |
|
| 49 |
src_unpack() { |
| 50 |
@@ -47,12 +50,6 @@ |
| 51 |
--without-global-oz \ |
| 52 |
--enable-opt=none" |
| 53 |
|
| 54 |
- if use emacs ; then |
| 55 |
- myconf="${myconf} --enable-compile-elisp" |
| 56 |
- else |
| 57 |
- myconf="${myconf} --disable-compile-elisp" |
| 58 |
- fi |
| 59 |
- |
| 60 |
if use tcl && use tk ; then |
| 61 |
myconf="${myconf} --enable-wish" |
| 62 |
else |
| 63 |
@@ -77,22 +74,37 @@ |
| 64 |
--disable-doc \ |
| 65 |
$(use_enable doc contrib-doc) \ |
| 66 |
$(use_enable gdbm contrib-gdbm) \ |
| 67 |
+ $(use_enable emacs compile-elisp) \ |
| 68 |
$(use_enable static link-static) \ |
| 69 |
$(use_enable threads threaded) \ |
| 70 |
|| die "econf failed" |
| 71 |
|
| 72 |
- emake bootstrap || die "emake bootstrap failed" |
| 73 |
+ emake -j1 bootstrap || die "emake bootstrap failed" |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
emake -j1 \ |
| 78 |
PREFIX="${D}"/usr/lib/mozart \ |
| 79 |
BINDIR="${D}"/usr/bin \ |
| 80 |
+ ELISPDIR="${D}${SITELISP}/${PN}" \ |
| 81 |
install || die "emake install failed" |
| 82 |
|
| 83 |
+ if use emacs; then |
| 84 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ |
| 85 |
+ || die "elisp-site-file-install failed" |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
if use doc ; then |
| 89 |
dohtml -r "${WORKDIR}"/mozart/doc/* |
| 90 |
fi |
| 91 |
|
| 92 |
dodoc README |
| 93 |
} |
| 94 |
+ |
| 95 |
+pkg_postinst() { |
| 96 |
+ use emacs && elisp-site-regen |
| 97 |
+} |
| 98 |
+ |
| 99 |
+pkg_postrm() { |
| 100 |
+ use emacs && elisp-site-regen |
| 101 |
+} |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
1.9 dev-lang/mozart/ChangeLog |
| 106 |
|
| 107 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/ChangeLog?rev=1.9&view=markup |
| 108 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/ChangeLog?rev=1.9&content-type=text/plain |
| 109 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/ChangeLog?r1=1.8&r2=1.9 |
| 110 |
|
| 111 |
Index: ChangeLog |
| 112 |
=================================================================== |
| 113 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v |
| 114 |
retrieving revision 1.8 |
| 115 |
retrieving revision 1.9 |
| 116 |
diff -u -r1.8 -r1.9 |
| 117 |
--- ChangeLog 29 Sep 2007 05:49:54 -0000 1.8 |
| 118 |
+++ ChangeLog 4 Oct 2007 06:22:39 -0000 1.9 |
| 119 |
@@ -1,6 +1,11 @@ |
| 120 |
# ChangeLog for dev-lang/mozart |
| 121 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 122 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.8 2007/09/29 05:49:54 keri Exp $ |
| 123 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.9 2007/10/04 06:22:39 keri Exp $ |
| 124 |
+ |
| 125 |
+ 04 Oct 2007; keri <keri@g.o> +files/50mozart-gentoo.el, |
| 126 |
+ mozart-1.3.2.ebuild: |
| 127 |
+ Add proper support for emacs. Reported and fixed by Ulrich Mueller in bug |
| 128 |
+ #194604 |
| 129 |
|
| 130 |
29 Sep 2007; keri <keri@g.o> +files/mozart-1.3.2-ri-fpe.patch, |
| 131 |
mozart-1.3.2.ebuild: |
| 132 |
|
| 133 |
|
| 134 |
|
| 135 |
-- |
| 136 |
gentoo-commits@g.o mailing list |
Archives