misc fixes + doc & examples

3 files changed, 108 insertions, 83 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 6f40cae..66f7387 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,4 +1,4 @@
 AUX efl-1.20.7_autotools_libunwind.patch 3508 SHA256 8ff054bc71d7f55b1b46d827b7b7aa3a9a703ae0b268aa678deeec23cb3a5de8 SHA512 9921aa489c923a70f9b057409dbb337153c7551f07e0a9007c6576bb6e673ba72146dbbe9e200574ce558c9a75b2895aa28499c4b276e3fb7e71a25b88e78042 WHIRLPOOL b373100b78f50157d08e7422f45912e321d182e0984449186143760d66dbeaf45b1a9d2a4b11bb55d3d7fb938c2b62b68020272d90a97b6c79bd9cd8ba592354
 DIST efl-1.20.7.tar.xz 65509444 SHA256 b0a9b765bcd7b012f1072da1d491fc8671aa089473f746901d93f5807a2c76fe SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de WHIRLPOOL cd5b7812c930e1878b858c5cb85dce7f180794627bc439f1b1d3cc78cdef1fb857788d6139484dadb69621bad41caa592f67df1e2d43b0f912044602441a1533
-EBUILD efl-1.20.7.ebuild 6905 SHA256 900b59c02bb35b6f171b9cf939ae87cff71dd0d5bb756440aae844e1a676bc9e SHA512 4a8ea58eb94cf22b6fd90c48c6f970a90ea8146ce2cfd8548826ca9a9658b1fc3e3ec55c01a38abd4bb249893d7c6c2a85755996dd108bfbdbcf46b19761bbad WHIRLPOOL 99c25a822891719c3a0aeb225a321a5976561778e2bb4171cd72aa8bda5b988bc758eaebd815332b1e147b8be0c4d6450b3e54e3af5041fab2765947416b14c3
-MISC metadata.xml 1610 SHA256 90c48fd43db13176074fb6560242b3303cff3e4ad4eed059b5730d759148d6bb SHA512 5bd3f346a65e6e21e0f12cda8bff96b5ef2ff37c49a8cc77c0fa9d08bb8398cbab284f060debdbd0781e08de7643111e5acc289c4129153f351790c8b3864217 WHIRLPOOL af0b50d14d8a08743290447c73b4e2eb22021a00490b577f40e1411f827f3fa3904f51059f21db0bdfd9878ed897081c9ef6e91bc55b10af9975bd9a90d98b8a
+EBUILD efl-1.20.7.ebuild 7495 SHA256 b6e9b66db68edc7e9572887db51367a527cbb3c722249e0a395c4be910f609a0 SHA512 54b70a3674b0ae136c0d371c5813a406106e5cc855c941de05b689071f1957c7d27c8a59e2bd350f546e30d180568fe503da2fcae4696517bb19fbc9bdb344d6 WHIRLPOOL 8dd0ad279015fa8d0eb47b4485f27b3e0281805fbc13b40959192fab576b15f84c08c032c02b27b0e9fa5f70bc10e1fbb80498e38b3f8283d238f9bf9f299138
+MISC metadata.xml 1654 SHA256 ed5aa64adda8e6fc89fce485e2328293c5c3635253e64b69768b3fb532f4d553 SHA512 2a6b7faad4e371a68bc38089e21f456e1c7b6625408e502e728d38214cfd1dded46f0c5c4d12f60b4f737f0ca07c6b4b24ccbbe4d837b402237236c401db3489 WHIRLPOOL 0d0bd15c6f5eb3d954e5c1754a22e4ae0602a69760f7c140c7f52a72712dd6b6b0e1aced0c0cad2f43e545ec3318066b0d8f0e1daa440013d733c6b7d7977d4d
diff --git a/dev-libs/efl/efl-1.20.7.ebuild b/dev-libs/efl/efl-1.20.7.ebuild
index 1ee8e15..b35d072 100644
--- a/dev-libs/efl/efl-1.20.7.ebuild
+++ b/dev-libs/efl/efl-1.20.7.ebuild
@@ -8,13 +8,13 @@ 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"
 HOMEPAGE="https://www.enlightenment.org/about-efl"
 
