dev-libs/efl: remove last-rited version 1.17.0-r1
authorJoonas Niilola <juippis@gmail.com>
Thu, 30 Aug 2018 12:47:21 +0000 (15:47 +0300)
committerMichał Górny <mgorny@gentoo.org>
Thu, 30 Aug 2018 15:04:23 +0000 (17:04 +0200)
Closes: https://bugs.gentoo.org/662510
Package-Manager: Portage[mgorny]-2.3.43.3

dev-libs/efl/Manifest
dev-libs/efl/efl-1.17.0-r1.ebuild [deleted file]
dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch [deleted file]

index 7c3174cf23a3df8d437e5359c069fefc9441e64c..b771e209b28dead8f37d188999998e4486e6ad83 100644 (file)
@@ -1,4 +1,3 @@
-DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da
 DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild
deleted file mode 100644 (file)
index 9ab0e9d..0000000
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-       EKEY_STATE="snap"
-else
-       SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-       EKEY_STATE="release"
-fi
-
-inherit enlightenment pax-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-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 +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-REQUIRED_USE="
-       pulseaudio?     ( sound )
-       opengl?         ( || ( X sdl wayland ) )
-       gles?           ( || ( X wayland ) )
-       gles?           ( !sdl )
-       gles?           ( egl )
-       sdl?            ( opengl )
-       wayland?        ( egl !opengl gles )
-       xim?            ( X )
-"
-
-RDEPEND="
-       drm? (
-               >=dev-libs/libinput-0.8
-               media-libs/mesa[gbm]
-               >=x11-libs/libdrm-2.4
-               >=x11-libs/libxkbcommon-0.3.0
-       )
-       fontconfig? ( media-libs/fontconfig )
-       fribidi? ( dev-libs/fribidi )
-       gif? ( media-libs/giflib )
-       glib? ( dev-libs/glib:2 )
-       gnutls? ( net-libs/gnutls )
-       !gnutls? (
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       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 )
-       !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:0= )
-       tslib? ( x11-libs/tslib )
-       unwind? ( sys-libs/libunwind )
-       valgrind? ( dev-util/valgrind )
-       wayland? (
-               >=dev-libs/wayland-1.8.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/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/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() {
-       enlightenment_src_prepare
-
-       epatch "${FILESDIR}/${P}-gnutls-3.4.patch"
-
-       # 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
-
-       # Upstream doesn't offer a configure flag. #611108
-       if ! use unwind ; then
-               sed -i \
-                       -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-                       configure || die
-       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."
-       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."
-       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
-
-               $(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 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 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 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)
-               --enable-cserve
-               --enable-image-loader-generic
-               --enable-image-loader-jpeg
-
-               --disable-tizen
-               --disable-gesture
-               --disable-gstreamer
-               --enable-xinput2
-               --disable-xinput22
-               --enable-libmount
-
-               # external lz4 support currently broken because of unstable ABI/API
-               #--enable-liblz4
-       )
-
-       enlightenment_src_configure
-}
-
-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_install() {
-       MAKEOPTS+=" -j1"
-
-       enlightenment_src_install
-}
diff --git a/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch b/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch
deleted file mode 100644 (file)
index 6c5f8eb..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6f42992b4f1110f44d2db57cd6fe42559cfffdc2 Mon Sep 17 00:00:00 2001
-From: Cedric BAIL <cedric@osg.samsung.com>
-Date: Wed, 21 Sep 2016 10:33:44 -0700
-Subject: [PATCH] eet: fix gnutls support with newer version.
-
----
- src/lib/eet/eet_cipher.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
-index a34fdff..cf9ef71 100644
---- a/src/lib/eet/eet_cipher.c
-+++ b/src/lib/eet/eet_cipher.c
-@@ -679,7 +679,6 @@ eet_identity_check(const void   *data_base,
-    gnutls_datum_t datum;
-    gnutls_datum_t signature;
-    gnutls_pubkey_t pubkey;
--   gnutls_digest_algorithm_t hash_algo;
-    unsigned char *hash;
-    gcry_md_hd_t md;
-    int err;
-@@ -717,10 +716,10 @@ eet_identity_check(const void   *data_base,
-    if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0)
-      goto on_error;
--   if (gnutls_pubkey_get_verify_algorithm(pubkey, &signature, &hash_algo) < 0)
--     goto on_error;
--
--   if (gnutls_pubkey_verify_hash(pubkey, 0, &datum, &signature) < 0)
-+   if (gnutls_pubkey_verify_hash2(pubkey,
-+                                  gnutls_x509_crt_get_signature_algorithm(cert),
-+                                  0,
-+                                  &datum, &signature) < 0)
-      goto on_error;
-    if (sha1)
--- 
-2.10.2
-