profiles/enlightenment/build: Merge host-dependencies and

build-dependencies

14 files changed, 192 insertions, 284 deletions

diff --git a/profiles/enlightenment/build/build-dependencies/packages b/profiles/enlightenment/build/build-dependencies/packages
deleted file mode 100644
index 23455525..00000000
--- a/profiles/enlightenment/build/build-dependencies/packages
+++ /dev/null
@@ -1,53 +0,0 @@
-*app-i18n/ibus
-*app-i18n/scim
-
-*app-text/libspectre
-*app-text/sloccount
-
-*dev-python/dbus-python
-
-*media-libs/gst-plugins-good
-*media-libs/libcanberra
-*media-libs/libraw
-
-*media-video/vlc
-
-*net-dns/c-ares
-
-*net-misc/connman
-
-*sci-physics/bullet
-
-*sys-fs/udisks
-*sys-fs/udisks:0
-
-*sys-power/upower
-
-*x11-libs/libXScrnSaver
-
-# 12/12/2013 - beber
-# Needed by Webkit EFL
-*net-libs/libsoup
-
-# 25/01/2015 - beber
-# As per request on Tue, 30 Dec 2014 10:44:19 +0100 from stefan
-*app-misc/geoclue:0
-*app-misc/geoclue:2.0
-
-# 12/02/2015 - beber
-# As per request on Thu, 12 Feb 2015 12:43:35 +0000 from stefan
-*dev-libs/libinput
-
-# 07/06/2013 - beber
-# As per tasn request for exactness FDO
-*x11-themes/gnome-icon-theme
-*x11-themes/gnome-icon-theme-extras
-*x11-themes/gnome-icon-theme-symbolic
-*x11-themes/hicolor-icon-theme
-*x11-themes/tango-icon-theme
-*x11-themes/tango-icon-theme-extras
-
-# 13/02/2016 - beber
-# As per stefan request to avoid bitrooting
-*dev-libs/hyphen
-*x11-libs/libXpresent
diff --git a/profiles/enlightenment/build/cross/mingw/parent b/profiles/enlightenment/build/cross/mingw/parent
index d82f6f1a..f3229c5b 100644
--- a/profiles/enlightenment/build/cross/mingw/parent
+++ b/profiles/enlightenment/build/cross/mingw/parent
@@ -1,2 +1 @@
 ..
-../../build-dependencies
diff --git a/profiles/enlightenment/build/crossdev/package.use b/profiles/enlightenment/build/crossdev/package.use
new file mode 100644
index 00000000..0bec39b3
--- /dev/null
+++ b/profiles/enlightenment/build/crossdev/package.use
@@ -0,0 +1,7 @@
+# 23/05/2015 - beber
+# REQUIRED_USE vaapi? ( staging )
+app-emulation/wine -vaapi -udisks X
+
+# 08/01/2017 - beber
+# REQUIRED_USE gles2? ( !opengl )
+media-libs/gst-plugins-bad -gles2
diff --git a/profiles/enlightenment/build/crossdev/parent b/profiles/enlightenment/build/crossdev/parent
index c86895a8..d9b515ac 100644
--- a/profiles/enlightenment/build/crossdev/parent
+++ b/profiles/enlightenment/build/crossdev/parent
@@ -1,3 +1,2 @@
 ../../../server/kvm
