Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index c98ac57adcae6cec4b32c89123dbe25fbf4483dc..d762eb955dcb6b455065199b31f22092f1c890ec 100644 (file)
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.71 2010/03/29 22:35:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.72 2010/06/13 21:00:06 pacho Exp $
+
+*webkit-gtk-1.2.1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +webkit-gtk-1.2.1.ebuild:
+  Add new version for Gnome 2.30.
 
   29 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -webkit-gtk-0_p40220-r1.ebuild,

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 236fd06b10024a0ed9517d43879d0ff71c34368a..72e4d544e5de7445c63a456d3befc34bc2eb4902 100644 (file)
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,13 +5,15 @@ AUX webkit-gtk-1.1.15.2-unaligned.patch 4403 RMD160 c9ba117a35e07ed1097787934fdb
 AUX webkit-gtk-1.1.15.4-darwin-quartz.patch 2353 RMD160 4293e345e05390cf93b97d381edb7c443ae0cc02 SHA1 f2d67803f59503ff9d408be0a38983ac25439dad SHA256 3aedd95fc50d92b31e6043d1e8df0c50385b96503e94945547b1f65675f21a12
 AUX webkit-gtk-1.1.15.4-icu44.patch 4907 RMD160 aec153a9a9cbeb435a0e28ba567daf215380d870 SHA1 c5366b8f1e65105faa170ef8c90c1d94f739fec2 SHA256 75a6f47728436082b5039f961f3dc5a10888c1c49779c2b4dcbb0321cf65ef8e
 DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
+DIST webkit-1.2.1.tar.gz 7577236 RMD160 f8c158b67fbcdfd9977edd530d5f8c15e402da6d SHA1 ced564514f0be0a88c696e7afd6902d967d532a2 SHA256 c9ee551eab4e98730fa06aaa493ce95828e6c6661ec14361e6254bc23795a2dd
 EBUILD webkit-gtk-1.1.15.4.ebuild 2550 RMD160 64a87a310fe47ccb336c66f39b3b86a1fa869d14 SHA1 193e316fe1ba246e32c550992782f0afa360bf46 SHA256 bd88cecc6710e5d52954f5c990ee322b1e18b5b47d04164789b346d2f00ff5c3
-MISC ChangeLog 14682 RMD160 7a1c52a2dbca71817f923855480deedfd9ef5edd SHA1 8e47220bab6bda1c53bfc5dc3447e2b95e203059 SHA256 d12e113ed420a427aa17b6aa3781b486deccc08d68e5f1ea536674586ad300e0
+EBUILD webkit-gtk-1.2.1.ebuild 3228 RMD160 1b6a706d1ec3444069abab610b39b270341e9fe2 SHA1 aaa3f5dd0026ee22b8a1c0f66e971d91101d392d SHA256 27488c40830fd7b6a92a09adfb092e7d4474129ebb0868d0db745deaab5ab80e
+MISC ChangeLog 14824 RMD160 87bdd2595b9dfc20100ab78b10e14c50297aa1dd SHA1 985df8b6f17ab42c0811f4f71891c61d3745558c SHA256 0bfd7d47fa7b6fbc5d73209cea515ab637cf159dda0f367221cf425aa163aa35
 MISC metadata.xml 318 RMD160 8779b2915c61a3efda9fdd42f64caa899e3bd2e0 SHA1 6ea9740e1524cbe0bb50316af693bb558fb41ecf SHA256 46a3afd2db9273d4fc19d548ac9935d2bd6ce9e6cf868d8c94331d950898b375
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuxK0QACgkQ1fmVwcYIWAbDvQCZATIwuZnmuY59ygwJ0m7aP8SV
-NLIAnjFEw0LpMV+EsFcClLj6H3kw1MEo
-=Dsd7
+iEYEARECAAYFAkwVRtwACgkQCaWpQKGI+9TaTACeNKVNHQ0OYKzSXfO4ZpTONFnb
+79IAnAokJ7+UtdUZJlZUt5bj7VUTNV56
+=lzJ/
 -----END PGP SIGNATURE-----

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild
new file mode 100644 (file)
index 0000000..16f28b6
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild,v 1.1 2010/06/13 21:00:06 pacho Exp $
+
+EAPI="2"
+
+inherit autotools flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+# FIXME: we are still not ready for introspection
+IUSE="coverage debug doc +gstreamer +websockets" # aqua
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13 for gail
+# XXX: Quartz patch does not apply
+# >=x11-libs/gtk+-2.13[aqua=]
+RDEPEND="
+       dev-libs/libxml2
+       dev-libs/libxslt
+       media-libs/jpeg:0
+       media-libs/libpng
+       x11-libs/cairo
+       >=x11-libs/gtk+-2.13
+       >=dev-libs/glib-2.21.3
+       >=dev-libs/icu-3.8.1-r1
+       >=net-libs/libsoup-2.29.90
+       >=dev-db/sqlite-3
+       >=app-text/enchant-0.22
+       >=x11-libs/pango-1.12
+
+       gstreamer? (
+               media-libs/gstreamer:0.10
+               >=media-libs/gst-plugins-base-0.10.25:0.10 )"
+#      introspection? (
+#              >=dev-libs/gobject-introspection-0.6.2
+#              !!dev-libs/gir-repository[webkit]
+#              dev-libs/gir-repository[libsoup] )
+
+DEPEND="${RDEPEND}
+       >=sys-devel/flex-2.5.33
+       sys-devel/gettext
+       dev-util/gperf
+       dev-util/pkgconfig
+       dev-util/gtk-doc-am
+       doc? ( >=dev-util/gtk-doc-1.10 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+       # Build failure with icu-4.4, bug 308699
+       epatch "${FILESDIR}"/webkit-icu-4.4.patch
+
+       # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+       # https://bugs.webkit.org/show_bug.cgi?id=19775
+       use sparc && epatch "${FILESDIR}"/${PN}-1.1.15.2-unaligned.patch
+
+       # Darwin/Aqua build is broken, needs autoreconf
+       # XXX: BROKEN. Patch does not apply anymore.
+       # https://bugs.webkit.org/show_bug.cgi?id=28727
+       #epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch
+
+       # Make it libtool-1 compatible
+       rm -v autotools/lt* autotools/libtool.m4 \
+               || die "removing libtool macros failed"
+       # Don't force -O2
+       sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+       # Prevent maintainer mode from being triggered during make
+       AT_M4DIR=autotools eautoreconf
+}
+
+src_configure() {
+       # It doesn't compile on alpha without this in LDFLAGS
+       use alpha && append-ldflags "-Wl,--no-relax"
+
+       # Sigbuses on SPARC with mcpu
+       use sparc && filter-flags "-mcpu=*" "-mtune=*"
+
+       local myconf
+
+       myconf="
+               --disable-introspection
+               $(use_enable coverage)
+               $(use_enable debug)
+               $(use_enable gstreamer video)
+               $(use_enable websockets web_sockets)"
+               # quartz patch above does not apply anymore
+               #$(use aqua && echo "--with-target=quartz")"
+
+       econf ${myconf}
+}
+
+src_test() {
+       unset DISPLAY
+       # Tests will fail without it, bug 294691, bug 310695
+       Xemake check || die "Test phase failed"
+}
+
+#src_compile() {
+       # Fix sandbox error with USE="introspection"
+       # https://bugs.webkit.org/show_bug.cgi?id=35471
+#      addpredict "$(unset HOME; echo ~)/.local"
+#      emake || die "Compile failed"
+#}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "Install failed"
+       dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
+}