move efl-1.13.0-r1 to efl-1.13.0-r1

3 files changed, 2 insertions, 290 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index a6fd7bd..26094cd 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -3,5 +3,4 @@ DIST efl-1.12.2-lauch_via_logind_or_root_privilege.patch.xz 6276 SHA256 9af4e2cc
 DIST efl-1.12.3.tar.bz2 46810649 SHA256 e6ca2fb1ce85625fe6106184a85320eed1ab6f3c0111bc0406af1c86453e7489 SHA512 4f76f27c73f4f7a515c703508def65044b80114133e97f2d2b624c1b5ac5d33c06eb9fa95892619676039514a5f561c312e6bc320acb3085453eadef7657a101 WHIRLPOOL 5cf46969d69f228df578842855126e7f5003ede44953b1e0465610dd77a22c50063a35a4f8da06df09f563c5e1b714b943e4033ef00a6c460878df22b2c778ab
 DIST efl-1.13.0.tar.xz 39976920 SHA256 d848da426152c12ff7fd38913d8e600f1e3f5cab1a12499d0d7a80e806632c92 SHA512 222f0ac0e7d64a46d1bf64e6dd5b7bee87b958ba1865be2d673069b3074d4e40fc8845b1ce70605d69978d588630e63602b009c65b52f802820f9227e11660fd WHIRLPOOL 2129bb58f598d5c5b86202f710884a40f517a2ed5778fd2d9d3b6e49a2bd05cbdf976eabfc3cabce6ec5bdef5c8932bfd2bbd662c922c75119978e2bb35262ef
 EBUILD efl-1.12.3.ebuild 6832 SHA256 e655add579e6c95f8761a5cf9113f03a11d1d16704a6b59d615a644ffb15aad5 SHA512 17464c4b0b71dff06f53c08d2bb5ece2e47775b13b45f585d2f8df5810b6b512e7e3b8303dbe28811756767c91493f9bd5505ef00169eef16b72cf2984340b30 WHIRLPOOL e3d15f70557639a391a7392dbee29d952f2e68e01b51be4e0d6ea7502b2ce2ffcae30cfcaaacee1b33345eded0c95bf9dfa5d13992660e083ec7528e0c51dbef