-..
-../host-dependencies
+../native
diff --git a/profiles/enlightenment/build/crossdev/x86_64-pc-linux-gnu/make.defaults b/profiles/enlightenment/build/crossdev/x86_64-pc-linux-gnu/make.defaults
new file mode 100644
index 00000000..25493f5c
--- /dev/null
+++ b/profiles/enlightenment/build/crossdev/x86_64-pc-linux-gnu/make.defaults
@@ -0,0 +1 @@
+ABI_X86="32 64"
diff --git a/profiles/enlightenment/build/crossdev/x86_64-pc-linux-gnu/package.use b/profiles/enlightenment/build/crossdev/x86_64-pc-linux-gnu/package.use
deleted file mode 100644
index 2580c348..00000000
--- a/profiles/enlightenment/build/crossdev/x86_64-pc-linux-gnu/package.use
+++ /dev/null
@@ -1,81 +0,0 @@
-# required by app-emulation/wine
-app-arch/bzip2 abi_x86_32
-app-arch/lz4 abi_x86_32
-app-arch/xz-utils abi_x86_32
-dev-libs/expat abi_x86_32
-dev-libs/glib abi_x86_32
-dev-libs/gmp abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libgcrypt abi_x86_32
-dev-libs/libgpg-error abi_x86_32
-dev-libs/libpcre abi_x86_32
-dev-libs/libpthread-stubs abi_x86_32
-dev-libs/libtasn1 abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-libs/libxslt abi_x86_32
-dev-libs/nettle abi_x86_32
-dev-libs/openssl abi_x86_32
-dev-util/pkgconfig abi_x86_32
-media-libs/alsa-lib abi_x86_32
-media-libs/fontconfig abi_x86_32
-media-libs/freetype abi_x86_32
-media-libs/glu abi_x86_32
-media-libs/lcms abi_x86_32
-media-libs/libjpeg-turbo abi_x86_32
-media-libs/libpng abi_x86_32
-media-libs/mesa abi_x86_32
-net-dns/libidn abi_x86_32
-net-libs/gnutls abi_x86_32
-sys-apps/attr abi_x86_32
-sys-apps/systemd abi_x86_32
-sys-apps/util-linux abi_x86_32
-sys-devel/flex abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-fs/udev abi_x86_32
-sys-libs/cracklib abi_x86_32
-sys-libs/libcap abi_x86_32
-sys-libs/pam abi_x86_32
-sys-libs/zlib abi_x86_32
-virtual/glu abi_x86_32
-virtual/jpeg abi_x86_32
-virtual/libffi abi_x86_32
-virtual/libiconv abi_x86_32
-virtual/libintl abi_x86_32
-virtual/libudev abi_x86_32
-virtual/opengl abi_x86_32
-virtual/pam abi_x86_32
-virtual/pkgconfig abi_x86_32
-x11-libs/libX11 abi_x86_32
-x11-libs/libXau abi_x86_32
-x11-libs/libXcomposite abi_x86_32
-x11-libs/libXcursor abi_x86_32
-x11-libs/libXdamage abi_x86_32
-x11-libs/libXdmcp abi_x86_32
-x11-libs/libXext abi_x86_32
-x11-libs/libXfixes abi_x86_32
-x11-libs/libXi abi_x86_32
-x11-libs/libXinerama abi_x86_32
-x11-libs/libXrandr abi_x86_32
-x11-libs/libXrender abi_x86_32
-x11-libs/libXxf86vm abi_x86_32
-x11-libs/libdrm abi_x86_32
-x11-libs/libxcb abi_x86_32
-x11-libs/libxshmfence abi_x86_32
-x11-proto/compositeproto abi_x86_32
-x11-proto/damageproto abi_x86_32
-x11-proto/dri2proto abi_x86_32
-x11-proto/dri3proto abi_x86_32
-x11-proto/fixesproto abi_x86_32
-x11-proto/glproto abi_x86_32
-x11-proto/inputproto abi_x86_32
-x11-proto/kbproto abi_x86_32
-x11-proto/presentproto abi_x86_32
-x11-proto/randrproto abi_x86_32
-x11-proto/renderproto abi_x86_32
-x11-proto/xcb-proto abi_x86_32
-x11-proto/xextproto abi_x86_32
-x11-proto/xf86bigfontproto abi_x86_32
-x11-proto/xf86driproto abi_x86_32
-x11-proto/xf86vidmodeproto abi_x86_32
-x11-proto/xineramaproto abi_x86_32
-x11-proto/xproto abi_x86_32
diff --git a/profiles/enlightenment/build/host-dependencies/make.defaults b/profiles/enlightenment/build/host-dependencies/make.defaults
deleted file mode 100644
index 80d96c17..00000000
--- a/profiles/enlightenment/build/host-dependencies/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ACCEPT_LICENSE="Intel-SDP"
-
-USE="osmesa xvfb"
-
-# Crypto
-USE="${USE} openssl ssl"
diff --git a/profiles/enlightenment/build/host-dependencies/package.use b/profiles/enlightenment/build/host-dependencies/package.use
deleted file mode 100644
index 72fe110a..00000000
--- a/profiles/enlightenment/build/host-dependencies/package.use
+++ /dev/null
@@ -1,103 +0,0 @@
-app-doc/doxygen clang dot latex
-
-dev-libs/beecrypt cxx threads
-dev-libs/check subunit
-
-sys-devel/llvm clang lldb xml
-
-# 07/08/2013 - beber
-# coverage-graph import Gtk*
-dev-python/matplotlib gtk
-dev-python/pygobject libffi
-dev-python/sqlalchemy sqlite mysql
-dev-python/sphinx latex
-
-dev-tex/dot2texi pgf pstricks
-
-dev-util/cppcheck htmlreport
-
-dev-vcs/git subversion cvs perl
-dev-vcs/subversion -apache2 -dso
-
-mail-mta/exim -X -gnutls -perl -pkcs11
-
-# 23/05/2015 - beber
-# REQUIRED_USE vaapi? ( staging )
-app-emulation/wine -vaapi -udisks X
-
-# 23/05/2015 - beber
-www-servers/nginx ssl nginx_modules_http_auth_pam nginx_modules_http_dav nginx_modules_http_dav_ext nginx_modules_http_gzip
-
-dev-java/icedtea -alsa -pulseaudio -nsplugin -webstart headless-awt
-dev-java/icedtea-bin -alsa -pulseaudio -nsplugin -webstart headless-awt
-
-# 08/06/2015 - beber
-# required by "dev-python/matplotlib
-# x11-libs/gtk+:3 REQUIRED_USE any-of ( aqua wayland X )
-x11-libs/gtk+ X
-
-# 08/06/2015 - beber
-# required by x11-libs/gtk+:2
-# required by x11-libs/gtk+:3
-# required by gnome-base/librsvg
-# required by x11-themes/adwaita-icon-theme
-x11-libs/cairo X
-
-# 08/06/2015 - beber
-# required by x11-libs/libva-vdpau-driver
-x11-libs/libva X
-
-# 24/06/2015 - beber
-# required by x11-libs/gtk+
-x11-libs/gdk-pixbuf X
-
-# 23/06/2015 - beber
-# required by app-text/texlive-core
-media-libs/harfbuzz icu
-
-# 21/06/2015 - beber
-# required by dev-vcs/git
-dev-vcs/subversion perl
-
-# 23/06/2015 - beber
-# required by app-doc/doxygen[latex]
-app-text/texlive extra epspdf graphics pstricks publishers science tex4ht texi2html
-# required by app-text/texlive[extra]
-app-text/texlive-core xetex extra
-
-# 18/12/2013 - beber
-# utils need any-of ( gtk gtk3 )
-# python need gdbm
-net-dns/avahi  -utils gdbm
-
-# 18/12/2013 - beber
-# net-dns/avahi says
-# configure: error: Could not find Python module gdbm
-dev-lang/python gdbm
-
-# 18/12/2013 - beber
-# required by dev-lang/python[gdbm]
-sys-libs/gdbm berkdb
-
-# 08/05.2015 - beber
-# Redice www-client/arcanist dependencies
-app-eselect/eselect-php -apache2 -fpm
-dev-lang/php -apache2 -fpm
-
-# 22/11/2015 - beber
-# required by dev-java/icedtea
-# required by net-print/cups
-app-text/ghostscript-gpl cups
-
-# 08/01/2016 - beber
-app-text/xmlto text
-
-# 13/08/2016 - beber
-# required by sys-devel/autogen
-dev-libs/boehm-gc threads
-
-# 12/09/2016 - beber
-# After cedric request, replace sys-fs/udev with sys-apps/systemd
-sys-apps/dbus systemd
-virtual/libudev systemd
-virtual/udev systemd
diff --git a/profiles/enlightenment/build/host-dependencies/eapi b/profiles/enlightenment/build/native/eapi
index 7ed6ff82..7ed6ff82 100644
--- a/profiles/enlightenment/build/host-dependencies/eapi
+++ b/profiles/enlightenment/build/native/eapi
diff --git a/profiles/enlightenment/build/build-dependencies/make.defaults b/profiles/enlightenment/build/native/make.defaults
index 34eeffbb..8e15a4a9 100644
--- a/profiles/enlightenment/build/build-dependencies/make.defaults
+++ b/profiles/enlightenment/build/native/make.defaults
@@ -1,3 +1,5 @@
+ACCEPT_LICENSE="Intel-SDP"
+
 # Arithmetic
 USE="gmp mpfr"
 
