summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-08-07 16:09:01 +0000
committerMike Frysinger <vapier@gentoo.org>2015-08-07 16:09:01 +0000
commit58f16328623f4f38f6201d9a9ba00e3788e79019 (patch)
tree98c01c03e715380df8f0b916c01bbab142257f6c /dev-libs
parentKeyworded on alpha, bug 528896 (diff)
downloadhistorical-58f16328623f4f38f6201d9a9ba00e3788e79019.tar.gz
historical-58f16328623f4f38f6201d9a9ba00e3788e79019.tar.bz2
historical-58f16328623f4f38f6201d9a9ba00e3788e79019.zip
Fix builds w/USE=sdl #551882 by Barnaby.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/efl/ChangeLog5
-rw-r--r--dev-libs/efl/Manifest30
-rw-r--r--dev-libs/efl/efl-1.15.0.ebuild13
3 files changed, 31 insertions, 17 deletions
diff --git a/dev-libs/efl/ChangeLog b/dev-libs/efl/ChangeLog
index dce669a93f2b..1c894ddd2a63 100644
--- a/dev-libs/efl/ChangeLog
+++ b/dev-libs/efl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/efl
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.33 2015/08/06 04:22:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.34 2015/08/07 16:08:59 vapier Exp $
+
+ 07 Aug 2015; Mike Frysinger <vapier@gentoo.org> efl-1.15.0.ebuild:
+ Fix builds w/USE=sdl #551882 by Barnaby.
06 Aug 2015; Mike Frysinger <vapier@gentoo.org> efl-1.12.2.ebuild,
efl-1.13.1.ebuild, efl-1.15.0.ebuild, efl-9999.ebuild:
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index a120347446a0..97c51c4019e1 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -7,24 +7,24 @@ DIST efl-1.13.1.tar.xz 40332672 SHA256 7e06e11678063fd74522f8fc56eb3d0235e9d7f88
DIST efl-1.15.0.tar.xz 43130156 SHA256 5d9580e9ba961fc64222d54a73849c730477c209dde89cc123dde14f22d532bc SHA512 59f28ddee01b4b5f1d7117a9e4c051e7074fbd5712dae7d9f99f0a4d09d41963cc411eeec664f3e1c57e84ad6ebde9c58ddcc9931eef0468817a90fe96a1dfdd WHIRLPOOL 113a0da4c0f2a7b22bcfd12b2f83a85a999979ec97a423cd53310e9ef9d15d8f1d0db5dd035bc931116d4a79b435144366c1930ffe3f11d48fd439ca37124e36
EBUILD efl-1.12.2.ebuild 6831 SHA256 4403c8a24bb7bdf40a283d9666566a6f693c77df57cacb5f35e809f8527ad9bc SHA512 1da1b2883cdbc7fae97b221990e96f698764e4a0cc5ca43d381d704bdb47d37dffbdfcb2c0179dba43b15a83123d67d5ca8c56ed3ddad007923778f14d362553 WHIRLPOOL 6e61752ed747c766d7cc294934b625a5ce59c321b5ff78b004e9e19fdcb59f65e54f67903ac93c538a39ccaf56e858a79afad0f120ffb7020fe00431762ce20d
EBUILD efl-1.13.1.ebuild 6516 SHA256 460c3faaa4b9f93eb54e25c24aa6dbefd7761472f1a1b46e03d64ca43d65fc8d SHA512 dc885a4e23ab3c038b230b1ac848f61cd49da428214b3580c9dc95a15af8f4e56c3340e25f79b2f3499df43d95749025bc4ad79171a07bfbdb397980b6eb875d WHIRLPOOL 197362fa91b07bd792161830e351c319364cebee489488d8339934ab64d22e947f2c43961268ecee4058fa2504b52f7ebf2176b6fb67a9474168c7ac8f233d18
-EBUILD efl-1.15.0.ebuild 6011 SHA256 9e427fce5ee1e5c101d0965db49e01ac6f2639130f9a239e960adde1d9ce1909 SHA512 4faa96b485bc76d35e7b0ebdefd039dfb187200b8cf3a69fcd4abbfdb4a5e22d57269d88fc6b7304bc8087a70b6c23ac63d81cb353b04af9300858deb81da3e6 WHIRLPOOL 8731f51befdffbf522a0cd36875e271deb2c4b01012edaa6594b2deb884dbd347750e6a0b378c68c098cda2fd5bbef3ae619a397d05c98ac4ee867fde1685fb3
+EBUILD efl-1.15.0.ebuild 6296 SHA256 1d860347127d3f9d572c52b4d667acb8304a5218acafaa326d4e8a6baef83e20 SHA512 211ba97913604d39ad217f33a4ad186f54ed21f41646198a21852b2d487cadb4536f155621475cf712592814c5cfd4583c878aa7108945ac5034eeb267d1030d WHIRLPOOL 26facc8a895a9bf9446ee003dcdbe8a83bd511359c9dd57af3e4af4e75275d91cbc250cf9b75079add991c99e8d2cc6de4fa5d0c29c5e567ae2af27490fed0a6
EBUILD efl-9999.ebuild 6009 SHA256 7e0d1311920f9d58cc9a887e4b7ec537ea356d6409a095c3ab19b35dd91b2930 SHA512 4e7a8c17a5a03feb03c49528535010be88ef9bbc4caf9cfd7806790a096bd655032c4cc2fab34a64bf4aae6c77b6ad57c968c12b3eb682605792c7c3b04b4c67 WHIRLPOOL f33e8d40b85764f16b7f526267dcd4da2d0d51268a6f71319352f102f40665d0a8d2ed09e9edebc6e646eeab9b36e93f39ea4c75e4d98f0a8e0bd72dd372807b
-MISC ChangeLog 5729 SHA256 8ff12b6c091cc5da05e62299bbe64fd53b7d33ff43bdd7b33f8a412775700423 SHA512 a893f8dd231c8008d326ac892526a7c27554a6ea8bb7f7ac77c0631f6ae7bb27b744ec7fb15e6796f39ff0a3da6d09865bff2982661888f94e4be88f188931b5 WHIRLPOOL 1e97cdd8577ed93775c2de098190cd54d7356b07b4ed095d38137e354c24efbc10aa558535a260b2da43b5b28d413ef42f8c14c560e38d8fd53e160867f710e6
+MISC ChangeLog 5842 SHA256 808ed90081783eea1258ce48426a970241ac8d91eac97c06c58d71b91292b1b0 SHA512 0552b4c3be80b8d8eec49d14779cf8ad067271385fe96890dcc93b8326a8fe23c2524967e9eadb9151d5756e19f5084172ea03a0c093735139abffe7965ece43 WHIRLPOOL f80b5859233b04586eb092766f18bfaa32edddbff7b487da32535a92d11b6f6df3b1618c65fbbdf7de44cafb9c9393a014867690d22e8115b41b62d1a9f8636e
MISC metadata.xml 1519 SHA256 b0cc4ce8ca40ea02d4e9790017531edd09f394c68bc4cbc511ef31fc1bc34cfb SHA512 bdf851bf0ff1561a4216b8178625a5b43cf0840fce762ff616a6318ffb099ffb9603e64215df2072c89c341c9662b565f10497a75adad329fc5aeb8bbe4aa1ec WHIRLPOOL 03f2792e175700b9bd36879ff4b0b390778c4b8204367417f70f9fceb7ea513e23657378eb5b2594d92b594ab97dd382bd337703d77040625e1d56338db6f83d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJVwuD5AAoJEPGu1DbS6WIAoyYP/3bkgfXtJwBp6zGNZQhnfCNm
-SKd5Ude2fWRxE0cKlkmKa/ketjIZzdxUH2UPUuU/HVULkyeTiGY8siP1TxU3WNkW
-rFOx400IYnAmjdhHL+51Khi5OXymH+TbxdRKNfdNtUDOJzm0b2lnAoqoNf3Zkq7C
-UabLLckTy5ZJ9lMz7kv6g9H/0hD7jc5i36JZlsiY9LCFehk3ucp05GD8eAURrMIq
-FZ8eIPILUMTCq0T5u32M5XstBG0vgRJwxNRMvfe9TI6bOdj38/dlENscSdcgo/ym
-4lfx5u+Nq+bwOErlPpScH2zR5VoLbGycyz1E1avv0n3PkJTNf3jK6uPlvatRmH7V
-ekqA3ePVzENAOOUTatz9ndUz1zgVD7m0+kl9MRjC3/l4CbyzaJSEdC0C3p+/7rZt
-JNz7ucUsX/ctAkC2tr5AAAave/FiNqmPlNMZuCvwyPCA9yI2SsuuF1sEjf3s5cil
-vLddvfAzKtpD06kQk54YzgmGQTGEXp2IQeet7QZk5X3zj170ekzfbI6WgklcS0Bx
-vD5lOtgaxj6GdhNurms5O74vS6wJ/WXgzxfmtI5hWuyduDZ5ivn9icHEcJ2XASkF
-i4izHw5zRvHMf6rCYRgcKxIQ/WM9yc1yL1rV15sg1FhmT7MOliq8FaGJC85E0Ib7
-DgIF0uGVDduc7EojMG0P
-=7e6O
+iQIcBAEBCAAGBQJVxNgcAAoJEPGu1DbS6WIAuz0P/2wJ89Wx3Mm5PQ636vphV39T
+964ffpaX6zEKK9o4qfCEA+Lcns30OIALbuqaUJi7+SD2926wi/vDmi7+cot2+fUm
+A1O7XARUZA4oOYpYrkdXGsWweqqacz00xhCuRvSVKHky+dDWJgLBPpNzI9qUojZO
+JR4apQe0KnRxDvSwlu5vGrb3yBkgup2DwhlkRFSB9uytVecdCSDdpFw/fTii8Hv0
+epgICc1MxabONhkvG7gCjhWrKDGwM3gaovtECtQjqzc2KlCgquBVfwNMsY5zxABX
+SMx1/W/vkt582+2mNPFjg86Q2DQJnUwTRMXT+inSt+xxvfCkw92nyxNSyZ7MzC02
+p6xDStSHspPpK/0f88Ld7V9yE/R/uZKdUnwGDzI3YiDSkp4LCufsGWzr8MhSUgad
+4/HNkcZRmoKDzwasZFmt2cWzdAMt9TizZbsXxBhw0IdZdoKgX4+nhD1xtxS7reX6
+b9+RiBvhbeX5DICudEug1sMUtGxOegzmMuC6dUANpLISiaRRuQUXRI6iKCyl651u
+q4pemIF91EmwuQqprZFNC5PNoaia19F3g4h30TKODoqELFhFPd4Zi+F0ViuEYI1B
+qGPEqvC13IwqfXNlgRsohHBwfeayedzrmaCd8D5gM0ekoHjia8jEe7/axQ07iPSm
+JXtweOWuO3655GuOe67Z
+=P+sm
-----END PGP SIGNATURE-----
diff --git a/dev-libs/efl/efl-1.15.0.ebuild b/dev-libs/efl/efl-1.15.0.ebuild
index 656fd76ad7c2..4554d8974bca 100644
--- a/dev-libs/efl/efl-1.15.0.ebuild
+++ b/dev-libs/efl/efl-1.15.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.15.0.ebuild,v 1.2 2015/08/06 04:22:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.15.0.ebuild,v 1.3 2015/08/07 16:08:59 vapier Exp $
EAPI="5"
@@ -158,6 +158,17 @@ DEPEND="
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ # This is a hack of the upstream fix. Drop with next release. #551882
+ sed -i \
+ -e 's:SDL/:SDL2/:g' \
+ configure \
+ src/modules/evas/engines/gl_common/evas_gl_common.h \
+ src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h || die
+
+ enlightenment_src_prepare
+}
+
src_configure() {
if use ssl && use gnutls ; then
einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"