commit: c7242d8a78ad36d13d68b7bd4f9981bdd813b7fc
Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 14:11:46 2014 +0000
Commit: Ralph Sennhauser <sera <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 14:11:46 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/sera.git;a=commit;h=c7242d8a
efl-1.9.1: Version bump
Drop xcb as upstream doesn't like it being exposed as it's considered
broken.
Drop audio useflag as it's redundant with pulseaudio.
Package-Manager: portage-2.2.8-r1
Manifest-Sign-Key: 3C5CF75A
---
dev-libs/efl/Manifest | 17 +-
dev-libs/efl/efl-1.8.5.ebuild | 238 ---------------------
.../{efl-1.9.0_beta2.ebuild => efl-1.9.1.ebuild} | 51 ++---
dev-libs/efl/metadata.xml | 1 -
4 files changed, 23 insertions(+), 284 deletions(-)
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 4acda41..079e88d 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,16 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST efl-1.8.5.tar.bz2 28175735 SHA256
4456ce34bdc8294336c451a44e12f2f928ac9b857040da6d72c10432611646de SHA512
155542aa900980c59745dd2b25244d52b38de0de400b8432f9183c53c9770efdbca9d6e31f3305cf16d19357660ff8383447442d6a08c9ddec2e83a5b054e6df
WHIRLPOOL
d8efbc474a6d62837ab94c7ab6a060c1440fa16a2e798c2d722d6029ac17421afb8b07b3cf614c94fa9fed9f55fad8994377bc7a37b1e024fcf28423b45221a0
-DIST efl-1.9.0-beta2.tar.bz2 28175848 SHA256
81b96dbf2b4b1c95071b28b87779845e9e5894bc046574250f7e050988c31a33 SHA512
831212c693aea42319650c9a4d16c0cc5599e01f6b71c995cbb3ca1f8c1893d08fe7f8deffb300cc7a50c72052a34b04d24fa0d16239f547ccb98882054eba4f
WHIRLPOOL
381df0380eb5b500e071a2307b36bb03e941a3f3d84c47045680dcb4ca344c70aff615ca57b51f360ede74b749b75df8a857b1286a201a41f99dd4a303300324
+DIST efl-1.9.1.tar.bz2 28183514 SHA256
5d84daa3831bb931d3d37014a2183e033552b5bbf90d66e06d2ab91c76f85196 SHA512
ef9a244d1330c06714dcb054c622850542ce69cd6d8fbddd343cf7b8169e64b7120d0c6bfe88be523a313edfb2a2170d712aaedd1dcf4785a9ea6508abd8a75a
WHIRLPOOL
c5a15627334daa0910c439cc753cfdc173fd93a660ec1f8edab759c5f8b6e3ae675563cc28e19dbb1062edd99ac954cb9f941cd5a8919113fa21961fcd0c9974
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJTCK2GAAoJELjwI6Q8XPdaFwoH/2qpICYcWun0wJHfmF8jAyi9
-6qijgSFOOhO1coLt2/9p5piGncM49whd+x2EuJx2zfN/3uUy17WbsJCGoImYTINA
-HiVnSGs4rRpy4SWGsDuIbTOy7uCOyxf26BdtdR0nZv5t5ybiBmZA1oj1lebb3Hku
-6iYy02lfXhIy99mtQHCWSm1mLsqEUF5X9KVD1cAO8FPaiLizasuccuvcA1ygs4vd
-PSbns2Ftyojy3wUKo6f1BcdwqRcLR0CeBOcsEjkEYG+k6SVTJ8bPAj6guAZOVjma
-he5rqeIcWsbHBdmiyMFuU2uS5Pv9lfYGNEwuyZZAvox50VioybUsaVsxR+sfWyw=
-=HsSC
+iQEcBAEBCAAGBQJTJF+iAAoJELjwI6Q8XPdayYwH/0OO7dxaE0h7AJFo5eqLRW5U
+KvsJqmvucMzv6EknxUOnAhu9zIkCzT+Esfd5lN4tLz4y7hUmCzPpWAo+3Tez9o60
+tNOiaxXUKX+Gil/PjntBOi5oBZ6XkDtyCfXAwB4IKqLIzVwGafkcWLE+7/PIwl0J
+0nSZGZ8+4gC8Biw7VGC5iH75Mh2Wa23jlFUv9x2WmXNr9vzrYVnfesKyslIfMODB
+yiSO7M3/DZpfSEH8E2a8ikk63lFW90S4JU6Yu8ML8NGYKaEkfjXi71ekRye9Vtlo
+0eFJBfDOT/HmcH7Qh6qnyn5GMrvmQl7lFjQpPxRMn2oyYET39Fpx/GHhzf/vP9k=
+=gU/6
-----END PGP SIGNATURE-----
diff --git a/dev-libs/efl/efl-1.8.5.ebuild b/dev-libs/efl/efl-1.8.5.ebuild
deleted file mode 100644
index 2d12fe2..0000000
--- a/dev-libs/efl/efl-1.8.5.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit eutils libtool
-
-DESCRIPTION="Enlightenment Foundation Core Libraries"
-HOMEPAGE="http://www.enlightenment.org/";
-SRC_URI="http://download.enlightenment.org/rel/libs/${PN}/${P}.tar.bz2";
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+X audio debug doc drm egl fbcon +fontconfig fribidi gif gles glib
gnutls gstreamer harfbuzz ibus jp2k nls +opengl ssl physics pixman +png
pulseaudio scim sdl static-libs systemd test tiff tslib v4l2 wayland webp xcb
xim xine xpm"
-
-COMMON_DEP="
- dev-lang/lua
- sys-apps/dbus
- >=sys-apps/util-linux-2.20.0
- sys-libs/zlib
- virtual/jpeg
- virtual/udev
- X? (
- x11-libs/libX11
- gles? (
- media-libs/mesa[egl,gles2]
- x11-libs/libXrender
- )
- opengl? (
- virtual/opengl
- x11-libs/libXrender
- )
- xcb? (
- x11-libs/libxcb
- x11-libs/pixman
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- !xcb? (
- 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
- )
- )
- audio? ( media-libs/libsndfile )
- debug? ( dev-util/valgrind )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib )
- glib? ( dev-libs/glib )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl ) )
- gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-good:0.10
- media-plugins/gst-plugins-ffmpeg:0.10
- )
- harfbuzz? ( media-libs/harfbuzz )
- ibus? ( app-i18n/ibus )
- jp2k? ( media-libs/openjpeg )
- nls? ( sys-devel/gettext )
- physics? ( sci-physics/bullet )
- pixman? ( x11-libs/pixman )
- png? ( media-libs/libpng:0= )
- pulseaudio? (
- media-sound/pulseaudio
- media-libs/libsndfile
- )
- scim? ( app-i18n/scim )
- sdl? (
- >=media-libs/libsdl-1.2.0:0[opengl?]
- gles? ( >=media-libs/libsdl-1.2.0:0[opengl] )
- )
- systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0 )
- tslib? ( x11-libs/tslib )
- wayland? (
- >=dev-libs/wayland-1.3.0:0
- >=x11-libs/libxkbcommon-0.3.1
- egl? ( media-libs/mesa[egl,gles2] )
- )
- webp? ( media-libs/libwebp )
- xine? ( >=media-libs/xine-lib-1.1.1 )
- xpm? ( x11-libs/libXpm )"
-DEPEND="${COMMON_DEP}
- !!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
- doc? ( app-doc/doxygen )
- test? ( dev-libs/check )"
-
-src_prepare() {
- elibtoolize
-}
-
-src_configure() {
- local config=()
-
- # 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
-
- # X
- config+=(
- $(use_with X x)
- --with-x11=$(usex xcb xcb 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 )
- else
- config+=( --with-opengl=none )
- fi
-
- # wayland
- config+=(
- $(use_enable egl)
- $(use_enable wayland)
- )
-
- # audio
- # there is no alsa support currently
- if use audio || use pulseaudio; then
- config+=(
- --enable-audio
- $(use_enable pulseaudio)
- )
- else
- config+=( --disable-audio )
- fi
-
- config+=(
- $(use_enable drm)
- $(use_enable doc)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gstreamer)
- $(use_enable harfbuzz)
- $(use_enable ibus)
- $(use_enable nls)
- $(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 scim)
- $(use_enable sdl)
- $(use_enable static-libs static)
- $(use_enable systemd)
- $(use_enable tslib)
- $(use_enable v4l2)
- $(use_enable xim)
- $(use_enable xine)
-
- # image loders
- --enable-image-loader-bmp
- --enable-image-loader-eet
- --enable-image-loader-generic
- --enable-image-loader-ico
- --enable-image-loader-jpeg # required by ethumb
- --enable-image-loader-ppm
- --enable-image-loader-psd
- --enable-image-loader-tga
- --enable-image-loader-wbmp
- $(use_enable gif image-loader-gif)
- $(use_enable jp2k image-loader-jp2k)
- $(use_enable png image-loader-png)
- $(use_enable tiff image-loader-tiff)
- $(use_enable webp image-loader-webp)
- $(use_enable xpm image-loader-xpm)
-
- --enable-cserve
- --enable-libmount
- --enable-threads
- --enable-xinput22
-
- --disable-gesture
- --disable-multisense
- --disable-tizen
- --disable-xinput2
-
- --with-profile=$(usex debug debug release)
- --with-glib=$(usex glib yes no)
- --with-tests=$(usex test regular none)
- )
-
- econf "${config[@]}"
-}
-
-src_test() {
- MAKEOPTS+=" -j1"
- default
-}
-
-src_install() {
- MAKEOPTS+=" -j1"
- default
- prune_libtool_files
-}
diff --git a/dev-libs/efl/efl-1.9.0_beta2.ebuild b/dev-libs/efl/efl-1.9.1.ebuild
similarity index 82%
rename from dev-libs/efl/efl-1.9.0_beta2.ebuild
rename to dev-libs/efl/efl-1.9.1.ebuild
index 34563b5..4a21de8 100644
--- a/dev-libs/efl/efl-1.9.0_beta2.ebuild
+++ b/dev-libs/efl/efl-1.9.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+X audio avahi debug doc drm egl fbcon +fontconfig fribidi gif gles glib
gnutls gstreamer harfbuzz ibus jp2k nls +opengl ssl physics pixman +png
pulseaudio scim sdl static-libs systemd test tiff tslib v4l2 wayland webp xcb
xim xine xpm"
+IUSE="+X avahi debug doc drm egl fbcon +fontconfig fribidi gif gles glib
gnutls gstreamer harfbuzz ibus jp2k nls +opengl ssl physics pixman +png
pulseaudio scim sdl static-libs systemd test tiff tslib v4l2 wayland webp xim
xine xpm"
COMMON_DEP="
dev-lang/luajit:2
@@ -25,6 +25,17 @@ COMMON_DEP="
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
@@ -33,30 +44,7 @@ COMMON_DEP="
virtual/opengl
x11-libs/libXrender
)
- xcb? (
- x11-libs/libxcb
- x11-libs/pixman
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- !xcb? (
- 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
- )
)
- audio? ( media-libs/libsndfile )
avahi? ( net-dns/avahi )
debug? ( dev-util/valgrind )
fontconfig? ( media-libs/fontconfig )
@@ -134,7 +122,7 @@ src_configure() {
# X
config+=(
$(use_with X x)
- --with-x11=$(usex xcb xcb xlib)
+ $(use_with X x11 xlib)
)
if use opengl; then
config+=( --with-opengl=full )
@@ -152,17 +140,6 @@ src_configure() {
$(use_enable wayland)
)
- # audio
- # there is no alsa support currently
- if use audio || use pulseaudio; then
- config+=(
- --enable-audio
- $(use_enable pulseaudio)
- )
- else
- config+=( --disable-audio )
- fi
-
config+=(
$(use_enable avahi)
$(use_enable drm)
@@ -182,6 +159,8 @@ src_configure() {
$(use_enable pixman pixman-poly)
$(use_enable pixman pixman-image)
$(use_enable pixman pixman-image-scale-sample)
+ $(use_enable pulseaudio)
+ $(use_enable pulseaudio audio)
$(use_enable scim)
$(use_enable sdl)
$(use_enable static-libs static)
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 07b0dc3..967e748 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -6,7 +6,6 @@
<name>Ralph Sennhauser</name>
</maintainer>
<use>
- <flag name="audio"></flag>
<flag name="drm"></flag>
<flag name="egl"></flag>
<flag name="fribidi"></flag>