@@ -16,7 +18,7 @@ USE="${USE} perl python ruby"
 USE="${USE} directfb egl fbcon gbm gles gles2 libkms opengl sdl vaapi vdpau wayland X xcb xnest"
 
 # X11 features
-USE="${USE} dga dmx dri3 kdrive ggi openvg openmax xa xft xinerama xkb xorg xprint xscreensaver xv xvmc"
+USE="${USE} dga dmx dri3 kdrive ggi osmesa openvg openmax xa xft xinerama xkb xorg xprint xscreensaver xv xvfb xvmc"
 
 # Input
 USE="${USE} tslib"
diff --git a/profiles/enlightenment/build/build-dependencies/package.accept_keywords b/profiles/enlightenment/build/native/package.accept_keywords
index f27bae13..f27bae13 100644
--- a/profiles/enlightenment/build/build-dependencies/package.accept_keywords
+++ b/profiles/enlightenment/build/native/package.accept_keywords
diff --git a/profiles/enlightenment/build/build-dependencies/package.use b/profiles/enlightenment/build/native/package.use
index a7a1f628..4444575c 100644
--- a/profiles/enlightenment/build/build-dependencies/package.use
+++ b/profiles/enlightenment/build/native/package.use
@@ -1,7 +1,55 @@
+app-doc/doxygen clang dot latex
+
+# 22/11/2015 - beber
+# required by dev-java/icedtea
+# required by net-print/cups
+app-text/ghostscript-gpl cups
+
+# 23/06/2015 - beber
+# required by app-doc/doxygen[latex]
+app-text/texlive extra epspdf graphics pstricks publishers science tex4ht texi2html
+# required by app-text/texlive[extra]
+app-text/texlive-core xetex extra
+
+# 08/01/2016 - beber
+app-text/xmlto text
+
+# 08/05.2015 - beber
+# Reduce www-client/arcanist dependencies
+app-eselect/eselect-php -apache2 -fpm
+dev-lang/php -apache2 -fpm
+
+# 18/12/2013 - beber
+# net-dns/avahi says
+# configure: error: Could not find Python module gdbm
+dev-lang/python gdbm
+
+dev-libs/beecrypt cxx threads
+dev-libs/check subunit
 dev-libs/gobject-introspection doctool
 dev-libs/m17n-lib libxml2
 dev-libs/ppl lpsol
 
