1 |
ulm 11/08/29 16:28:42 |
2 |
|
3 |
Modified: ChangeLog emacs-23.3-r1.ebuild emacs-23.3-r2.ebuild |
4 |
Log: |
5 |
Force an update of the emacs symlink for the livecd/dvd. |
6 |
|
7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.428 app-editors/emacs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.428&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.428&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.427&r2=1.428 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
19 |
retrieving revision 1.427 |
20 |
retrieving revision 1.428 |
21 |
diff -u -r1.427 -r1.428 |
22 |
--- ChangeLog 22 Aug 2011 19:14:43 -0000 1.427 |
23 |
+++ ChangeLog 29 Aug 2011 16:28:42 -0000 1.428 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for app-editors/emacs |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.427 2011/08/22 19:14:43 ulm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.428 2011/08/29 16:28:42 ulm Exp $ |
29 |
+ |
30 |
+ 29 Aug 2011; Ulrich Mueller <ulm@g.o> emacs-23.3-r1.ebuild, |
31 |
+ emacs-23.3-r2.ebuild: |
32 |
+ Force an update of the emacs symlink for the livecd/dvd. |
33 |
|
34 |
*emacs-23.3-r2 (22 Aug 2011) |
35 |
*emacs-22.3-r8 (22 Aug 2011) |
36 |
|
37 |
|
38 |
|
39 |
1.2 app-editors/emacs/emacs-23.3-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: emacs-23.3-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- emacs-23.3-r1.ebuild 4 Aug 2011 17:00:32 -0000 1.1 |
52 |
+++ emacs-23.3-r1.ebuild 29 Aug 2011 16:28:42 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.1 2011/08/04 17:00:32 ulm Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $ |
58 |
|
59 |
EAPI=4 |
60 |
WANT_AUTOMAKE="none" |
61 |
@@ -15,7 +15,7 @@ |
62 |
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" |
63 |
SLOT="23" |
64 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
65 |
-IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
66 |
+IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
67 |
REQUIRED_USE="aqua? ( !X )" |
68 |
RESTRICT="strip" |
69 |
|
70 |
@@ -289,7 +289,14 @@ |
71 |
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs |
72 |
|
73 |
elisp-site-regen |
74 |
- eselect emacs update ifunset |
75 |
+ |
76 |
+ if use livecd; then |
77 |
+ # force an update of the emacs symlink for the livecd/dvd, |
78 |
+ # because some microemacs packages set it with USE=livecd |
79 |
+ eselect emacs update |
80 |
+ else |
81 |
+ eselect emacs update ifunset |
82 |
+ fi |
83 |
|
84 |
if use X; then |
85 |
echo |
86 |
|
87 |
|
88 |
|
89 |
1.2 app-editors/emacs/emacs-23.3-r2.ebuild |
90 |
|
91 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild?rev=1.2&view=markup |
92 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild?rev=1.2&content-type=text/plain |
93 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild?r1=1.1&r2=1.2 |
94 |
|
95 |
Index: emacs-23.3-r2.ebuild |
96 |
=================================================================== |
97 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v |
98 |
retrieving revision 1.1 |
99 |
retrieving revision 1.2 |
100 |
diff -u -r1.1 -r1.2 |
101 |
--- emacs-23.3-r2.ebuild 22 Aug 2011 19:14:43 -0000 1.1 |
102 |
+++ emacs-23.3-r2.ebuild 29 Aug 2011 16:28:42 -0000 1.2 |
103 |
@@ -1,6 +1,6 @@ |
104 |
# Copyright 1999-2011 Gentoo Foundation |
105 |
# Distributed under the terms of the GNU General Public License v2 |
106 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.1 2011/08/22 19:14:43 ulm Exp $ |
107 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $ |
108 |
|
109 |
EAPI=4 |
110 |
WANT_AUTOMAKE="none" |
111 |
@@ -15,7 +15,7 @@ |
112 |
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" |
113 |
SLOT="23" |
114 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
115 |
-IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
116 |
+IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
117 |
REQUIRED_USE="aqua? ( !X )" |
118 |
|
119 |
RDEPEND="sys-libs/ncurses |
120 |
@@ -290,7 +290,14 @@ |
121 |
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs |
122 |
|
123 |
elisp-site-regen |
124 |
- eselect emacs update ifunset |
125 |
+ |
126 |
+ if use livecd; then |
127 |
+ # force an update of the emacs symlink for the livecd/dvd, |
128 |
+ # because some microemacs packages set it with USE=livecd |
129 |
+ eselect emacs update |
130 |
+ else |
131 |
+ eselect emacs update ifunset |
132 |
+ fi |
133 |
|
134 |
if use X; then |
135 |
echo |