Commit GTK+-3.x version to ~ərch for last release.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 32af94b81b9f8cbaf8f653baddd45c39ca2edd14..88f02924f050c23cc6fd06b55ffac87f0a428b58 100644 (file)
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.74 2011/11/28 23:39:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.75 2011/11/28 23:48:27 ssuominen Exp $
 
-  28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> midori-9999.ebuild:
-  Change to GTK+ 3.x and Vala 0.14.
+*midori-0.4.2-r300 (28 Nov 2011)
+
+  28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +midori-0.4.2-r300.ebuild, midori-9999.ebuild:
+  Update to GTK+ 3.x based libraries.
 
 *midori-0.4.2 (10 Nov 2011)
 

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index bd2144fe7a0331c6c4533b3abf7b4fe94a88aa55..3efee197fc92b05e8f692ef98497fa299b5f99e1 100644 (file)
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -7,18 +7,19 @@ DIST midori-0.4.1.tar.bz2 905412 RMD160 5eb2f8007d616f468517a6ca4acc3a3878e961b2
 DIST midori-0.4.2.tar.bz2 923897 RMD160 ca16f66bafa4dcb49b0cfbcef9900cee94a0066b SHA1 fac3dc4bb8935f35b38ffc4d6c7a5daba9dc52f1 SHA256 2e3f104254fb9a28c77e8acf1cc8ae6dd529499711d558b29146ab0fa915f0a7
 EBUILD midori-0.4.0.ebuild 1780 RMD160 136c713c1e2d3fa2199627656014b2b8d27aedb0 SHA1 ecc9c15cf6a9eaa340acd023c93ecd033b380909 SHA256 55318698495f9ac8fdc92b55565a68a9170021e79c44138637ef74e2a99cde4a
 EBUILD midori-0.4.1.ebuild 1734 RMD160 a1f244d12bf4338e824c2de6fa439483980bd428 SHA1 681a5b9f95b1372a15b079946c213044abad4f91 SHA256 bce3ab3d8b0d2257ee8409b5dbbfc4afb798d5e57a2e7a14e243de3e2d3b4bca
+EBUILD midori-0.4.2-r300.ebuild 1784 RMD160 fd13163ab3f06290bceb5b72a75566a20ff2a69b SHA1 aec05a45eee283b62b2581c906c71e43584325d1 SHA256 1d653486b43036c8e284b6f7fa9044c1f57e224b5d62a2f04eae181cfe381144
 EBUILD midori-0.4.2.ebuild 1661 RMD160 2f85449ee74ea950cb35cac8d9b5283d1be863fd SHA1 a47e27ba3e699825b3957ee097662a322a85ca03 SHA256 fdc32245938f3118981d63bf7ed6e376fc5380af32f9f5f9ea68749dc3a60e93
 EBUILD midori-9999.ebuild 1739 RMD160 a07286e21a46df4ea6c429323292bf2c657bc542 SHA1 941b8a4cebe73b8c492a77f99e26fe96ba853a56 SHA256 27319ebac22d2ff993c837720eca2f4527376f95a4170c6735943720a2232178
-MISC ChangeLog 11066 RMD160 29969634c648857aaafb998c593de468b8f7bb8d SHA1 bbb9e555d6a0b1fdb74bceda94bdebf6826423f0 SHA256 877b74fc2fa222475b2fb816848638b52b23bef4dba50eb9e20940c0b55cb2ac
+MISC ChangeLog 11131 RMD160 4da1cbc2568dd79aebd229810e9a2913e9203fb9 SHA1 996e840804212d3bd4779e018d2bfcf2c948a410 SHA256 e47b4e5871175bcbb7c839d8268b97fab75fad2de868d58e73fd5e3e18a58957
 MISC metadata.xml 274 RMD160 3ae0219141cb6e103701de78f56f37f72351b20d SHA1 0458b3f1368ca30ad19355d7db79eb406e2761fb SHA256 5d1336bd8e7ed8f67cfb304d72be04a5bcb18c221e4fbeb9ae68331f5e99d9ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO1BuZAAoJEEdUh39IaPFNiH4H/2XdKQUWgryMcWAlCou7GvEG