+# 13/08/2016 - beber
+# required by sys-devel/autogen
+dev-libs/boehm-gc threads
+
+# 07/08/2013 - beber
+# coverage-graph import Gtk*
+dev-python/matplotlib gtk
+dev-python/pygobject libffi
+dev-python/sqlalchemy sqlite mysql
+dev-python/sphinx latex
+
+dev-tex/dot2texi pgf pstricks
+
+dev-util/cppcheck htmlreport
+
+dev-vcs/git subversion cvs perl
+# 21/06/2015 - beber
+# required by dev-vcs/git
+dev-vcs/subversion perl -apache2 -dso
+
 gnome-base/gconf gtk
 
 media-gfx/exiv2 xmp
@@ -10,6 +58,10 @@ media-gfx/imagemagick graphviz postscript fpx hdri lqr openexr pango autotrace f
 media-gfx/ufraw contrast fits timezone
 media-gfx/pstoedit imagemagick emf plotutils flash
 
+# 23/06/2015 - beber
+# required by app-text/texlive-core
+media-libs/harfbuzz icu
+
 media-libs/libaacplus fftw
 media-libs/libbluray static-libs
 # 25/05/2013 - bebr
@@ -27,6 +79,11 @@ media-libs/xine-lib mad imagemagick
 media-video/ffmpeg openal threads frei0r
 media-video/vlc -atmo sdl-image shout taglib zvbi omxil
 
+# 18/12/2013 - beber
+# utils need any-of ( gtk gtk3 )
+# python need gdbm
+net-dns/avahi  -utils gdbm
+
 net-libs/gnutls guile
 
 net-misc/connman -wifi