-inherit pax-utils
+inherit pax-utils autotools gnome2-utils xdg-utils
 #eutils autotools
 
 DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug doc drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon nls 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"
+IUSE="+bmp debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl lz4 neon nls 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"
 
 SLOT="0"
 
@@ -51,13 +51,14 @@ RDEPEND="
 			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 )
+	lz4? ( app-arch/lz4 )
 	!oldlua? ( >=dev-lang/luajit-2.0.0 )
 	oldlua? ( dev-lang/lua:* )
 	physics? ( >=sci-physics/bullet-2.80 )
@@ -166,10 +167,13 @@ DEPEND="
 
 S=${WORKDIR}/${MY_P}
 
-#src_prepare() {
+src_prepare() {
+	default
 #	epatch "${FILESDIR}/efl-1.20.7_autotools_libunwind.patch"
-#	eautoreconf
-#}
+#	eapply "${FILESDIR}/efl-1.20.7_autotools_libunwind.patch"
+#	eapply_user
+	eautoreconf
+}
 
 src_configure() {
 	if use ssl && use gnutls ; then
@@ -181,80 +185,87 @@ src_configure() {
 		einfo "opengl has been selected for you."
 	fi
 
-	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) \
-		$(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) \
-		--enable-gstreamer1 \
-		--disable-gstreamer \
-		$(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 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) \
-		$(use_enable unwind libunwind) \
-		--enable-cserve \
-		--enable-image-loader-generic \
-		--enable-image-loader-jpeg \
-		--disable-tizen \
-		--disable-gesture \
-		--disable-gstreamer \
-		--enable-xinput2 \
-		--disable-xinput22 \
+	local config=(
+		--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)
+		$(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)
+		--enable-gstreamer1
+		--disable-gstreamer
+		$(use_enable harfbuzz)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable lz4 liblz4)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(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)
+		$(use_enable unwind libunwind)
+		--enable-cserve
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--disable-tizen
+		--disable-gesture
+		--disable-gstreamer
+		--enable-xinput2
+		--disable-xinput22
 		--enable-libmount
+	)
 
-		# require gstreamer since upstream strongly discourages not using it
-		#		$(use_enable gstreamer gstreamer1) \
+	# require gstreamer since upstream strongly discourages not using it
+	# and not going to enable that:
+	# 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 gstreamer gstreamer1) \
 
+	# testing lz4
+	# external lz4 support currently broken because of unstable ABI/API
+	#--enable-liblz4
+	ECONF_SOURCE="$S" econf "${config[@]}"
 
-		# external lz4 support currently broken because of unstable ABI/API
-		#--enable-liblz4
 }
 
-#src_compile() {
+src_compile() {
+	default
 #	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_'
@@ -263,11 +274,24 @@ src_configure() {
 #		emake -C src bin/elua/elua
 #		pax-mark m src/bin/elua/.libs/elua
 #	fi
-#	enlightenment_src_compile
-#}
+	use examples && emake examples
+	use doc && emake doc
+}
+
+src_install() {
+	default
+	DOCS=( ABOUT-NLS AUTHORS ChangeLog COMPLIANCE COPYING INSTALL NEWS README )
+	use doc && HTML_DOCS=( doc/html )
+	einstalldocs
+	use examples && emake DESTDIR="${D}" install-examples
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
 
-#src_install() {
-#	MAKEOPTS+=" -j1"
-#
-#	enlightenment_src_install
-#}
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 534fc51..2a36178 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -16,6 +16,7 @@
 	<flag name="harfbuzz">Enable complex text shaping and layout support</flag>
 	<flag name="ibus">Enable Intelligent Input Bus</flag>
 	<flag name="ico">Enable Ico image loader</flag>
+	<flag name="lz4">Enable lz4 support</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>