| 1 |
commit: bd2ec3eedc2089e0f3b08aa00e25ed37cf26db93 |
| 2 |
Author: Joonas Niilola <juippis <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Aug 30 12:47:21 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 30 15:04:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2ec3ee |
| 7 |
|
| 8 |
dev-libs/efl: remove last-rited version 1.17.0-r1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/662510 |
| 11 |
Package-Manager: Portage[mgorny]-2.3.43.3 |
| 12 |
|
| 13 |
dev-libs/efl/Manifest | 1 - |
| 14 |
dev-libs/efl/efl-1.17.0-r1.ebuild | 285 ------------------------- |
| 15 |
dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch | 39 ---- |
| 16 |
3 files changed, 325 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest |
| 19 |
index 7c3174cf23a..b771e209b28 100644 |
| 20 |
--- a/dev-libs/efl/Manifest |
| 21 |
+++ b/dev-libs/efl/Manifest |
| 22 |
@@ -1,4 +1,3 @@ |
| 23 |
-DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da |
| 24 |
DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9 |
| 25 |
DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de |
| 26 |
DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789 |
| 27 |
|
| 28 |
diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 9ab0e9d1a1e..00000000000 |
| 31 |
--- a/dev-libs/efl/efl-1.17.0-r1.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,285 +0,0 @@ |
| 34 |
-# Copyright 1999-2018 Gentoo Foundation |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI="5" |
| 38 |
- |
| 39 |
-MY_P=${P/_/-} |
| 40 |
- |
| 41 |
-if [[ "${PV}" == "9999" ]] ; then |
| 42 |
- EGIT_SUB_PROJECT="core" |
| 43 |
- EGIT_URI_APPEND="${PN}" |
| 44 |
-elif [[ *"${PV}" == *"_pre"* ]] ; then |
| 45 |
- MY_P=${P%%_*} |
| 46 |
- SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz" |
| 47 |
- EKEY_STATE="snap" |
| 48 |
-else |
| 49 |
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz" |
| 50 |
- EKEY_STATE="release" |
| 51 |
-fi |
| 52 |
- |
| 53 |
-inherit enlightenment pax-utils |
| 54 |
- |
| 55 |
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" |
| 56 |
- |
| 57 |
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" |
| 58 |
-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" |
| 59 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 60 |
- |
| 61 |
-REQUIRED_USE=" |
| 62 |
- pulseaudio? ( sound ) |
| 63 |
- opengl? ( || ( X sdl wayland ) ) |
| 64 |
- gles? ( || ( X wayland ) ) |
| 65 |
- gles? ( !sdl ) |
| 66 |
- gles? ( egl ) |
| 67 |
- sdl? ( opengl ) |
| 68 |
- wayland? ( egl !opengl gles ) |
| 69 |
- xim? ( X ) |
| 70 |
-" |
| 71 |
- |
| 72 |
-RDEPEND=" |
| 73 |
- drm? ( |
| 74 |
- >=dev-libs/libinput-0.8 |
| 75 |
- media-libs/mesa[gbm] |
| 76 |
- >=x11-libs/libdrm-2.4 |
| 77 |
- >=x11-libs/libxkbcommon-0.3.0 |
| 78 |
- ) |
| 79 |
- fontconfig? ( media-libs/fontconfig ) |
| 80 |
- fribidi? ( dev-libs/fribidi ) |
| 81 |
- gif? ( media-libs/giflib ) |
| 82 |
- glib? ( dev-libs/glib:2 ) |
| 83 |
- gnutls? ( net-libs/gnutls ) |
| 84 |
- !gnutls? ( |
| 85 |
- ssl? ( |
| 86 |
- !libressl? ( dev-libs/openssl:0= ) |
| 87 |
- libressl? ( dev-libs/libressl ) |
| 88 |
- ) |
| 89 |
- ) |
| 90 |
- gstreamer? ( |
| 91 |
- media-libs/gstreamer:1.0 |
| 92 |
- media-libs/gst-plugins-base:1.0 |
| 93 |
- ) |
| 94 |
- harfbuzz? ( media-libs/harfbuzz ) |
| 95 |
- ibus? ( app-i18n/ibus ) |
| 96 |
- jpeg2k? ( media-libs/openjpeg:0 ) |
| 97 |
- !oldlua? ( >=dev-lang/luajit-2.0.0 ) |
| 98 |
- oldlua? ( dev-lang/lua:* ) |
| 99 |
- physics? ( >=sci-physics/bullet-2.80 ) |
| 100 |
- pixman? ( x11-libs/pixman ) |
| 101 |
- png? ( media-libs/libpng:0= ) |
| 102 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 103 |
- scim? ( app-i18n/scim ) |
| 104 |
- sdl? ( |
| 105 |
- media-libs/libsdl2 |
| 106 |
- virtual/opengl |
| 107 |
- ) |
| 108 |
- sound? ( media-libs/libsndfile ) |
| 109 |
- systemd? ( sys-apps/systemd ) |
| 110 |
- tiff? ( media-libs/tiff:0= ) |
| 111 |
- tslib? ( x11-libs/tslib ) |
| 112 |
- unwind? ( sys-libs/libunwind ) |
| 113 |
- valgrind? ( dev-util/valgrind ) |
| 114 |
- wayland? ( |
| 115 |
- >=dev-libs/wayland-1.8.0 |
| 116 |
- >=x11-libs/libxkbcommon-0.3.1 |
| 117 |
- media-libs/mesa[gles2,wayland] |
| 118 |
- ) |
| 119 |
- webp? ( media-libs/libwebp ) |
| 120 |
- X? ( |
| 121 |
- x11-libs/libXcursor |
| 122 |
- x11-libs/libX11 |
| 123 |
- x11-libs/libXcomposite |
| 124 |
- x11-libs/libXdamage |
| 125 |
- x11-libs/libXext |
| 126 |
- x11-libs/libXfixes |
| 127 |
- x11-libs/libXinerama |
| 128 |
- x11-libs/libXrandr |
| 129 |
- x11-libs/libXrender |
| 130 |
- x11-libs/libXtst |
| 131 |
- x11-libs/libXScrnSaver |
| 132 |
- |
| 133 |
- opengl? ( |
| 134 |
- x11-libs/libX11 |
| 135 |
- x11-libs/libXrender |
| 136 |
- virtual/opengl |
| 137 |
- ) |
| 138 |
- |
| 139 |
- gles? ( |
| 140 |
- x11-libs/libX11 |
| 141 |
- x11-libs/libXrender |
| 142 |
- virtual/opengl |
| 143 |
- ) |
| 144 |
- ) |
| 145 |
- xine? ( >=media-libs/xine-lib-1.1.1 ) |
| 146 |
- xpm? ( x11-libs/libXpm ) |
| 147 |
- |
| 148 |
- sys-apps/dbus |
| 149 |
- >=sys-apps/util-linux-2.20.0 |
| 150 |
- sys-libs/zlib |
| 151 |
- virtual/jpeg:0= |
| 152 |
- |
| 153 |
- !dev-libs/ecore |
| 154 |
- !dev-libs/edbus |
| 155 |
- !dev-libs/eet |
| 156 |
- !dev-libs/eeze |
| 157 |
- !dev-libs/efreet |
| 158 |
- !dev-libs/eina |
| 159 |
- !dev-libs/eio |
| 160 |
- !dev-libs/embryo |
| 161 |
- !dev-libs/eobj |
| 162 |
- !dev-libs/ephysics |
| 163 |
- !media-libs/edje |
| 164 |
- !media-libs/emotion |
| 165 |
- !media-libs/ethumb |
| 166 |
- !media-libs/evas |
| 167 |
-" |
| 168 |
-#external lz4 support currently broken because of unstable ABI/API |
| 169 |
-# app-arch/lz4 |
| 170 |
- |
| 171 |
-#soft blockers added above for binpkg users |
| 172 |
-#hard blocks are needed for building |
| 173 |
-CORE_EFL_CONFLICTS=" |
| 174 |
- !!dev-libs/ecore |
| 175 |
- !!dev-libs/edbus |
| 176 |
- !!dev-libs/eet |
| 177 |
- !!dev-libs/eeze |
| 178 |
- !!dev-libs/efreet |
| 179 |
- !!dev-libs/eina |
| 180 |
- !!dev-libs/eio |
| 181 |
- !!dev-libs/embryo |
| 182 |
- !!dev-libs/eobj |
| 183 |
- !!dev-libs/ephysics |
| 184 |
- !!media-libs/edje |
| 185 |
- !!media-libs/emotion |
| 186 |
- !!media-libs/ethumb |
| 187 |
- !!media-libs/evas |
| 188 |
-" |
| 189 |
- |
| 190 |
-DEPEND=" |
| 191 |
- ${CORE_EFL_CONFLICTS} |
| 192 |
- |
| 193 |
- ${RDEPEND} |
| 194 |
- doc? ( app-doc/doxygen ) |
| 195 |
-" |
| 196 |
- |
| 197 |
-S=${WORKDIR}/${MY_P} |
| 198 |
- |
| 199 |
-src_prepare() { |
| 200 |
- enlightenment_src_prepare |
| 201 |
- |
| 202 |
- epatch "${FILESDIR}/${P}-gnutls-3.4.patch" |
| 203 |
- |
| 204 |
- # Remove stupid sleep command. |
| 205 |
- # Also back out gnu make hack that causes regen of Makefiles. |
| 206 |
- # Delete var setting that causes the build to abort. |
| 207 |
- sed -i \ |
| 208 |
- -e '/sleep 10/d' \ |
| 209 |
- -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \ |
| 210 |
- -e '/BARF_OK=/s:=.*:=:' \ |
| 211 |
- configure || die |
| 212 |
- |
| 213 |
- # Upstream doesn't offer a configure flag. #611108 |
| 214 |
- if ! use unwind ; then |
| 215 |
- sed -i \ |
| 216 |
- -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \ |
| 217 |
- configure || die |
| 218 |
- fi |
| 219 |
-} |
| 220 |
- |
| 221 |
-src_configure() { |
| 222 |
- if use ssl && use gnutls ; then |
| 223 |
- einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;" |
| 224 |
- einfo "gnutls has been selected for you." |
| 225 |
- fi |
| 226 |
- if use opengl && use gles ; then |
| 227 |
- einfo "You enabled both USE=opengl and USE=gles, but only one can be used;" |
| 228 |
- einfo "opengl has been selected for you." |
| 229 |
- fi |
| 230 |
- |
| 231 |
- E_ECONF=( |
| 232 |
- --with-profile=$(usex debug debug release) |
| 233 |
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none)) |
| 234 |
- --with-x11=$(usex X xlib none) |
| 235 |
- $(use_with X x) |
| 236 |
- --with-opengl=$(usex opengl full $(usex gles es none)) |
| 237 |
- --with-glib=$(usex glib) |
| 238 |
- --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 |
| 239 |
- |
| 240 |
- $(use_enable bmp image-loader-bmp) |
| 241 |
- $(use_enable bmp image-loader-wbmp) |
| 242 |
- $(use_enable drm) |
| 243 |
- $(use_enable doc) |
| 244 |
- $(use_enable eet image-loader-eet) |
| 245 |
- $(use_enable egl) |
| 246 |
- $(use_enable fbcon fb) |
| 247 |
- $(use_enable fontconfig) |
| 248 |
- $(use_enable fribidi) |
| 249 |
- $(use_enable gif image-loader-gif) |
| 250 |
- $(use_enable gstreamer gstreamer1) |
| 251 |
- $(use_enable harfbuzz) |
| 252 |
- $(use_enable ico image-loader-ico) |
| 253 |
- $(use_enable ibus) |
| 254 |
- $(use_enable jpeg2k image-loader-jp2k) |
| 255 |
- $(use_enable neon) |
| 256 |
- $(use_enable nls) |
| 257 |
- $(use_enable oldlua lua-old) |
| 258 |
- $(use_enable physics) |
| 259 |
- $(use_enable pixman) |
| 260 |
- $(use_enable pixman pixman-font) |
| 261 |
- $(use_enable pixman pixman-rect) |
| 262 |
- $(use_enable pixman pixman-line) |
| 263 |
- $(use_enable pixman pixman-poly) |
| 264 |
- $(use_enable pixman pixman-image) |
| 265 |
- $(use_enable pixman pixman-image-scale-sample) |
| 266 |
- $(use_enable png image-loader-png) |
| 267 |
- $(use_enable ppm image-loader-pmaps) |
| 268 |
- $(use_enable psd image-loader-psd) |
| 269 |
- $(use_enable pulseaudio) |
| 270 |
- $(use_enable scim) |
| 271 |
- $(use_enable sdl) |
| 272 |
- $(use_enable sound audio) |
| 273 |
- $(use_enable systemd) |
| 274 |
- $(use_enable tga image-loader-tga) |
| 275 |
- $(use_enable tiff image-loader-tiff) |
| 276 |
- $(use_enable tslib) |
| 277 |
- $(use_enable v4l v4l2) |
| 278 |
- $(use_enable valgrind) |
| 279 |
- $(use_enable wayland) |
| 280 |
- $(use_enable webp image-loader-webp) |
| 281 |
- $(use_enable xim) |
| 282 |
- $(use_enable xine) |
| 283 |
- $(use_enable xpm image-loader-xpm) |
| 284 |
- --enable-cserve |
| 285 |
- --enable-image-loader-generic |
| 286 |
- --enable-image-loader-jpeg |
| 287 |
- |
| 288 |
- --disable-tizen |
| 289 |
- --disable-gesture |
| 290 |
- --disable-gstreamer |
| 291 |
- --enable-xinput2 |
| 292 |
- --disable-xinput22 |
| 293 |
- --enable-libmount |
| 294 |
- |
| 295 |
- # external lz4 support currently broken because of unstable ABI/API |
| 296 |
- #--enable-liblz4 |
| 297 |
- ) |
| 298 |
- |
| 299 |
- enlightenment_src_configure |
| 300 |
-} |
| 301 |
- |
| 302 |
-src_compile() { |
| 303 |
- if host-is-pax && ! use oldlua ; then |
| 304 |
- # We need to build the lua code first so we can pax-mark it. #547076 |
| 305 |
- local target='_e_built_sources_target_gogogo_' |
| 306 |
- printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die |
| 307 |
- emake -C src "${target}" |
| 308 |
- emake -C src bin/elua/elua |
| 309 |
- pax-mark m src/bin/elua/.libs/elua |
| 310 |
- fi |
| 311 |
- enlightenment_src_compile |
| 312 |
-} |
| 313 |
- |
| 314 |
-src_install() { |
| 315 |
- MAKEOPTS+=" -j1" |
| 316 |
- |
| 317 |
- enlightenment_src_install |
| 318 |
-} |
| 319 |
|
| 320 |
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 |
| 321 |
deleted file mode 100644 |
| 322 |
index 6c5f8eb757c..00000000000 |
| 323 |
--- a/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch |
| 324 |
+++ /dev/null |
| 325 |
@@ -1,39 +0,0 @@ |
| 326 |
-From 6f42992b4f1110f44d2db57cd6fe42559cfffdc2 Mon Sep 17 00:00:00 2001 |
| 327 |
-From: Cedric BAIL <cedric@×××××××××××.com> |
| 328 |
-Date: Wed, 21 Sep 2016 10:33:44 -0700 |
| 329 |
-Subject: [PATCH] eet: fix gnutls support with newer version. |
| 330 |
- |
| 331 |
---- |
| 332 |
- src/lib/eet/eet_cipher.c | 9 ++++----- |
| 333 |
- 1 file changed, 4 insertions(+), 5 deletions(-) |
| 334 |
- |
| 335 |
-diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c |
| 336 |
-index a34fdff..cf9ef71 100644 |
| 337 |
---- a/src/lib/eet/eet_cipher.c |
| 338 |
-+++ b/src/lib/eet/eet_cipher.c |
| 339 |
-@@ -679,7 +679,6 @@ eet_identity_check(const void *data_base, |
| 340 |
- gnutls_datum_t datum; |
| 341 |
- gnutls_datum_t signature; |
| 342 |
- gnutls_pubkey_t pubkey; |
| 343 |
-- gnutls_digest_algorithm_t hash_algo; |
| 344 |
- unsigned char *hash; |
| 345 |
- gcry_md_hd_t md; |
| 346 |
- int err; |
| 347 |
-@@ -717,10 +716,10 @@ eet_identity_check(const void *data_base, |
| 348 |
- if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0) |
| 349 |
- goto on_error; |
| 350 |
- |
| 351 |
-- if (gnutls_pubkey_get_verify_algorithm(pubkey, &signature, &hash_algo) < 0) |
| 352 |
-- goto on_error; |
| 353 |
-- |
| 354 |
-- if (gnutls_pubkey_verify_hash(pubkey, 0, &datum, &signature) < 0) |
| 355 |
-+ if (gnutls_pubkey_verify_hash2(pubkey, |
| 356 |
-+ gnutls_x509_crt_get_signature_algorithm(cert), |
| 357 |
-+ 0, |
| 358 |
-+ &datum, &signature) < 0) |
| 359 |
- goto on_error; |
| 360 |
- |
| 361 |
- if (sha1) |
| 362 |
--- |
| 363 |
-2.10.2 |
| 364 |
- |
Archives