| 1 |
ulm 15/07/28 12:16:35 |
| 2 |
|
| 3 |
Modified: emacs-vcs-25.0.50_pre20150531.ebuild |
| 4 |
emacs-vcs-25.0.50_pre20150630.ebuild |
| 5 |
emacs-vcs-25.0.9999-r1.ebuild ChangeLog |
| 6 |
Log: |
| 7 |
Enable cairo only if xft is also enabled, bug 555622. |
| 8 |
|
| 9 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.3 app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild?rev=1.3&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild?rev=1.3&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild?r1=1.2&r2=1.3 |
| 17 |
|
| 18 |
Index: emacs-vcs-25.0.50_pre20150531.ebuild |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild,v |
| 21 |
retrieving revision 1.2 |
| 22 |
retrieving revision 1.3 |
| 23 |
diff -u -r1.2 -r1.3 |
| 24 |
--- emacs-vcs-25.0.50_pre20150531.ebuild 2 Jul 2015 16:22:10 -0000 1.2 |
| 25 |
+++ emacs-vcs-25.0.50_pre20150531.ebuild 28 Jul 2015 12:16:35 -0000 1.3 |
| 26 |
@@ -1,6 +1,6 @@ |
| 27 |
# Copyright 1999-2015 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild,v 1.2 2015/07/02 16:22:10 ulm Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild,v 1.3 2015/07/28 12:16:35 ulm Exp $ |
| 31 |
|
| 32 |
EAPI=5 |
| 33 |
|
| 34 |
@@ -51,7 +51,6 @@ |
| 35 |
x11-libs/libXmu |
| 36 |
x11-libs/libXt |
| 37 |
x11-misc/xbitmaps |
| 38 |
- cairo? ( >=x11-libs/cairo-1.12.18 ) |
| 39 |
gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 40 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 41 |
gif? ( media-libs/giflib ) |
| 42 |
@@ -65,6 +64,7 @@ |
| 43 |
media-libs/fontconfig |
| 44 |
media-libs/freetype |
| 45 |
x11-libs/libXft |
| 46 |
+ cairo? ( >=x11-libs/cairo-1.12.18 ) |
| 47 |
m17n-lib? ( |
| 48 |
>=dev-libs/libotf-0.9.4 |
| 49 |
>=dev-libs/m17n-lib-1.5.1 |
| 50 |
@@ -144,7 +144,6 @@ |
| 51 |
|
| 52 |
if use X; then |
| 53 |
myconf+=" --with-x --without-ns" |
| 54 |
- myconf+=" $(use_with cairo)" |
| 55 |
myconf+=" $(use_with gconf)" |
| 56 |
myconf+=" $(use_with gsettings)" |
| 57 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 58 |
@@ -158,11 +157,15 @@ |
| 59 |
|
| 60 |
if use xft; then |
| 61 |
myconf+=" --with-xft" |
| 62 |
+ myconf+=" $(use_with cairo)" |
| 63 |
myconf+=" $(use_with m17n-lib libotf)" |
| 64 |
myconf+=" $(use_with m17n-lib m17n-flt)" |
| 65 |
else |
| 66 |
myconf+=" --without-xft" |
| 67 |
+ myconf+=" --without-cairo" |
| 68 |
myconf+=" --without-libotf --without-m17n-flt" |
| 69 |
+ use cairo && ewarn \ |
| 70 |
+ "USE flag \"cairo\" has no effect if \"xft\" is not set." |
| 71 |
use m17n-lib && ewarn \ |
| 72 |
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
| 73 |
fi |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.2 app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild?rev=1.2&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild?rev=1.2&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild?r1=1.1&r2=1.2 |
| 82 |
|
| 83 |
Index: emacs-vcs-25.0.50_pre20150630.ebuild |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild,v |
| 86 |
retrieving revision 1.1 |
| 87 |
retrieving revision 1.2 |
| 88 |
diff -u -r1.1 -r1.2 |
| 89 |
--- emacs-vcs-25.0.50_pre20150630.ebuild 2 Jul 2015 16:22:10 -0000 1.1 |
| 90 |
+++ emacs-vcs-25.0.50_pre20150630.ebuild 28 Jul 2015 12:16:35 -0000 1.2 |
| 91 |
@@ -1,6 +1,6 @@ |
| 92 |
# Copyright 1999-2015 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild,v 1.1 2015/07/02 16:22:10 ulm Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild,v 1.2 2015/07/28 12:16:35 ulm Exp $ |
| 96 |
|
| 97 |
EAPI=5 |
| 98 |
|
| 99 |
@@ -51,7 +51,6 @@ |
| 100 |
x11-libs/libXmu |
| 101 |
x11-libs/libXt |
| 102 |
x11-misc/xbitmaps |
| 103 |
- cairo? ( >=x11-libs/cairo-1.12.18 ) |
| 104 |
gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 105 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 106 |
gif? ( media-libs/giflib ) |
| 107 |
@@ -65,6 +64,7 @@ |
| 108 |
media-libs/fontconfig |
| 109 |
media-libs/freetype |
| 110 |
x11-libs/libXft |
| 111 |
+ cairo? ( >=x11-libs/cairo-1.12.18 ) |
| 112 |
m17n-lib? ( |
| 113 |
>=dev-libs/libotf-0.9.4 |
| 114 |
>=dev-libs/m17n-lib-1.5.1 |
| 115 |
@@ -144,7 +144,6 @@ |
| 116 |
|
| 117 |
if use X; then |
| 118 |
myconf+=" --with-x --without-ns" |
| 119 |
- myconf+=" $(use_with cairo)" |
| 120 |
myconf+=" $(use_with gconf)" |
| 121 |
myconf+=" $(use_with gsettings)" |
| 122 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 123 |
@@ -158,11 +157,15 @@ |
| 124 |
|
| 125 |
if use xft; then |
| 126 |
myconf+=" --with-xft" |
| 127 |
+ myconf+=" $(use_with cairo)" |
| 128 |
myconf+=" $(use_with m17n-lib libotf)" |
| 129 |
myconf+=" $(use_with m17n-lib m17n-flt)" |
| 130 |
else |
| 131 |
myconf+=" --without-xft" |
| 132 |
+ myconf+=" --without-cairo" |
| 133 |
myconf+=" --without-libotf --without-m17n-flt" |
| 134 |
+ use cairo && ewarn \ |
| 135 |
+ "USE flag \"cairo\" has no effect if \"xft\" is not set." |
| 136 |
use m17n-lib && ewarn \ |
| 137 |
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
| 138 |
fi |
| 139 |
|
| 140 |
|
| 141 |
|
| 142 |
1.10 app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild |
| 143 |
|
| 144 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild?rev=1.10&view=markup |
| 145 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild?rev=1.10&content-type=text/plain |
| 146 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild?r1=1.9&r2=1.10 |
| 147 |
|
| 148 |
Index: emacs-vcs-25.0.9999-r1.ebuild |
| 149 |
=================================================================== |
| 150 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v |
| 151 |
retrieving revision 1.9 |
| 152 |
retrieving revision 1.10 |
| 153 |
diff -u -r1.9 -r1.10 |
| 154 |
--- emacs-vcs-25.0.9999-r1.ebuild 2 Jul 2015 16:22:10 -0000 1.9 |
| 155 |
+++ emacs-vcs-25.0.9999-r1.ebuild 28 Jul 2015 12:16:35 -0000 1.10 |
| 156 |
@@ -1,6 +1,6 @@ |
| 157 |
# Copyright 1999-2015 Gentoo Foundation |
| 158 |
# Distributed under the terms of the GNU General Public License v2 |
| 159 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.9 2015/07/02 16:22:10 ulm Exp $ |
| 160 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.10 2015/07/28 12:16:35 ulm Exp $ |
| 161 |
|
| 162 |
EAPI=5 |
| 163 |
|
| 164 |
@@ -51,7 +51,6 @@ |
| 165 |
x11-libs/libXmu |
| 166 |
x11-libs/libXt |
| 167 |
x11-misc/xbitmaps |
| 168 |
- cairo? ( >=x11-libs/cairo-1.12.18 ) |
| 169 |
gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 170 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 171 |
gif? ( media-libs/giflib ) |
| 172 |
@@ -65,6 +64,7 @@ |
| 173 |
media-libs/fontconfig |
| 174 |
media-libs/freetype |
| 175 |
x11-libs/libXft |
| 176 |
+ cairo? ( >=x11-libs/cairo-1.12.18 ) |
| 177 |
m17n-lib? ( |
| 178 |
>=dev-libs/libotf-0.9.4 |
| 179 |
>=dev-libs/m17n-lib-1.5.1 |
| 180 |
@@ -144,7 +144,6 @@ |
| 181 |
|
| 182 |
if use X; then |
| 183 |
myconf+=" --with-x --without-ns" |
| 184 |
- myconf+=" $(use_with cairo)" |
| 185 |
myconf+=" $(use_with gconf)" |
| 186 |
myconf+=" $(use_with gsettings)" |
| 187 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 188 |
@@ -158,11 +157,15 @@ |
| 189 |
|
| 190 |
if use xft; then |
| 191 |
myconf+=" --with-xft" |
| 192 |
+ myconf+=" $(use_with cairo)" |
| 193 |
myconf+=" $(use_with m17n-lib libotf)" |
| 194 |
myconf+=" $(use_with m17n-lib m17n-flt)" |
| 195 |
else |
| 196 |
myconf+=" --without-xft" |
| 197 |
+ myconf+=" --without-cairo" |
| 198 |
myconf+=" --without-libotf --without-m17n-flt" |
| 199 |
+ use cairo && ewarn \ |
| 200 |
+ "USE flag \"cairo\" has no effect if \"xft\" is not set." |
| 201 |
use m17n-lib && ewarn \ |
| 202 |
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
| 203 |
fi |
| 204 |
|
| 205 |
|
| 206 |
|
| 207 |
1.199 app-editors/emacs-vcs/ChangeLog |
| 208 |
|
| 209 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.199&view=markup |
| 210 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.199&content-type=text/plain |
| 211 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.198&r2=1.199 |
| 212 |
|
| 213 |
Index: ChangeLog |
| 214 |
=================================================================== |
| 215 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v |
| 216 |
retrieving revision 1.198 |
| 217 |
retrieving revision 1.199 |
| 218 |
diff -u -r1.198 -r1.199 |
| 219 |
--- ChangeLog 25 Jul 2015 06:53:45 -0000 1.198 |
| 220 |
+++ ChangeLog 28 Jul 2015 12:16:35 -0000 1.199 |
| 221 |
@@ -1,6 +1,11 @@ |
| 222 |
# ChangeLog for app-editors/emacs-vcs |
| 223 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 224 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.198 2015/07/25 06:53:45 ulm Exp $ |
| 225 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.199 2015/07/28 12:16:35 ulm Exp $ |
| 226 |
+ |
| 227 |
+ 28 Jul 2015; Ulrich Müller <ulm@g.o> |
| 228 |
+ emacs-vcs-25.0.50_pre20150531.ebuild, emacs-vcs-25.0.50_pre20150630.ebuild, |
| 229 |
+ emacs-vcs-25.0.9999-r1.ebuild: |
| 230 |
+ Enable cairo only if xft is also enabled, bug 555622. |
| 231 |
|
| 232 |
*emacs-vcs-25.0.50_pre20150523 (25 Jul 2015) |
Archives