[patch] efl git diff current tree my ebuild

efl-9999.gitdiff (text/plain), 11.61 KB, created by chris.murtagh1 on 2017-12-23 05:12:27 UTC

diff --git a/efl-9999.ebuild b/usr/local/portage/dev-libs/efl/efl-9999.ebuild
index 609840b..84d04f4 100644
--- a/efl-9999.ebuild
+++ b/usr/local/portage/dev-libs/efl/efl-9999.ebuild
@@ -3,25 +3,19 @@
 
 EAPI="5"
 
-MY_P=${P/_/-}
+inherit eutils
+[ "${PV}" = 9999 ] && inherit git-r3 autotools
 
-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-fbsd ~x86-fbsd ~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"
+DESCRIPTION="Enlightenment Foundation Core Libraries"
+HOMEPAGE="https://www.enlightenment.org/"
+EGIT_REPO_URI="https://git.enlightenment.org/core/${PN}.git"
+[ "${PV}" = 9999 ] || SRC_URI="http://download.enlightenment.org/rel/libs/${PN}/${P/_/-}.tar.bz2"
 
 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 physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
+[ "${PV}" = 9999 ] || KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE="+X avahi +bmp cxx-bindings debug doc +drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua nls +opengl ssl physics pixman +png +ppm postscript psd pulseaudio rawphoto scim sdl sound static-libs +svg systemd test tga tiff tslib v4l2 vlc wayland webp xim xine xpm"
 
 REQUIRED_USE="
 	pulseaudio?	( sound )
@@ -34,114 +28,88 @@ REQUIRED_USE="
 	xim?		( X )
 "
 
-RDEPEND="
+COMMON_DEP="
 	drm? (
 		>=dev-libs/libinput-0.8
 		media-libs/mesa[gbm]
 		>=x11-libs/libdrm-2.4
 		>=x11-libs/libxkbcommon-0.3.0
 	)
+	dev-lang/luajit:2
+	sys-apps/dbus
+	sys-libs/zlib
+	app-text/poppler
+	virtual/jpeg:*
+	virtual/udev
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXp
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		gles? (
+			media-libs/mesa[egl,gles2]
+			x11-libs/libXrender
+		)
+		opengl? (
+			virtual/opengl
+			x11-libs/libXrender
+		)
+	)
+	avahi? ( net-dns/avahi )
+	debug? ( dev-util/valgrind )
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gif? ( media-libs/giflib )
-	glib? ( dev-libs/glib:2 )
+	glib? ( dev-libs/glib:* )
 	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl )
-		)
-	)
+	!gnutls? ( ssl? ( dev-libs/openssl:* ) )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
+	vlc? ( media-video/vlc )
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
 	jpeg2k? ( media-libs/openjpeg:0 )
+	nls? ( sys-devel/gettext )
 	!oldlua? ( >=dev-lang/luajit-2.0.0 )
 	oldlua? ( dev-lang/lua:* )
-	physics? ( >=sci-physics/bullet-2.80 )
+	physics? ( sci-physics/bullet )
 	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
+	postscript? ( app-text/libspectre:* )
 	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw )
-	scim? ( app-i18n/scim )
+	pulseaudio? (
+		media-sound/pulseaudio
+		media-libs/libsndfile
+	)
+	scim?	( app-i18n/scim )
 	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
+		>=media-libs/libsdl2-2.0.0:0[opengl?,gles?]
 	)
+
+	svg? ( gnome-base/librsvg )
 	sound? ( media-libs/libsndfile )
 	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
+	tiff? ( media-libs/tiff:0 )
 	tslib? ( x11-libs/tslib )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
 	wayland? (
-		>=dev-libs/wayland-1.8.0
+		>=dev-libs/wayland-1.3.0:0
 		>=x11-libs/libxkbcommon-0.3.1
-		media-libs/mesa[gles2,wayland]
+		egl? ( media-libs/mesa[egl,gles2] )
 	)
 	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/libXp
-		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="
+	xpm? ( x11-libs/libXpm )"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
 	!!dev-libs/ecore
 	!!dev-libs/edbus
 	!!dev-libs/eet
@@ -156,59 +124,77 @@ CORE_EFL_CONFLICTS="
 	!!media-libs/emotion
 	!!media-libs/ethumb
 	!!media-libs/evas
-"
-
-DEPEND="
-	${CORE_EFL_CONFLICTS}
-
-	${RDEPEND}
 	doc? ( app-doc/doxygen )
-"
+	test? ( dev-libs/check )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
-	enlightenment_src_prepare
+	[ ${PV} = 9999 ] && eautoreconf
+}
 
