Version bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 24 insertions, 11 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 746c44377c32..aab22152f275 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.42 2009/07/21 21:40:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.43 2009/07/21 23:20:13 jokey Exp $
+
+  21 Jul 2009; Markus Ullmann <jokey@gentoo.org>
+  -webkit-gtk-0_p46126.ebuild, +webkit-gtk-0_p46193.ebuild:
+  Version bump
+
+*webkit-gtk-0_p46193 (21 Jul 2009)
+
+  21 Jul 2009; Markus Ullmann <jokey@gentoo.org>
+  -webkit-gtk-0_p46126.ebuild, +webkit-gtk-0_p46193.ebuild:
+  Once done, right start over with a new snapshot
 
   21 Jul 2009; Markus Ullmann <jokey@gentoo.org> webkit-gtk-0_p46126.ebuild,
   +files/webkit-gtk-0_p46126-wx-parallel-make.patch:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4b821b2eaae4..1656b50f32e6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,14 +4,14 @@ AUX webkit-gtk-0_p46126-wx-parallel-make.patch 636 RMD160 c050983cc3993cf50fbf71
 AUX webkit-gtk-0_p46126-wxslot-gentoo.patch 473 RMD160 5d3f75c4129dbfcdfedfcdd1f38acc255289300b SHA1 0be9ad004c94f16b2ca0b6488685fca58ffef694 SHA256 c76d788a22632bf7f6a589351ddd3b12129b0eead020719ac5b0076ea7da2785
 AUX webkit-gtk-CVE-2009-0945.patch 671 RMD160 a51f2326f44e05146eaeea5b3f0fcc973efdaeca SHA1 2a281b7ee69158daf7d088add2f21f99903506dd SHA256 65ccad453b147067725dac0f9ba8f07cd0d04970ab0f8d85f086ef07a6d0b3c3
 DIST WebKit-r40220.tar.bz2 10307835 RMD160 5700977d5a9a23680e58b1e3952ecb2fe1430e9a SHA1 2aa2bd3a9c60f53a1a1ef0bf810ea2c59b0a80e2 SHA256 223154d0e247336cd3cf808b030cfb00739103b7a258050e71703903df922020
-DIST WebKit-r46126.tar.bz2 11720622 RMD160 e5a2afce8b831bc6e9c40b7c0329449274e26581 SHA1 94336be729a3cd63ef0f1b634a8448b62dee9172 SHA256 16a88f8c45612c185e93aa793473ce5bee12cc499fcb13ea65e178bb66292a3d
+DIST WebKit-r46193.tar.bz2 11728345 RMD160 8cddda98e88ccd5e603ea8c919668b5c707a2344 SHA1 5490986303560917b2151f394069b2b9b30fa10f SHA256 1dc4b8ec0501dfc2150bcac879c80906813bf729ba5300a9b2dc882f9bcb4ef5
 DIST webkit-1.1.10.tar.gz 6343872 RMD160 c3d5a7b9793318d0fc9f4d170b7aeac7a6f30735 SHA1 8f0637c936b4f62fb21c8d0c35298e5c0317fd0a SHA256 4eb4fc4a3f47edbc18c9dc09d54fd2189954ebaa0e521b0ab97e21087d8c9855
 DIST webkit-1.1.7.tar.gz 6205024 RMD160 63dea479e23b62ae6d0abb0e5559c35eed34466d SHA1 77d27ab8f0d74ddda349ea9e4416d27d9adb8b61 SHA256 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
 DIST webkit-1.1.8.tar.gz 6232745 RMD160 6c0cda8cbcf88c7d7104e0bcc6b910eada9213c0 SHA1 3b858495e293c0998a2652993a93ccbedff71839 SHA256 984929e42c6904893f5cd73f6506f858a3859d2ee1a56d69b4f7e9f62a0d2ffa
 EBUILD webkit-gtk-0_p40220-r1.ebuild 1862 RMD160 15dd702925a88f251b83b8fa22f284536a3920f9 SHA1 2b5eaada034d6f8a40e9650eebdbd2f26bee3c52 SHA256 be2a20030398ee4aec6bd614fb8fe66168fcaee1f98875c7af57fb6c11f84fb6