-EBUILD efl-1.13.0-r1.ebuild 6817 SHA256 979ac0ed3467fc14bf8f02aebbd52f73efb44a00aaf2c415ba14d7348bdd9a0d SHA512 25e15af3485bf3d06c62f07033a7c1fa6e0a94356af131e6cc8d0b64e0f83d139c7fe92970515a1febf04da194c62c6317521f8cb854c97e5641d869d3f385e5 WHIRLPOOL ddf8229912368233fbe1a21950bec07258887ec79ddd8365432944ab5a71a140b21a962b62c549e7c63aa83040219255a5683bab25534c4ec318ad5eed1447e9
-EBUILD efl-1.13.0.ebuild 6757 SHA256 bbce2685554ea84e15b45925c75d768e173a90c12caf33efc51bb17b025dcd31 SHA512 3e9d38f561603797450412eee3b431e6c28a906618e925242450c1678198c0fae93df57fc6ce0ac1dd475a2d3b3a86bb5c2e924edcf08d2fe8469bfef2b087be WHIRLPOOL 7ec1245a5113ce351e10d247cf387c66f90ce084d07ec9fb5cafd719d0c9481a602ea81ee85ecb10d9dacb4661b79c5538aae46baa604514d24b616b861bf20f
+EBUILD efl-1.13.0.ebuild 6817 SHA256 979ac0ed3467fc14bf8f02aebbd52f73efb44a00aaf2c415ba14d7348bdd9a0d SHA512 25e15af3485bf3d06c62f07033a7c1fa6e0a94356af131e6cc8d0b64e0f83d139c7fe92970515a1febf04da194c62c6317521f8cb854c97e5641d869d3f385e5 WHIRLPOOL ddf8229912368233fbe1a21950bec07258887ec79ddd8365432944ab5a71a140b21a962b62c549e7c63aa83040219255a5683bab25534c4ec318ad5eed1447e9
diff --git a/dev-libs/efl/efl-1.13.0-r1.ebuild b/dev-libs/efl/efl-1.13.0-r1.ebuild
deleted file mode 100644
index be8c426..0000000
--- a/dev-libs/efl/efl-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.12.2.ebuild,v 1.3 2014/12/28 14:28:23 tommy Exp $
-
-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="http://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-	EKEY_STATE="snap"
-else
-	SRC_URI="http://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	EKEY_STATE="snap"
-fi
-
-SRC_URI="${SRC_URI} mirror://gentoo/efl-1.12.2-lauch_via_logind_or_root_privilege.patch.xz"
-
-inherit autotools enlightenment
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 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="
-	debug? ( dev-util/valgrind )
-	drm? ( >=x11-libs/libxkbcommon-0.3.0 )
-	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:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
-	!oldlua? ( >=dev-lang/luajit-2.0.0 )
-	oldlua? ( dev-lang/lua )
-	physics? ( >=sci-physics/bullet-2.80 )
-	pixman? ( x11-libs/pixman )
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	scim?	( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff )
-	tslib? ( x11-libs/tslib )
-	wayland? (
-		>=dev-libs/wayland-1.3.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/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
-
-	!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
-"
-#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() {
-  ! use systemd && epatch "${FILESDIR}"/efl-no-logind.patch
-	eautoreconf
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	use ssl && use gnutls && {
-		einfo "You enabled both USEssl and USE=gnutls, but only one can be used"
-		einfo "gnutls has been selected for you"
-	}
-	use opengl && use gles && {
-		einfo "You enabled both USE=opengl and USE=gles, but only one can be used"
-		einfo "opengl has been selected for you"
-	}
-
-	local profile="release"
-
-	use debug && profile="debug"
-
-	local crypto="none"
-
-	use gnutls && crypto="gnutls"
-	use ssl && crypto="openssl"
-
-	local x11="none"
-	local enable_graphics=""
-
-	use X && x11="xlib"
-
-	local MY_ECONF
-	 use X && MY_ECONF+=" --with-x"
-
-	local opengl="none"
-
-	use gles && opengl="es"
-	use opengl && opengl="full"
-
-	local glib="no"
-
-	use glib && glib="yes"
-
-	MY_ECONF+="
-	--with-profile=${profile}
-	--with-crypto=${crypto}
-	--with-x11=${x11}
-	--with-opengl=${opengl}
-	--with-glib=${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-aba
-
-	$(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 jp2k 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 ppm image-loader-pmaps)
-	$(use_enable psd image-loader-psd)
-	$(use_enable pulseaudio)
-	$(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 v4l2)
-	$(use_enable wayland)
-	$(use_enable webp image-loader-webp)
-	$(use_enable xim)
-	$(use_enable xine)
-	$(use_enable xpm image-loader-xpm)
-	--enable-cserve
-	--enable-gui
-	--enable-image-loader-generic
-	--enable-image-loader-jpeg
-
-	--disable-tizen
-	--disable-gesture
-	--disable-gstreamer
-	--enable-xinput2
-	--disable-xinput22
-	--disable-multisense
-	--enable-libmount
-	"
-# external lz4 support currently broken because of unstable ABI/API
-#	--enable-liblz4
-
-	enlightenment_src_configure
-}
-
-src_compile() {
-	ewarn "If the following compile phase fails with a message including"
-	ewarn "lib/edje/.libs/libedje.so: undefined reference to 'eet_mmap'"
-	ewarn "then most likely the @preserved-rebuild feature of portage"
-	ewarn "preserved the 1.7 libraries, which cause the build failure."
-	ewarn "As a workaround, either remove those libs manually or"
-	ewarn "uninstall all packages still using those old libs with"
-	ewarn "emerge -aC @preserved-rebuild"
-
-	enlightenment_src_compile
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-
-	enlightenment_src_install
-}
diff --git a/dev-libs/efl/efl-1.13.0.ebuild b/dev-libs/efl/efl-1.13.0.ebuild
index 1eca072..be8c426 100644
--- a/dev-libs/efl/efl-1.13.0.ebuild
+++ b/dev-libs/efl/efl-1.13.0.ebuild
@@ -158,6 +158,7 @@ DEPEND="
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+  ! use systemd && epatch "${FILESDIR}"/efl-no-logind.patch
 	eautoreconf
 	enlightenment_src_prepare
 }