-qmQrS3N9z/o1npUBJxID8pIMRROL722/c3nEYS0M7uRK7BXhwAvNGNplj745dCeG
-oWq5yZR5YbGQJloiVwUuq97IuCY0wZxKy+3+36jo/TfLzx6TSGDG1cQLnAKD9ggQ
-P7cpqIhaLsWklLou8iCG+UYiQkg20MVk77QQ/YB3atqwobfHM48xa0irIcmrCnbQ
-84hIng79mu34M2H9E0o59ttka2wkZrTTxIEqvZkShrapQxk/z4OhyHUT/LQikSSG
-BUV+19/soHYvTFJx2b1plDmwM6NBUtuABp9C8vcJzRF9ayg0HDjUgfCgqXKyu8o=
-=DgfK
+iQEcBAEBAgAGBQJO1B05AAoJEEdUh39IaPFNSIIIAIuWaruvRilxXX2yPNKo7zX7
+WxGXy7rNa8nu95kSsvCqd+AkN1KvOVC7ZMD41s11qjAgFDK2qLLe3yZqYr8dHs5H
+jIqXdCxX7ujF6rC6QLfFf8uXWJ3bswiNf9VPCZSqHm9WcHm1+HE/fe1z7pHzrYuX
+VmE25w0wr1nXBZ09GbGp/fr5rS+YHFXNd6eDcxBvrNEVZAd2Au8Pf6KLZOtOU529
+vks23t2j5qDzYzpevP2/YPXtH9lW4V+NLB47mCuL5W7hgJHpCEz2coiqVWmDJnnE
+cl+/op9kmui7hWSoO6ZYx+cOF27TM+MhX7yRnKXfsHJkE8Ru8WJHaBa/5cyUsRI=
+=W9hD
 -----END PGP SIGNATURE-----

diff --git a/www-client/midori/midori-0.4.2-r300.ebuild b/www-client/midori/midori-0.4.2-r300.ebuild
new file mode 100644 (file)
index 0000000..0ad9d9e
--- /dev/null
+++ b/www-client/midori/midori-0.4.2-r300.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.2-r300.ebuild,v 1.1 2011/11/28 23:48:27 ssuominen Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils python waf-utils
+
+PV_vala_version=0.14
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="doc gnome libnotify nls +unique"
+
+RDEPEND="dev-db/sqlite:3
+       >=dev-libs/glib-2.22
+       dev-libs/libxml2
+       net-libs/libsoup:2.4
+       net-libs/webkit-gtk:3
+       x11-libs/gtk+:3
+       x11-libs/libXScrnSaver
+       gnome? ( net-libs/libsoup-gnome:2.4 )
+       libnotify? ( x11-libs/libnotify )
+       unique? ( dev-libs/libunique:3 )"
+DEPEND="${RDEPEND}
+       || ( dev-lang/python:2.7 dev-lang/python:2.6 )
+       dev-lang/vala:${PV_vala_version}
+       dev-util/intltool
+       gnome-base/librsvg
+       doc? ( dev-util/gtk-doc )
+       nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+
+       DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
+       HTML_DOCS=( data/faq.html data/faq.css )
+}
+
+src_configure() {
+       strip-linguas -i po
+
+       VALAC="$(type -P valac-${PV_vala_version})" \
+       waf-utils_src_configure \
+               --disable-docs \
+                $(use_enable doc apidocs) \
+                $(use_enable unique) \
+                $(use_enable libnotify) \
+               --enable-addons \
+               $(use_enable nls) \
+               --enable-gtk3
+}
+
+pkg_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_database_update
+       gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_database_update
+       gnome2_icon_cache_update
+}