summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-07-14 10:13:21 +0200
committerUlrich Müller <ulm@gentoo.org>2023-07-14 10:15:55 +0200
commitc99150cd3dee2eb600458646e9efa21acdfa6ce0 (patch)
treeddbcb9e71dc4195dac293068876c8dcd252ceb90
parentdev-qt/qtwayland: throw in some more detail to patch description (diff)
downloadgentoo-c99150cd3dee2eb600458646e9efa21acdfa6ce0.tar.gz
gentoo-c99150cd3dee2eb600458646e9efa21acdfa6ce0.tar.bz2
gentoo-c99150cd3dee2eb600458646e9efa21acdfa6ce0.zip
app-editors/emacs: Don't depend on libXft when cairo is enabled
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--app-editors/emacs/emacs-27.2-r13.ebuild2
-rw-r--r--app-editors/emacs/emacs-28.2-r9.ebuild2
-rw-r--r--app-editors/emacs/emacs-28.3_rc1-r4.ebuild2
-rw-r--r--app-editors/emacs/emacs-29.0.90.ebuild2
-rw-r--r--app-editors/emacs/emacs-29.0.91.ebuild2
-rw-r--r--app-editors/emacs/emacs-29.0.92.ebuild2
-rw-r--r--app-editors/emacs/emacs-29.0.9999-r1.ebuild2
-rw-r--r--app-editors/emacs/emacs-30.0.9999.ebuild2
8 files changed, 8 insertions, 8 deletions
diff --git a/app-editors/emacs/emacs-27.2-r13.ebuild b/app-editors/emacs/emacs-27.2-r13.ebuild
index 599230cefa36..a44f2c0b6e68 100644
--- a/app-editors/emacs/emacs-27.2-r13.ebuild
+++ b/app-editors/emacs/emacs-27.2-r13.ebuild
@@ -87,9 +87,9 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4
diff --git a/app-editors/emacs/emacs-28.2-r9.ebuild b/app-editors/emacs/emacs-28.2-r9.ebuild
index 65e04e528526..d097ec62e6fa 100644
--- a/app-editors/emacs/emacs-28.2-r9.ebuild
+++ b/app-editors/emacs/emacs-28.2-r9.ebuild
@@ -90,9 +90,9 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4
diff --git a/app-editors/emacs/emacs-28.3_rc1-r4.ebuild b/app-editors/emacs/emacs-28.3_rc1-r4.ebuild
index 6124017848c0..a53ea1f1c3f6 100644
--- a/app-editors/emacs/emacs-28.3_rc1-r4.ebuild
+++ b/app-editors/emacs/emacs-28.3_rc1-r4.ebuild
@@ -90,9 +90,9 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4
diff --git a/app-editors/emacs/emacs-29.0.90.ebuild b/app-editors/emacs/emacs-29.0.90.ebuild
index d47ea6f5e379..40153b2a3b6d 100644
--- a/app-editors/emacs/emacs-29.0.90.ebuild
+++ b/app-editors/emacs/emacs-29.0.90.ebuild
@@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4
diff --git a/app-editors/emacs/emacs-29.0.91.ebuild b/app-editors/emacs/emacs-29.0.91.ebuild
index d47ea6f5e379..40153b2a3b6d 100644
--- a/app-editors/emacs/emacs-29.0.91.ebuild
+++ b/app-editors/emacs/emacs-29.0.91.ebuild
@@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4
diff --git a/app-editors/emacs/emacs-29.0.92.ebuild b/app-editors/emacs/emacs-29.0.92.ebuild
index d47ea6f5e379..40153b2a3b6d 100644
--- a/app-editors/emacs/emacs-29.0.92.ebuild
+++ b/app-editors/emacs/emacs-29.0.92.ebuild
@@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4
diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
index d47ea6f5e379..40153b2a3b6d 100644
--- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index 1bb789044d24..15ef46b178aa 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE
xft? (
media-libs/fontconfig
media-libs/freetype
- x11-libs/libXft
x11-libs/libXrender
cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ !cairo? ( x11-libs/libXft )
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4