@@ -45,11 +102,16 @@ sys-apps/hwloc plugins
 sys-apps/iproute2 iptables
 
 sys-devel/gcc fortran objc objc++ objc-gc go graphite
+sys-devel/llvm clang lldb xml
 
 # 07/06/2013 - beber
 # sys-fs/cryptsetup want one-of gcrypt openssl nettle kernel
 sys-fs/cryptsetup gcrypt -openssl -kernel
 
+# 18/12/2013 - beber
+# required by dev-lang/python[gdbm]
+sys-libs/gdbm berkdb
+
 sys-libs/glibc -gd
 sys-libs/zlib minizip
 
@@ -80,8 +142,8 @@ app-editors/vim -X -perl -python -ruby
 media-libs/libcanberra gtk3
 
 # 07/08/2015 - beber
-dev-java/icedtea -alsa -pulseaudio headless-awt
-dev-java/icedtea-bin -alsa -pulseaudio headless-awt
+dev-java/icedtea -alsa -pulseaudio -nsplugin -webstart headless-awt
+dev-java/icedtea-bin -alsa -pulseaudio -nsplugin -webstart headless-awt
 
 # 07/08/2015 - beber
 net-analyzer/net-snmp -X -perl -python
@@ -100,3 +162,32 @@ sys-apps/openrc -unicode
 # 15/12/2016 - beber
 # Pending https://bugs.gentoo.org/show_bug.cgi?id=601902
 media-libs/libcaca -ruby
+
+# 08/06/2015 - beber
+# required by x11-libs/gtk+:2
+# required by x11-libs/gtk+:3
+# required by gnome-base/librsvg
+# required by x11-themes/adwaita-icon-theme
+x11-libs/cairo X
+
+# 24/06/2015 - beber
+# required by x11-libs/gtk+
+x11-libs/gdk-pixbuf X
+
+# 08/06/2015 - beber
+# required by "dev-python/matplotlib
+# x11-libs/gtk+:3 REQUIRED_USE any-of ( aqua wayland X )
+x11-libs/gtk+ X
+
+# 08/06/2015 - beber
+# required by x11-libs/libva-vdpau-driver
+x11-libs/libva X
+
+# 23/05/2015 - beber
+www-servers/nginx ssl nginx_modules_http_auth_pam nginx_modules_http_dav nginx_modules_http_dav_ext nginx_modules_http_gzip
+
+# 12/09/2016 - beber
+# After cedric request, replace sys-fs/udev with sys-apps/systemd
+sys-apps/dbus systemd
+virtual/libudev systemd
+virtual/udev systemd
diff --git a/profiles/enlightenment/build/host-dependencies/packages b/profiles/enlightenment/build/native/packages
index 28ba8d5a..519d12dd 100644
--- a/profiles/enlightenment/build/host-dependencies/packages
+++ b/profiles/enlightenment/build/native/packages
@@ -1,5 +1,17 @@
+# 12/08/2014 - beber
+*app-arch/lz4
+
 *app-doc/doxygen
 
+*app-i18n/ibus
+*app-i18n/scim
+
+*app-text/libspectre
+*app-text/sloccount
+
+*dev-vcs/gitstats
+*dev-vcs/git_stats
+
 # Jenkins slaves need java
 *dev-java/icedtea:8
 
@@ -9,9 +21,24 @@
 *dev-lang/pcc
 *dev-lang/tcc
 
+# 20/01/2014 - beber
+# Ask from Stefan Schmidt
+# EFL dependency
+*dev-lang/luajit:2
+
 *dev-libs/check
 
 *dev-python/cython
+*dev-python/dbus-python
+
+# 06/08/2013 - beber
+# Needed for
+# http://git.enlightenment.org/devs/asdfuser/tools/coverage-graph.git
+*dev-python/matplotlib
+
+# 23/06/2013 - beber
+# Build python bindings docs
+*dev-python/sphinx
 
 *dev-util/ccache
 *dev-util/cmake
@@ -20,16 +47,14 @@
 *dev-util/lcov
 *dev-util/valgrind
 
