ulm 15/07/28 12:16:35
Modified: emacs-vcs-25.0.50_pre20150531.ebuild
emacs-vcs-25.0.50_pre20150630.ebuild
emacs-vcs-25.0.9999-r1.ebuild ChangeLog
Log:
Enable cairo only if xft is also enabled, bug 555622.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
9433907D693FB5B8!)
Revision Changes Path
1.3 app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild
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
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
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
Index: emacs-vcs-25.0.50_pre20150531.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-vcs-25.0.50_pre20150531.ebuild 2 Jul 2015 16:22:10 -0000
1.2
+++ emacs-vcs-25.0.50_pre20150531.ebuild 28 Jul 2015 12:16:35 -0000
1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -51,7 +51,6 @@
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
- cairo? ( >=x11-libs/cairo-1.12.18 )
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
@@ -65,6 +64,7 @@
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
+ cairo? ( >=x11-libs/cairo-1.12.18 )
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
@@ -144,7 +144,6 @@
if use X; then
myconf+=" --with-x --without-ns"
- myconf+=" $(use_with cairo)"
myconf+=" $(use_with gconf)"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
@@ -158,11 +157,15 @@
if use xft; then
myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
+ myconf+=" --without-cairo"
myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is
not set."
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\"
is not set."
fi
1.2 app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild
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
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
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
Index: emacs-vcs-25.0.50_pre20150630.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-vcs-25.0.50_pre20150630.ebuild 2 Jul 2015 16:22:10 -0000
1.1
+++ emacs-vcs-25.0.50_pre20150630.ebuild 28 Jul 2015 12:16:35 -0000
1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -51,7 +51,6 @@
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
- cairo? ( >=x11-libs/cairo-1.12.18 )
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
@@ -65,6 +64,7 @@
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
+ cairo? ( >=x11-libs/cairo-1.12.18 )
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
@@ -144,7 +144,6 @@
if use X; then
myconf+=" --with-x --without-ns"
- myconf+=" $(use_with cairo)"
myconf+=" $(use_with gconf)"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
@@ -158,11 +157,15 @@
if use xft; then
myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
+ myconf+=" --without-cairo"
myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is
not set."
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\"
is not set."
fi
1.10 app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
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
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
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
Index: emacs-vcs-25.0.9999-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- emacs-vcs-25.0.9999-r1.ebuild 2 Jul 2015 16:22:10 -0000 1.9
+++ emacs-vcs-25.0.9999-r1.ebuild 28 Jul 2015 12:16:35 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -51,7 +51,6 @@
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
- cairo? ( >=x11-libs/cairo-1.12.18 )
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
@@ -65,6 +64,7 @@
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
+ cairo? ( >=x11-libs/cairo-1.12.18 )
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
@@ -144,7 +144,6 @@
if use X; then
myconf+=" --with-x --without-ns"
- myconf+=" $(use_with cairo)"
myconf+=" $(use_with gconf)"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
@@ -158,11 +157,15 @@
if use xft; then
myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
+ myconf+=" --without-cairo"
myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is
not set."
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\"
is not set."
fi
1.199 app-editors/emacs-vcs/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.199&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.199&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.198&r2=1.199
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- ChangeLog 25 Jul 2015 06:53:45 -0000 1.198
+++ ChangeLog 28 Jul 2015 12:16:35 -0000 1.199
@@ -1,6 +1,11 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.198
2015/07/25 06:53:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.199
2015/07/28 12:16:35 ulm Exp $
+
+ 28 Jul 2015; Ulrich Müller <[email protected]>
+ emacs-vcs-25.0.50_pre20150531.ebuild, emacs-vcs-25.0.50_pre20150630.ebuild,
+ emacs-vcs-25.0.9999-r1.ebuild:
+ Enable cairo only if xft is also enabled, bug 555622.
*emacs-vcs-25.0.50_pre20150523 (25 Jul 2015)
