From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- dev-libs/efl/Manifest | 8 +- dev-libs/efl/efl-1.20.7-r1.ebuild | 2 +- dev-libs/efl/efl-1.21.0.ebuild | 280 -------------------------------------- dev-libs/efl/efl-1.21.1.ebuild | 7 +- dev-libs/efl/metadata.xml | 1 - 5 files changed, 8 insertions(+), 290 deletions(-) delete mode 100644 dev-libs/efl/efl-1.21.0.ebuild (limited to 'dev-libs/efl') diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index 7f178bf71204..103201fade94 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1,7 +1,5 @@ DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de -DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63 -EBUILD efl-1.20.7-r1.ebuild 7783 BLAKE2B a10092c4415cfc8ed7660ec94053b945d207b4b13644c5c2dac89fd22ccaddc1fbbedc2ea3af1e6cd76ea633319bfb33e2d9a6be547f52d9aba843755b9ff4af SHA512 5ea232554e4567b165cd2e6782d4cf914acd659d9728e7041536217e5658a7aff1b2c98566a7766a173dedf3ce12d80afb929b105fcfa50e3579b3d7de950479 -EBUILD efl-1.21.0.ebuild 6729 BLAKE2B 3a59d6f24f00ae61aa43297a8f4108e5e16c8271faeca0d8a846a609591b6f52281df9352c10016a219f41273ebe7b03ef92b7aea0942c25fe59cf79451f997c SHA512 a243e2040a5aa957f13cfbb6742bd6f30bd675e321c352506ff8e83d35bd68fb5f1f0639825a23a56d4981327827117176f328ce02ad054beeaa1768ec3f4645 -EBUILD efl-1.21.1.ebuild 6606 BLAKE2B c053f82e19e81dfa8277c596f6e70db69c606e4e4459cca97fe1e67b36a0833fba82e024fbcb8abb3f6caf8e5657ad88683181add206381be9312c28e51c5f88 SHA512 8b83f2f4d78079d4c132476ef78fbf13d4942b984cd10c0af6d74874feebc3931918ffbd5629e87ddf3474263ef2bb601bb31a8b82ad517262d37cd07353a4b2 -MISC metadata.xml 2221 BLAKE2B e6dfe70c4d177dca3ca940c7e4b65493fc91b87b84fe4244783051f6483d65e4d38dba05e143815a5048b7c6414984256a523e4d9a30cccd21bfcd5318920384 SHA512 a7d3654e00527b45d747e68d5cc26007974c2e347554b44e811c4faa18558a3030960acc437fae6d31c18db29ba171eefa37800344b0f3ded431abd79e4edc23 +EBUILD efl-1.20.7-r1.ebuild 7790 BLAKE2B 8949614b2b22abd64583b987f5b2bbfa50f87575951833899c19245f191acc4fa08244307af6a23c9b8a2d4179f8cbf7a8cdc69698bb29897a9ea6ff80f85e17 SHA512 d4e847eac0d3f36aea057a7596d7277966343c80bd90338a4043cf0ad52d3ec7ac2aaa42fdcb4e94a750f81cd5cc712271c1631bf3e778354fb93d40a26eb773 +EBUILD efl-1.21.1.ebuild 6587 BLAKE2B 3d0eac3de903e7e01d5cf0299504bfe1db128080a9fe12995bd61fc85facd8e9a70310aff74d9fa50c6e09de01386dde00a1b8d92c760d2985118db0b492e61c SHA512 7eddc1df3186324e52cc3336c1207f5c4c46dfe7bfb69824e94ca313c510e2b9fb11de376d72ded9b2f9131cd95a77b93bcc33395cb23a4d111c7ef9ce719394 +MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974 diff --git a/dev-libs/efl/efl-1.20.7-r1.ebuild b/dev-libs/efl/efl-1.20.7-r1.ebuild index 8df2e68fbf5c..69bf06a886f0 100644 --- a/dev-libs/efl/efl-1.20.7-r1.ebuild +++ b/dev-libs/efl/efl-1.20.7-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm" REQUIRED_USE=" diff --git a/dev-libs/efl/efl-1.21.0.ebuild b/dev-libs/efl/efl-1.21.0.ebuild deleted file mode 100644 index 64ac0b67a25e..000000000000 --- a/dev-libs/efl/efl-1.21.0.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2-utils pax-utils xdg-utils - -DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" -HOMEPAGE="https://www.enlightenment.org/" -SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" - -LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="avahi +bmp dds connman debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm" - -REQUIRED_USE=" - ?? ( opengl egl ) - ?? ( opengl gles ) - fbcon? ( !tslib ) - gles? ( - || ( X wayland ) - !sdl - egl - ) - ibus? ( glib ) - opengl? ( X ) - pulseaudio? ( sound ) - sdl? ( opengl ) - vnc? ( X fbcon ) - wayland? ( egl gles !opengl ) - xim? ( X ) -" - -COMMON_DEPEND=" - net-misc/curl - media-libs/libpng:0= - sys-apps/dbus - sys-apps/util-linux - sys-libs/zlib:= - virtual/jpeg:0= - avahi? ( net-dns/avahi ) - connman? ( net-misc/connman ) - drm? ( - dev-libs/libinput - media-libs/mesa[gbm] - x11-libs/libdrm - x11-libs/libxkbcommon - ) - egl? ( media-libs/mesa[egl] ) - fontconfig? ( media-libs/fontconfig ) - fribidi? ( dev-libs/fribidi ) - gif? ( media-libs/giflib:= ) - glib? ( dev-libs/glib:2 ) - gles? ( media-libs/mesa[gles2] ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - harfbuzz? ( media-libs/harfbuzz ) - hyphen? ( dev-libs/hyphen ) - ibus? ( app-i18n/ibus ) - jpeg2k? ( media-libs/openjpeg:0= ) - libuv? ( dev-libs/libuv ) - luajit? ( dev-lang/luajit:= ) - !luajit? ( dev-lang/lua:* ) - nls? ( sys-devel/gettext ) - pdf? ( app-text/poppler:=[cxx] ) - physics? ( sci-physics/bullet:= ) - postscript? ( app-text/libspectre ) - pulseaudio? ( media-sound/pulseaudio ) - raw? ( media-libs/libraw:= ) - scim? ( app-i18n/scim ) - sdl? ( - media-libs/libsdl2 - virtual/opengl - ) - sound? ( media-libs/libsndfile ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - ) - ) - svg? ( - gnome-base/librsvg - x11-libs/cairo - ) - system-lz4? ( app-arch/lz4 ) - systemd? ( sys-apps/systemd ) - tiff? ( media-libs/tiff:0= ) - tslib? ( x11-libs/tslib:= ) - unwind? ( sys-libs/libunwind ) - valgrind? ( dev-util/valgrind ) - vlc? ( media-video/vlc ) - vnc? ( net-libs/libvncserver ) - wayland? ( - dev-libs/wayland - media-libs/mesa[gles2,wayland] - x11-libs/libxkbcommon - ) - webp? ( media-libs/libwebp:= ) - X? ( - media-libs/freetype - x11-libs/libXcursor - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXScrnSaver - opengl? ( - x11-libs/libX11 - x11-libs/libXrender - virtual/opengl - ) - gles? ( - x11-libs/libX11 - x11-libs/libXrender - virtual/opengl - xpresent? ( x11-libs/libXpresent ) - ) - ) - xine? ( media-libs/xine-lib ) - xpm? ( x11-libs/libXpm ) -" - -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND=" - ${COMMON_DEPEND} - !media-libs/elementary - !media-plugins/emotion_generic_players - !media-plugins/evas_generic_loaders -" - -src_prepare() { - default - - # Upstream still doesnt offer a configure flag. #611108 - if ! use unwind ; then - sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \ - configure || die "Sedding configure file with unwind fix failed." - fi - - xdg_environment_reset -} - -src_configure() { - local myconf=( - --enable-cserve - --enable-image-loader-generic - --enable-image-loader-jpeg - --enable-image-loader-png - --enable-libeeze - --enable-libmount - --enable-xinput22 - - --disable-doc - --disable-gesture - --disable-gstreamer - --disable-image-loader-tgv - --disable-tizen - --disable-wayland-ivi-shell - - $(use_enable avahi) - $(use_enable bmp image-loader-bmp) - $(use_enable bmp image-loader-wbmp) - $(use_enable dds image-loader-dds) - $(use_enable drm) - $(use_enable drm elput) - $(use_enable eet image-loader-eet) - $(use_enable egl) - $(use_enable fbcon fb) - $(use_enable fontconfig) - $(use_enable fribidi) - $(use_enable gif image-loader-gif) - $(use_enable gstreamer gstreamer1) - $(use_enable harfbuzz) - $(use_enable hyphen) - $(use_enable ico image-loader-ico) - $(use_enable ibus) - $(use_enable jpeg2k image-loader-jp2k) - $(use_enable libuv) - $(use_enable !luajit lua-old) - $(use_enable neon) - $(use_enable nls) - $(use_enable pdf poppler) - $(use_enable physics) - $(use_enable postscript spectre) - $(use_enable ppm image-loader-pmaps) - $(use_enable psd image-loader-psd) - $(use_enable pulseaudio) - $(use_enable raw libraw) - $(use_enable scim) - $(use_enable sdl) - $(use_enable sound audio) - $(use_enable static-libs static) - $(use_enable svg librsvg) - $(use_enable system-lz4 liblz4) - $(use_enable systemd) - $(use_enable tga image-loader-tga) - $(use_enable tiff image-loader-tiff) - $(use_enable tslib) - $(use_enable v4l v4l2) - $(use_enable valgrind) - $(use_enable vlc libvlc) - $(use_enable vnc vnc-server) - $(use_enable wayland) - $(use_enable webp image-loader-webp) - $(use_enable xcf) - $(use_enable xim) - $(use_enable xine) - $(use_enable xpm image-loader-xpm) - - --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none)) - --with-glib=$(usex glib) - --with-js=none - --with-net-control=$(usex connman connman none) - --with-profile=$(usex debug debug release) - --with-x11=$(usex X xlib none) - - $(use_with X x) - ) - - use fbcon && use egl && myconf+=( --enable-eglfs ) - use drm && use wayland && myconf+=( --enable-gl-drm ) - use X && use xpresent && myconf+=( --enable-xpresent ) - - if use opengl ; then - myconf+=( --with-opengl=full ) - elif use egl ; then - myconf+=( --with-opengl=es ) - elif use drm && use wayland ; then - myconf+=( --with-opengl=es ) - else - myconf+=( --with-opengl=none ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - if host-is-pax && use luajit ; then - # We need to build the lua code first so we can pax-mark it. #547076 - local target='_e_built_sources_target_gogogo_' - printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die - emake -C src "${target}" - emake -C src bin/elua/elua - pax-mark m src/bin/elua/.libs/elua - fi - - V=1 emake || die "Compiling EFL failed." -} - -src_install() { - einstalldocs - - V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed." - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/dev-libs/efl/efl-1.21.1.ebuild b/dev-libs/efl/efl-1.21.1.ebuild index d020ef97f293..c627b1a33b84 100644 --- a/dev-libs/efl/efl-1.21.1.ebuild +++ b/dev-libs/efl/efl-1.21.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,6 +30,7 @@ REQUIRED_USE=" vnc? ( X fbcon ) wayland? ( egl gles !opengl ) xim? ( X ) + xpresent? ( X ) " RDEPEND=" @@ -123,11 +124,11 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXrender virtual/opengl - xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) + xpresent? ( x11-libs/libXpresent ) " DEPEND=" @@ -215,6 +216,7 @@ src_configure() { $(use_enable xim) $(use_enable xine) $(use_enable xpm image-loader-xpm) + $(use_enable xpresent) --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none)) --with-glib=$(usex glib) @@ -227,7 +229,6 @@ src_configure() { ) use drm && use wayland && myconf+=( --enable-gl-drm ) - use X && use xpresent && myconf+=( --enable-xpresent ) if use opengl ; then myconf+=( --with-opengl=full ) diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml index a50ab944fbb1..9a89497c2f4d 100644 --- a/dev-libs/efl/metadata.xml +++ b/dev-libs/efl/metadata.xml @@ -35,7 +35,6 @@ Enable debug support via sys-libs/libunwind Enable usage of dev-util/valgrind in debug Enable media-video/vlc support - Enable WebP image loader Enable XCF image loader Enable X Input Method Enable x11-libs/libXpresent support -- cgit v1.2.3