-EBUILD webkit-gtk-0_p46126.ebuild 2198 RMD160 44e3ca5f2d0edfc26bd81e7d4b24624e8fd44a71 SHA1 b65db072f39f3f7d1cf3c7d0b83c117a7b5506a2 SHA256 1c6a658ba57e55f5867fa3c29c2585b7c8fd22682ca8704ac1393c395b8ffe6c
+EBUILD webkit-gtk-0_p46193.ebuild 2325 RMD160 76ab86c5684f760e0bbf5ee70b1d6eab99de9b25 SHA1 76d60b652cebb9f7e4ef19d56a4c0bc6cfeada43 SHA256 4d346be2025614532c83ee897da51ca3a54c2090ada90ebfaadf814b1f72f9ca
 EBUILD webkit-gtk-1.1.10.ebuild 2290 RMD160 6b06fdca47877a0e0712e9837d99b2454b209519 SHA1 3400115cf5506713ba42b3969d15d7c5d66d7cfd SHA256 59cf1b543c610b7ca501007f1157ca58bab841e16f1f60e4f92a5837056eaa3c
 EBUILD webkit-gtk-1.1.7.ebuild 1966 RMD160 9ffaf403e0987743564692874d45c032951dcb00 SHA1 30b067da607985115868015f283ee03fc04c6711 SHA256 0865ae435fdff7c25befd23a9b8167f364a9e1d43000a7dcd59eaf999034f582
 EBUILD webkit-gtk-1.1.8.ebuild 2288 RMD160 f7653f76d0d4b2d6214b3d205d031da481c73ab4 SHA1 3dc6fb65ccbe7d077bc92915716ab776501c2515 SHA256 ea8066a8d5be3cab3b51c29fd15bc9df5c5cd088469e45854270d5e812c0b762
-MISC ChangeLog 9714 RMD160 925680121888113ef4cf4e4981bc6b1946e91e32 SHA1 53e393c4ed4718828de2e86fb1da8fe35ecebec9 SHA256 263d27d09f65d15d6262ef91e85fd270e64a86b515af7e4116b7c742e321b187
+MISC ChangeLog 10035 RMD160 f09d71c11e22703dd13eac14e1c5b861d9e11d3b SHA1 804f20099a07a874de6394201f2472ea22192bac SHA256 d299e415bf378c8f8f5f645a2b106c0f2703e63ebaae8b7565ff5fa9b328f24e
 MISC metadata.xml 531 RMD160 285606a7b4b22a9fd2f4374009b6bc920daa36f2 SHA1 abc9aa9a98cdd9eed2323509a8a9c92e9dc731e9 SHA256 c378730cdc83d29b2c94aee6dedece01b4f97a8fac3da2135510c32eea05a246
diff --git a/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild b/net-libs/webkit-gtk/webkit-gtk-0_p46193.ebuild
index e0b8f5e57c18..128528c25c8a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-0_p46193.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p46126.ebuild,v 1.3 2009/07/21 21:40:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p46193.ebuild,v 1.1 2009/07/21 23:20:13 jokey Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 -ia64 ppc -sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc -sparc ~x86 ~x86-fbsd"
 IUSE="coverage debug gstreamer pango soup sqlite svg wxwidgets xslt"
 
 RDEPEND=">=x11-libs/gtk+-2.8
@@ -41,9 +41,10 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-cxxmissing.patch"
-	epatch "${FILESDIR}/${P}-wxslot-gentoo.patch"
-	epatch "${FILESDIR}/${P}-wx-parallel-make.patch"
+	epatch "${FILESDIR}/${PN}-0_p46126-cxxmissing.patch"
+	epatch "${FILESDIR}/${PN}-0_p46126-wxslot-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-0_p46126-wx-parallel-make.patch"
+	epatch "${FILESDIR}/${PN}-0_p46193-bake.patch"
 	gtkdocize
 	eautoreconf
 }
@@ -72,10 +73,12 @@ src_configure() {
 
 src_compile() {
 	emake || die "emake failed"
-	read
+
 	if use wxwidgets ; then
 		# Upstream without further comment
-		cp DerivedSources/JSDataGridC* bindings/js
+		cd ${S}
+		cp DerivedSources/JSDataGridC*.{cpp,h} WebCore/bindings/js || die "copy failed"
+		
 		cd ${S}/WebKitTools/wx
 		./build-wxwebkit || die "wxwebkit build failed"
 	fi