[gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

["Priit Laes" <plaes@plaes.org>]

commit:     2b2d6ff288945bf9ad20c811ac481b033d7ab2eb
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Feb 13 14:01:11 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Feb 13 14:01:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2b2d6ff2

net-libs/webkit-gtk: 1.11.4 → 1.11.5

---
 .../webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch |   24 -----------------
 .../webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch |   27 --------------------
 ...4-r300.ebuild => webkit-gtk-1.11.5-r300.ebuild} |    6 +---
 3 files changed, 1 insertions(+), 56 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch
deleted file mode 100644
index 50f2729..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=96602
-
---- configure.ac	(revision 132329)
-+++ configure.ac	(working copy)
-@@ -278,6 +278,10 @@
- AC_SUBST([OLE32_LIBS])
- 
- 
-+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-+AC_SUBST([DLOPEN_LIBS])
-+
-+
- # determine the GTK+ version to use
- AC_MSG_CHECKING([the GTK+ version to use])
- AC_ARG_WITH([gtk],
-@@ -1039,7 +1043,7 @@
-    if test "$enable_glx" = "yes"; then
-     acceleration_backend_description+=", glx"
-    fi
--   OPENGL_LIBS+=" -ldl"
-+   OPENGL_LIBS+=" $DLOPEN_LIBS"
-    acceleration_backend_description+=")"
- fi
- AC_SUBST([OPENGL_LIBS])

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch
deleted file mode 100644
index 1ab7a6d..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=417523
-https://bugs.webkit.org/show_bug.cgi?id=96602
-
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 128397)
-+++ configure.ac	(working copy)
-@@ -278,6 +278,10 @@
- AC_SUBST([OLE32_LIBS])
- 
- 
-+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-+AC_SUBST([DLOPEN_LIBS])
-+
-+
- # determine the GTK+ version to use
- AC_MSG_CHECKING([the GTK+ version to use])
- AC_ARG_WITH([gtk],
-@@ -1124,7 +1128,7 @@
- fi
- 
- if test "$with_acceleration_backend" = "opengl"; then
--    OPENGL_LIBS="-lGL -ldl"
-+    OPENGL_LIBS="-lGL $DLOPEN_LIBS"
- fi
- AC_SUBST([OPENGL_LIBS])
- 

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild
similarity index 96%
rename from net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild
index d941598..8e7f8a8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild
@@ -14,8 +14,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="3"
-#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="introspection? ( geoloc gstreamer )"
@@ -154,9 +153,6 @@ src_prepare() {
 	# occasional test failure due to additional Xvfb process spawned
 	# TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
 
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.11.1-libdl.patch"
-
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC