Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-misc/gri: ChangeLog gri-2.12.17.ebuild gri-2.12.16-r1.ebuild gri-2.12.14.ebuild
Date: Sun, 24 Aug 2008 17:29:50
Message-Id: E1KXJPO-0000ox-UK@stork.gentoo.org
1 ulm 08/08/24 17:29:46
2
3 Modified: ChangeLog gri-2.12.17.ebuild gri-2.12.16-r1.ebuild
4 Removed: gri-2.12.14.ebuild
5 Log:
6 Fix Emacs support, bug 235602. Remove old.
7 (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
8
9 Revision Changes Path
10 1.22 sci-misc/gri/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/ChangeLog?rev=1.22&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/ChangeLog?rev=1.22&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/ChangeLog?r1=1.21&r2=1.22
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v
19 retrieving revision 1.21
20 retrieving revision 1.22
21 diff -u -r1.21 -r1.22
22 --- ChangeLog 9 Jun 2008 10:46:40 -0000 1.21
23 +++ ChangeLog 24 Aug 2008 17:29:46 -0000 1.22
24 @@ -1,6 +1,10 @@
25 # ChangeLog for sci-misc/gri
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.21 2008/06/09 10:46:40 markusle Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.22 2008/08/24 17:29:46 ulm Exp $
29 +
30 + 24 Aug 2008; Ulrich Mueller <ulm@g.o> -gri-2.12.14.ebuild,
31 + gri-2.12.16-r1.ebuild, gri-2.12.17.ebuild:
32 + Fix Emacs support, bug 235602. Remove old.
33
34 *gri-2.12.17 (09 Jun 2008)
35
36
37
38
39 1.2 sci-misc/gri/gri-2.12.17.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/gri-2.12.17.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/gri-2.12.17.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/gri-2.12.17.ebuild?r1=1.1&r2=1.2
44
45 Index: gri-2.12.17.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.17.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- gri-2.12.17.ebuild 9 Jun 2008 10:46:40 -0000 1.1
52 +++ gri-2.12.17.ebuild 24 Aug 2008 17:29:46 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2008 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.17.ebuild,v 1.1 2008/06/09 10:46:40 markusle Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.17.ebuild,v 1.2 2008/08/24 17:29:46 ulm Exp $
58
59 inherit eutils elisp-common
60
61 @@ -26,8 +26,7 @@
62 econf || die "econf failed."
63 emake || die "emake failed."
64 if use emacs; then
65 - cd src
66 - elisp-comp *.el || die "elisp-comp failed"
67 + elisp-compile src/*.el || die "elisp-compile failed"
68 fi
69 }
70
71 @@ -40,8 +39,9 @@
72 # license text not necessary
73 rm "${D}"/usr/share/gri/doc/license.txt
74
75 - # install target installs it always
76 - use emacs || rm -rf "${D}"/usr/share/emacs
77 + # install target installs it always and in the wrong location
78 + # remove it here and call elisp-install in case of USE=emacs below
79 + rm -rf "${D}"/usr/share/emacs
80
81 if ! use doc; then
82 sed -e "s/Manual at.*//" -i "${D}"/usr/share/gri/startup.msg
83 @@ -62,8 +62,9 @@
84
85 if use emacs; then
86 cd src
87 - elisp-install gri *.{el,elc} || die "elisp-install failed"
88 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
89 + elisp-install ${PN} *.{el,elc} || die "elisp-install failed"
90 + elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
91 + || die "elisp-site-file-install failed"
92 fi
93 }
94
95
96
97
98 1.5 sci-misc/gri/gri-2.12.16-r1.ebuild
99
100 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/gri-2.12.16-r1.ebuild?rev=1.5&view=markup
101 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/gri-2.12.16-r1.ebuild?rev=1.5&content-type=text/plain
102 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/gri/gri-2.12.16-r1.ebuild?r1=1.4&r2=1.5
103
104 Index: gri-2.12.16-r1.ebuild
105 ===================================================================
106 RCS file: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.16-r1.ebuild,v
107 retrieving revision 1.4
108 retrieving revision 1.5
109 diff -u -r1.4 -r1.5
110 --- gri-2.12.16-r1.ebuild 9 Jun 2008 10:46:40 -0000 1.4
111 +++ gri-2.12.16-r1.ebuild 24 Aug 2008 17:29:46 -0000 1.5
112 @@ -1,6 +1,6 @@
113 # Copyright 1999-2008 Gentoo Foundation
114 # Distributed under the terms of the GNU General Public License v2
115 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.16-r1.ebuild,v 1.4 2008/06/09 10:46:40 markusle Exp $
116 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.16-r1.ebuild,v 1.5 2008/08/24 17:29:46 ulm Exp $
117
118 inherit eutils elisp-common
119
120 @@ -26,8 +26,7 @@
121 econf || die "econf failed."
122 emake || die "emake failed."
123 if use emacs; then
124 - cd src
125 - elisp-comp *.el || die "elisp-comp failed"
126 + elisp-compile src/*.el || die "elisp-compile failed"
127 fi
128 }
129
130 @@ -40,8 +39,9 @@
131 # license text not necessary
132 rm "${D}"/usr/share/gri/doc/license.txt
133
134 - # install target installs it always
135 - use emacs || rm -rf "${D}"/usr/share/emacs
136 + # install target installs it always and in the wrong location
137 + # remove it here and call elisp-install in case of USE=emacs below
138 + rm -rf "${D}"/usr/share/emacs
139
140 if ! use doc; then
141 sed -e "s/Manual at.*//" -i "${D}"/usr/share/gri/startup.msg
142 @@ -62,8 +62,9 @@
143
144 if use emacs; then
145 cd src
146 - elisp-install gri *.{el,elc} || die "elisp-install failed"
147 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
148 + elisp-install ${PN} *.{el,elc} || die "elisp-install failed"
149 + elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
150 + || die "elisp-site-file-install failed"
151 fi
152 }