x11-libs/cairo: x11-libs/cairo: Build interpreter unconditionally

Closes: https://bugs.gentoo.org/669972
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/x11-libs/cairo/cairo-1.16.0-r1.ebuild b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
similarity index 98%
rename from x11-libs/cairo/cairo-1.16.0-r1.ebuild
rename to x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 52e56a49b8fe3e523ee695d4d65dbd21221c8078..50f6c6a7649f4c414a7ec0e753bd4d0682e8acb2 100644 (file)
--- a/x11-libs/cairo/cairo-1.16.0-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -105,7 +105,6 @@ multilib_src_configure() {
                $(use_enable opengl gl) \
                $(use_enable static-libs static) \
                $(use_enable svg) \
-               $(use_enable utils interpreter) \
                $(use_enable utils trace) \
                $(use_enable valgrind) \
                $(use_enable xcb) \
@@ -114,6 +113,8 @@ multilib_src_configure() {
                --enable-pdf \
                --enable-png \
                --enable-ps \
+               --enable-script \
+               --enable-interpreter \
                --disable-drm \
                --disable-directfb \
                --disable-gallium \

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 52e56a49b8fe3e523ee695d4d65dbd21221c8078..50f6c6a7649f4c414a7ec0e753bd4d0682e8acb2 100644 (file)
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -105,7 +105,6 @@ multilib_src_configure() {
                $(use_enable opengl gl) \
                $(use_enable static-libs static) \
                $(use_enable svg) \
-               $(use_enable utils interpreter) \
                $(use_enable utils trace) \
                $(use_enable valgrind) \
                $(use_enable xcb) \
@@ -114,6 +113,8 @@ multilib_src_configure() {
                --enable-pdf \
                --enable-png \
                --enable-ps \
+               --enable-script \
+               --enable-interpreter \
                --disable-drm \
                --disable-directfb \
                --disable-gallium \