gentoo resync : 21.09.2018

4 files changed, 4 insertions, 298 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index e7f16edc7602..bce27038a11a 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,5 @@
-DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
-EBUILD efl-1.18.4-r1.ebuild 7298 BLAKE2B d88740f4081b53d274f36e1f8200dd917030b6246cc88d8f9f2b24569ff79a69f2b7e68e76d61e2123297315850d03c3273894ffc0a508d425724fb25395ddd3 SHA512 2e2992916f6af3acec5af00c3d5c3e781414fb2c35c13000a18786dfd0e46ba27506130010900cbe75da80f33fa62410ccfb597be4b77d2770773bdf87be7faa
 EBUILD efl-1.20.7-r1.ebuild 7783 BLAKE2B a10092c4415cfc8ed7660ec94053b945d207b4b13644c5c2dac89fd22ccaddc1fbbedc2ea3af1e6cd76ea633319bfb33e2d9a6be547f52d9aba843755b9ff4af SHA512 5ea232554e4567b165cd2e6782d4cf914acd659d9728e7041536217e5658a7aff1b2c98566a7766a173dedf3ce12d80afb929b105fcfa50e3579b3d7de950479
-EBUILD efl-1.21.0.ebuild 6780 BLAKE2B b172687994d6794457cbfc4f282b12646e2865ae909b7348f4776570c4a95020457c59aded59a9abc7d133804293ce5d7755221be5aede6f58cffef04792b7de SHA512 58c326f5cb419931a15c4745c0fef5b4fb3b5034611fc5d3acbcd9e8df9deee2bd14f3d67b98d9d6d49805600699ddbadfe6da0c0c9f2b79c6d1bd5af32324e4
-MISC metadata.xml 2316 BLAKE2B d7401c2e633366d6c74a9bb5633160b868ee0ec2c8a04c3cc4da43898c50192238ac19eb7fc9aad88593d974c5fcf0cd2cf0413e66ecb4134d19581ff002fd10 SHA512 5e0a520c7854a1837dbf4c1e7f6e5e64695f62892118ca99e41f389efd4145066348f5023a0e4bf2d5b061d36dfa66ae9ce979f3b614fcb6498dafd9609c0530
+EBUILD efl-1.21.0.ebuild 6729 BLAKE2B 3a59d6f24f00ae61aa43297a8f4108e5e16c8271faeca0d8a846a609591b6f52281df9352c10016a219f41273ebe7b03ef92b7aea0942c25fe59cf79451f997c SHA512 a243e2040a5aa957f13cfbb6742bd6f30bd675e321c352506ff8e83d35bd68fb5f1f0639825a23a56d4981327827117176f328ce02ad054beeaa1768ec3f4645
+MISC metadata.xml 2221 BLAKE2B e6dfe70c4d177dca3ca940c7e4b65493fc91b87b84fe4244783051f6483d65e4d38dba05e143815a5048b7c6414984256a523e4d9a30cccd21bfcd5318920384 SHA512 a7d3654e00527b45d747e68d5cc26007974c2e347554b44e811c4faa18558a3030960acc437fae6d31c18db29ba171eefa37800344b0f3ded431abd79e4edc23
diff --git a/dev-libs/efl/efl-1.18.4-r1.ebuild b/dev-libs/efl/efl-1.18.4-r1.ebuild
deleted file mode 100644
index 5a1c8ec239a6..000000000000
--- a/dev-libs/efl/efl-1.18.4-r1.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="core"
-	EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
-	MY_P=${P%%_*}
-	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-else
-	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-inherit enlightenment pax-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl pdf physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
-
-REQUIRED_USE="
-	pulseaudio?	( sound )
-	opengl?		( || ( X sdl wayland ) )
-	gles?		( || ( X wayland ) )
-	gles?		( !sdl )
-	gles?		( egl )
-	sdl?		( opengl )
-	wayland?	( egl !opengl gles )
-	xim?		( X )
-"
-
-RDEPEND="
-	drm? (
-		>=dev-libs/libinput-0.8
-		media-libs/mesa[gbm]
-		>=x11-libs/libdrm-2.4
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib )
-	glib? ( dev-libs/glib:2 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl )
-		)
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	!oldlua? ( >=dev-lang/luajit-2.0.0 )
-	oldlua? ( dev-lang/lua:* )
-	pdf? ( app-text/poppler[cxx] )
-	physics? ( >=sci-physics/bullet-2.80 )
-	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	wayland? (
-		>=dev-libs/wayland-1.8.0
-		>=x11-libs/libxkbcommon-0.3.1
-		media-libs/mesa[gles2,wayland]
-	)
-	webp? ( media-libs/libwebp )
-	X? (
-		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
-		)
-	)
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	xpm? ( x11-libs/libXpm )
-
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.20.0
-	sys-libs/zlib
-	virtual/jpeg:0=
-
-	!dev-libs/ecore
-	!dev-libs/edbus
-	!dev-libs/eet
-	!dev-libs/eeze
-	!dev-libs/efreet
-	!dev-libs/eina
-	!dev-libs/eio
-	!dev-libs/embryo
-	!dev-libs/eobj
-	!dev-libs/ephysics
-	!media-libs/edje
-	!media-libs/elementary
-	!media-libs/emotion
-	!media-libs/ethumb
-	!media-libs/evas
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-#external lz4 support currently broken because of unstable ABI/API
-#	app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
-	!!dev-libs/ecore
-	!!dev-libs/edbus
-	!!dev-libs/eet
-	!!dev-libs/eeze
-	!!dev-libs/efreet
-	!!dev-libs/eina
-	!!dev-libs/eio
-	!!dev-libs/embryo
-	!!dev-libs/eobj
-	!!dev-libs/ephysics
-	!!media-libs/edje
-	!!media-libs/emotion
-	!!media-libs/ethumb
-	!!media-libs/evas
-"
-
-DEPEND="
-	${CORE_EFL_CONFLICTS}
-
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	enlightenment_src_prepare
-
-	# Remove stupid sleep command.
-	# Also back out gnu make hack that causes regen of Makefiles.
-	# Delete var setting that causes the build to abort.
-	sed -i \
-		-e '/sleep 10/d' \
-		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-		-e '/BARF_OK=/s:=.*:=:' \
-		configure || die
-
-	# Upstream doesn't offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i \
-			-e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	if use ssl && use gnutls ; then
-		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
-		einfo "gnutls has been selected for you."
-	fi
-	if use opengl && use gles ; then
-		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
-		einfo "opengl has been selected for you."
-	fi
-
-	E_ECONF=(
-		--with-profile=$(usex debug debug release)
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-x11=$(usex X xlib none)
-		$(use_with X x)
-		--with-opengl=$(usex opengl full $(usex gles es none))
-		--with-glib=$(usex glib)
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable drm)
-		$(use_enable doc)
-		$(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 ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable oldlua lua-old)
-		$(use_enable physics)
-		$(use_enable pixman)
-		$(use_enable pixman pixman-font)
-		$(use_enable pixman pixman-rect)
-		$(use_enable pixman pixman-line)
-		$(use_enable pixman pixman-poly)
-		$(use_enable pixman pixman-image)
-		$(use_enable pixman pixman-image-scale-sample)
-		$(use_enable png image-loader-png)
-		$(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 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 wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-
-		--disable-tizen
-		--disable-gesture
-		--disable-gstreamer
-		--enable-xinput2
-		--disable-xinput22
-		--enable-libmount
-
-		# external lz4 support currently broken because of unstable ABI/API
-		#--enable-liblz4
-	)
-
-	enlightenment_src_configure
-}
-
-src_compile() {
-	if host-is-pax && ! use oldlua ; 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
-	enlightenment_src_compile
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-
-	enlightenment_src_install
-}
diff --git a/dev-libs/efl/efl-1.21.0.ebuild b/dev-libs/efl/efl-1.21.0.ebuild
index 77750924fd50..64ac0b67a25e 100644
--- a/dev-libs/efl/efl-1.21.0.ebuild
+++ b/dev-libs/efl/efl-1.21.0.ebuild
@@ -11,8 +11,8 @@ 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="avahi +bmp dds connman debug drm +eet egl examples 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"
+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 )
@@ -179,7 +179,6 @@ src_configure() {
 		$(use_enable drm elput)
 		$(use_enable eet image-loader-eet)
 		$(use_enable egl)
-		$(use_enable examples always-build-examples)
 		$(use_enable fbcon fb)
 		$(use_enable fontconfig)
 		$(use_enable fribidi)
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 221e9e373197..a50ab944fbb1 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -24,7 +24,6 @@
 		<flag name="ivi">Enable ivi-shell support</flag>
 		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
 		<flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-		<flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
 		<flag name="physics">Enable Bullet physics effects and support</flag>
 		<flag name="pixman">Enable PixMan for software rendering</flag>
 		<flag name="ppm">Enable PMAPS image loader</flag>