commit: 807b5ae455a76b354de3d029d56bcbb42e2cc2df
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 23:45:57 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 23:45:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=807b5ae4
net-libs/webkit-gtk: update to follow upstream
Package-Manager: portage-2.2.26
net-libs/webkit-gtk/Manifest | 4 ++--
net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild | 11 +++++++----
net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild | 11 +++++++----
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4abfd63..3997772 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -9,6 +9,6 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256
6fb78d5f94806ddb976ceb076e62
AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256
d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512
580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0
WHIRLPOOL
b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc
AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256
9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512
f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e
WHIRLPOOL
f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256
afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512
5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98
WHIRLPOOL
26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
-EBUILD webkit-gtk-2.4.9-r200.ebuild 9285 SHA256
8585b0e59c31696aa9486ff25ef278a43d0a4d75d28faed2dbce31e60be09178 SHA512
9e5af9413736d8da7eeaa9e5f4ca07dc757f7249623aec3eaa4d2401992451ac5eca77861171e93d9d56d19e6c521910a8d42c5fbf6a7cd9ab0bc0020066a686
WHIRLPOOL
5e844692c665e08cb8fcef250b0043752ac71f5019069a253ae2a552d570827f727505b6da143a17236a47bfec65bd4545ef6e05837219d15a2ddbe67026a6c8
-EBUILD webkit-gtk-2.4.9.ebuild 9759 SHA256
82f509817636144fdbeb1f499d34673c7d5178ec171d379279a77b10815fb4bf SHA512
4d04b16ab3c546a9363e452681345b8a989da971b0e8cc1a8f55088e9e3f30fc12a5806d43186421ad7b11bda1268bf2dfc1a7d75972e8451d3c6d53af639314
WHIRLPOOL
b191db4c9d7365b88eba0106bc6c5a360a826b1236cdfaf440353db551124488c94bd3a6c35f84b83c0ff6a1831d95dbe9c259138ca8174fa9a88d1ba240e93c
+EBUILD webkit-gtk-2.4.9-r200.ebuild 9355 SHA256
e575d08794b0c8ec2c1282c21c6eb82bb10b8b741924e8596504ff196397ca6b SHA512
8904f1e912bbcb8e817a0fb8343440279a0ec6b72d682d9957b4043492587f40823ee0e15d549377a4974b10bd5f7bc7579c9e41d268f749856e7bb1603549dc
WHIRLPOOL
cefbee06f3fbed09655107bdb58abdeda4da0d048111ece027277ebd19cc65c90de1f668836b40f28bfd94a04e20177a96ea1c5b1aeaee157c4178e20f492885
+EBUILD webkit-gtk-2.4.9.ebuild 9834 SHA256
eaa6df05bbf906160c3864d181c7f582a54a2804a9d5400e462f56eaf54ce037 SHA512
c7436ea640c76f118ed1794fe0fc769ce10a0b57c9d92932f3da10cd57d33f085f5656b2b86e3fe3f2bd6992c9b88591f53eede9de6f61d57531f3f61eab8e2d
WHIRLPOOL
1759d9515453ded2058bf1c8cae35e91ddc4882706eb7f83187a641c0217d7519fe1df18f73d6b3a76579d36cac0e2dfbade9723b0f7775c1b55eeae22240d20
MISC metadata.xml 717 SHA256
0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512
996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365
WHIRLPOOL
531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
index 4fa0556..e5480ae 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v 1.5
2015/06/26 09:23:38 ago Exp $
+# $Id$
EAPI="5"
GCONF_DEBUG="no"
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
virtual/rubygems[ruby_targets_ruby20]
virtual/rubygems[ruby_targets_ruby21]
virtual/rubygems[ruby_targets_ruby22]
+ virtual/rubygems[ruby_targets_ruby23]
virtual/rubygems[ruby_targets_ruby19]
)
>=dev-libs/atk-2.8.0
@@ -104,7 +105,7 @@ pkg_pretend() {
check-reqs_pkg_pretend
fi
- if ! test-flag-CXX -std=c++11; then
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
die "You need at least GCC 4.7.x or Clang >= 3.3 for
C++11-specific compiler flags"
fi
}
@@ -210,7 +211,9 @@ src_configure() {
local ruby_interpreter=""
- if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+ if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+ ruby_interpreter="RUBY=$(type -P ruby23)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
ruby_interpreter="RUBY=$(type -P ruby22)"
elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
ruby_interpreter="RUBY=$(type -P ruby21)"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
index 5cceb09..4e181be 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v 1.5
2015/06/26 09:23:38 ago Exp $
+# $Id$
EAPI="5"
GCONF_DEBUG="no"
@@ -81,6 +81,7 @@ DEPEND="${RDEPEND}
virtual/rubygems[ruby_targets_ruby20]
virtual/rubygems[ruby_targets_ruby21]
virtual/rubygems[ruby_targets_ruby22]
+ virtual/rubygems[ruby_targets_ruby23]
virtual/rubygems[ruby_targets_ruby19]
)
>=app-accessibility/at-spi2-core-2.5.3
@@ -113,7 +114,7 @@ pkg_pretend() {
check-reqs_pkg_pretend
fi
- if ! test-flag-CXX -std=c++11; then
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
die "You need at least GCC 4.7.x or Clang >= 3.3 for
C++11-specific compiler flags"
fi
}
@@ -223,7 +224,9 @@ src_configure() {
local ruby_interpreter=""
- if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+ if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+ ruby_interpreter="RUBY=$(type -P ruby23)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
ruby_interpreter="RUBY=$(type -P ruby22)"
elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
ruby_interpreter="RUBY=$(type -P ruby21)"