-	# 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
+src_configure() {
+	local config=()
 
-	# Upstream doesn't offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i \
-			-e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-			configure || die
+	# gnutls / openssl
+	if use gnutls; then
+		config+=( --with-crypto=gnutls )
+		use ssl && \
+			einfo "You enabled both USE=ssl and USE=gnutls, using gnutls"
+	elif use ssl; then
+		config+=( --with-crypto=openssl )
+	else
+		config+=( --with-crypto=none )
 	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."
+	# X
+	config+=(
+		$(use_with X x)
+		$(use_with X x11 xlib)
+	)
+	if use opengl; then
+		config+=( --with-opengl=full )
+		use gles &&  \
+			einfo "You enabled both USE=opengl and USE=gles, using opengl"
+	elif use gles; then
+		config+=( --with-opengl=es )
+		if use sdl; then
+			config+=( --with-opengl=none )
+			ewarn "You enabled both USE=sdl and USE=gles which isn't currently supported."
+			ewarn "Disabling gl for all backends."
+		fi
+	else
+		config+=( --with-opengl=none )
 	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."
+
+	# Handle vlc
+	if use vlc; then
+		has_version '>=media-video/vlc-3.0.0' && config+=( --enable-libvlc )
+		has_version '<media-video/vlc-3.0.0' && config+=( --with-generic_vlc )
 	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
+	# wayland
+	config+=(
+		$(use_enable egl)
+		$(use_enable wayland)
+	)
 
+	#if use drm && use systemd; then
+		config+=(
+			$(use_enable drm)
+		)
+	#else
+	#	einfo "You cannot build DRM support without systemd support, disabling drm engine"
+	#	config+=(
+	#		--disable-drm
+	#	)
+	#fi
+	config+=(
+		$(use_enable avahi)
 		$(use_enable bmp image-loader-bmp)
 		$(use_enable bmp image-loader-wbmp)
 		$(use_enable drm)
+		$(use_enable cxx-bindings cxx-bindings)
 		$(use_enable doc)
 		$(use_enable eet image-loader-eet)
 		$(use_enable egl)
@@ -219,9 +205,9 @@ src_configure() {
 		$(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 ibus)
 		$(use_enable nls)
 		$(use_enable oldlua lua-old)
 		$(use_enable physics)
@@ -233,57 +219,76 @@ src_configure() {
 		$(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 postscript spectre)
 		$(use_enable psd image-loader-psd)
+
 		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
+		$(use_enable pulseaudio audio)
+		$(use_enable rawphoto libraw)
 		$(use_enable scim)
 		$(use_enable sdl)
-		$(use_enable sound audio)
+		$(use_enable static-libs static)
 		$(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 v4l2)
 		$(use_enable webp image-loader-webp)
+		$(use_enable xpm image-loader-xpm)
 		$(use_enable xim)
 		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		--enable-cserve
+
+		# image loders
 		--enable-image-loader-generic
-		--enable-image-loader-jpeg
+		--enable-image-loader-ico
+		--enable-image-loader-jpeg # required by ethumb
+		$(use_enable svg librsvg)
+		--enable-image-loader-tga
+		--enable-image-loader-wbmp
+
+		--enable-cserve
+		--enable-libmount
+		--enable-threads
+		--enable-xinput22
 
+		--disable-gstreamer # using gstreamer1
+		#--disable-lua-old
+		--disable-multisense
 		--disable-tizen
 		--disable-gesture
-		--disable-gstreamer
-		--enable-xinput2
-		--disable-xinput22
-		--enable-libmount
+		#--disable-xinput2
+		#--enable-xinput2 # enable it
+		--enable-elput
+		--disable-xpresent
+
+		# bug 501074. Is it still valid?
+		#--disable-pixman
+		#--disable-pixman-font
+		#--disable-pixman-rect
+		#--disable-pixman-line
+		#--disable-pixman-poly
+		#--disable-pixman-image
+		#--disable-pixman-image-scale-sample
 
-		# external lz4 support currently broken because of unstable ABI/API
-		#--enable-liblz4
+		--with-profile=$(usex debug debug release)
+		--with-glib=$(usex glib yes no)
+		--with-tests=$(usex test regular none)
+
+#		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
+		--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
 	)
 
-	enlightenment_src_configure
+	econf "${config[@]}"
 }
 
-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_test() {
+	MAKEOPTS+=" -j1"
+	default
 }
 
 src_install() {
 	MAKEOPTS+=" -j1"
-
-	enlightenment_src_install
+	default
+	prune_libtool_files
 }