-# 06/08/2013 - beber
-# Needed for http://git.enlightenment.org/devs/asdfuser/tools/coverage-graph.git
-*dev-python/matplotlib
-
-# 23/06/2013 - beber
-# Build python bindings docs
-*dev-python/sphinx
+# 21/11/2013 - beber
+# Ask from Stefan Schmidt
+# Coverity.com scan tools
+*dev-util/coverity
 
-*dev-vcs/gitstats
-*dev-vcs/git_stats
+# 20/03/2014 - beber
+# Thread [E-devel] ABI/API checking for the EFL
+*dev-util/abi-compliance-checker
 
 # 07/06/2013 - beber
 # As per tasn request
@@ -39,6 +64,25 @@
 # Needed for xkcd matplotlib style
 *media-fonts/Humor-Sans
 
+*media-libs/gst-plugins-good
+*media-libs/libcanberra
+*media-libs/libraw
+
+*media-video/vlc
+
+# 23/06/2015 - beber
+*net-dns/avahi
+
+*net-dns/c-ares
+
+*net-misc/connman
+
+# 28/03/2014 - beber
+# Needed by dev-java/icedtea
+*net-misc/wget
+
+*sci-physics/bullet
+
 *sys-devel/clang
 *sys-devel/gcc
 *sys-devel/gcc:4.9.3
@@ -46,44 +90,54 @@
 *sys-devel/gcc:5.4.0
 *sys-devel/gdb
 
+*sys-fs/udisks
+*sys-fs/udisks:0
+
 # 07/01/2016 - beber
 # Needed by sys-devel/clang
 *sys-libs/libomp
 
+*sys-power/upower
+
 *x11-apps/xauth
 
 *x11-base/xorg-server
 
-# 21/11/2013 - beber
-# Ask from Stefan Schmidt
-# Coverity.com scan tools
-*dev-util/coverity
+*x11-libs/libXScrnSaver
 
-# 20/03/2014 - beber
-# Thread [E-devel] ABI/API checking for the EFL
-*dev-util/abi-compliance-checker
+# 12/12/2013 - beber
+# Needed by Webkit EFL
+*net-libs/libsoup
 
-# 28/03/2014 - beber
-# Needed by dev-java/icedtea
-*net-misc/wget
+# 25/01/2015 - beber
+# As per request on Tue, 30 Dec 2014 10:44:19 +0100 from stefan
+*app-misc/geoclue:0
+*app-misc/geoclue:2.0
 
-# 12/08/2014 - beber
-*app-arch/lz4
+# 12/02/2015 - beber
+# As per request on Thu, 12 Feb 2015 12:43:35 +0000 from stefan
+*dev-libs/libinput
+
+# 07/06/2013 - beber
+# As per tasn request for exactness FDO
+*x11-themes/gnome-icon-theme
+*x11-themes/gnome-icon-theme-extras
+*x11-themes/gnome-icon-theme-symbolic
+*x11-themes/hicolor-icon-theme
+*x11-themes/tango-icon-theme
+*x11-themes/tango-icon-theme-extras
+
+# 13/02/2016 - beber
+# As per stefan request to avoid bitrooting
+*dev-libs/hyphen
+*x11-libs/libXpresent
+
+# 08/05/2015 - beber
+# Needed for phab/jenkins integration
+*www-client/arcanist
 
 # 27/04/2015 - beber
 # As per request on Tue, 21 Apr 2015 15:04:09 +0530 from srihebbar
 *net-ftp/vsftpd
 *www-servers/nginx
 *sys-auth/pam_pwdfile
-
-# 23/06/2015 - beber
-*net-dns/avahi
-
-# 20/01/2014 - beber
-# Ask from Stefan Schmidt
-# EFL dependency
-*dev-lang/luajit:2
-
-# 08/05/2015 - beber
-# Needed for phab/jenkins integration
-*www-client/arcanist
diff --git a/profiles/enlightenment/build/native/parent b/profiles/enlightenment/build/native/parent
index 52798534..7854390d 100644
--- a/profiles/enlightenment/build/native/parent
+++ b/profiles/enlightenment/build/native/parent
@@ -1,4 +1,2 @@
 ../../../server/kvm
 ..
-../host-dependencies
-../build-dependencies