From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rn52O-0002XW-BN for garchives@archives.gentoo.org; Tue, 17 Jan 2012 09:09:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A92CE072C; Tue, 17 Jan 2012 09:08:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F1C33E0716 for ; Tue, 17 Jan 2012 09:08:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A71F1B4029 for ; Tue, 17 Jan 2012 09:08:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B95348004C for ; Tue, 17 Jan 2012 09:08:53 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <260580eb2a6df508f756024f33c36dcd5588336a.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 260580eb2a6df508f756024f33c36dcd5588336a Date: Tue, 17 Jan 2012 09:08:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c81ef720-4f8e-4be6-9661-3c02e4eef438 X-Archives-Hash: 4ab86be843a8a784384f2075ceda3c67 commit: 260580eb2a6df508f756024f33c36dcd5588336a Author: Priit Laes plaes org> AuthorDate: Tue Jan 17 09:05:32 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Jan 17 09:05:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D260580eb net-libs/webkit-gtk: 1.7.3 =E2=86=92 1.7.4 --- .../files/webkit-gtk-1.7.1-install-docs.patch | 43 --------------= ------ net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild | 3 - ....1-r200.ebuild =3D> webkit-gtk-1.7.4-r200.ebuild} | 2 +- ....1-r300.ebuild =3D> webkit-gtk-1.7.4-r300.ebuild} | 9 +--- 4 files changed, 3 insertions(+), 54 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patc= h b/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch deleted file mode 100644 index b053908..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch +++ /dev/null @@ -1,43 +0,0 @@ -Enable gtk-doc installation when building with --enable-gtk-doc - ---- a/Source/WebKit/gtk/GNUmakefile.gtk-doc.am -+++ b/Source/WebKit/gtk/GNUmakefile.gtk-doc.am -@@ -180,6 +180,38 @@ - @rm -rf Documentation/xml Documentation/html - -@rmdir Documentation -=20 -+if ENABLE_GTK_DOC -+install-data-local: -+ @installfiles=3D`echo $(builddir)/html/*`; \ -+ if test "$$installfiles" =3D '$(builddir)/html/*'; \ -+ then echo 1>&2 'Nothing to install' ; \ -+ else \ -+ if test -n "$(DOC_MODULE_VERSION)"; then \ -+ installdir=3D"$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -+ else \ -+ installdir=3D"$(DESTDIR)$(TARGET_DIR)"; \ -+ fi; \ -+ $(mkinstalldirs) $${installdir} ; \ -+ for i in $$installfiles; do \ -+ echo ' $(INSTALL_DATA) '$$i ; \ -+ $(INSTALL_DATA) $$i $${installdir}; \ -+ done; \ -+ if test -n "$(DOC_MODULE_VERSION)"; then \ -+ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -+ fi; \ -+ $(GTKDOC_REBASE) --relative --dest-dir=3D$(DESTDIR) --html-dir=3D$${= installdir}; \ -+ fi -+ -+uninstall-local: -+ @if test -n "$(DOC_MODULE_VERSION)"; then \ -+ installdir=3D"$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -+ else \ -+ installdir=3D"$(DESTDIR)$(TARGET_DIR)"; \ -+ fi; \ -+ rm -rf $${installdir} -+endif -+ - # - # Require gtk-doc when making dist - # diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.7.3-r300.ebuild index 4ae3a69..e896d47 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild @@ -95,9 +95,6 @@ src_prepare() { # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=3D69085 mkdir -p DerivedSources/ANGLE =20 - # Install docs on "make install" when USE=3Ddoc - #epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch" - # Prevent maintainer mode from being triggered during make AT_M4DIR=3DSource/autotools eautoreconf } diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.7.4-r200.ebuild similarity index 98% rename from net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild index 3506b3c..f62db47 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild @@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic eutils python vir= tualx MY_P=3D"webkit-${PV}" DESCRIPTION=3D"Open source web browser engine" HOMEPAGE=3D"http://www.webkitgtk.org/" -SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.gz" +SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.xz" #SRC_URI=3D"mirror://gentoo/${P}.tar.xz" =20 LICENSE=3D"LGPL-2 LGPL-2.1 BSD" diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.7.4-r300.ebuild similarity index 92% rename from net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild index 80fa1b5..6adaa5e 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild @@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic eutils python vir= tualx MY_P=3D"webkit-${PV}" DESCRIPTION=3D"Open source web browser engine" HOMEPAGE=3D"http://www.webkitgtk.org/" -SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.gz" +SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.xz" #SRC_URI=3D"mirror://gentoo/${P}.tar.xz" =20 LICENSE=3D"LGPL-2 LGPL-2.1 BSD" @@ -35,7 +35,7 @@ RDEPEND=3D" >=3Ddev-libs/glib-2.27.90:2 >=3Dx11-libs/gtk+-3.0:3[aqua=3D,introspection?] >=3Ddev-libs/icu-3.8.1-r1 - >=3Dnet-libs/libsoup-2.33.6:2.4[introspection?] + >=3Dnet-libs/libsoup-2.37.2.1:2.4[introspection?] dev-db/sqlite:3 >=3Dx11-libs/pango-1.12 x11-libs/libXrender @@ -95,9 +95,6 @@ src_prepare() { # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=3D69085 mkdir -p DerivedSources/ANGLE =20 - # Install docs on "make install" when USE=3Ddoc - epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch" - # Prevent maintainer mode from being triggered during make AT_M4DIR=3DSource/autotools eautoreconf } @@ -115,8 +112,6 @@ src_configure() { local myconf =20 # XXX: Check Web Audio support - # XXX: files for generating DerivedSources/WebKit2/* are missing, see - # https://bugs.webkit.org/show_bug.cgi?id=3D66527 myconf=3D" $(use_enable coverage) $(use_enable debug)