Version bump, remove idn (bug #389483)

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

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index b664242b4ac25ed46fd75b12ad390326b471bba4..b1cea2f3c5bc8c212553fe388fc23c9b735cae70 100644 (file)
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +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.72 2011/10/28 20:11:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.73 2011/11/11 16:35:40 angelos Exp $
+
+*midori-0.4.2 (10 Nov 2011)
+
+  10 Nov 2011; Christoph Mende <angelos@gentoo.org> +midori-0.4.2.ebuild,
+  midori-9999.ebuild:
+  Version bump, remove idn (bug #389483)
 
   28 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Remove unused USE description for "vala"

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 7054fc51eb85d6c735c52eeb2569fd153a47f640..ffdee07bce80a8135463329dc0f9074136b4cc33 100644 (file)
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX midori-0.4.0-webkit151.patch 1797 RMD160 eef08ba9d83cb37d12c097d4ea0ce9d29b292b2f SHA1 82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c SHA256 645140a499c05174909d1060aa0caa71a7fe6f81033814e9934f445a22e89275
 DIST midori-0.4.0.tar.bz2 913425 RMD160 f3449a2b830cdb99035a9bd9162159867bea93d0 SHA1 c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585 SHA256 0ac31b008b44e08cf0536a38405a0ecc2da7c28e3d549915325dbba74f74cd75
 DIST midori-0.4.1.tar.bz2 905412 RMD160 5eb2f8007d616f468517a6ca4acc3a3878e961b2 SHA1 0c499459b1049feabf86dce89f49020139a9efd9 SHA256 b3c77ddb6f562a0ea3d2e6fbb756ca0dc158ad8410f4b60f8e5998c2f7305f07
+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-9999.ebuild 1699 RMD160 2e479e3a09f78af676de358950acd5866fd1295f SHA1 27a3e3ee54d4399e4f24f2d5d87b951f71d01174 SHA256 1f84954fb3085d4371c0601dd045ce6148b4e7d65e5f42d9fad73dc36a787d08
-MISC ChangeLog 10788 RMD160 c2b9e11f1c0d95365397a79081fe01904d4af0ba SHA1 8096077a651ce88a69a6159c8173e2ab049183bf SHA256 63e30604895ceca482ea39b943c3a45d5cc831b9cc89f53d2708c344299f12ea
+EBUILD midori-0.4.2.ebuild 1661 RMD160 2f85449ee74ea950cb35cac8d9b5283d1be863fd SHA1 a47e27ba3e699825b3957ee097662a322a85ca03 SHA256 fdc32245938f3118981d63bf7ed6e376fc5380af32f9f5f9ea68749dc3a60e93
+EBUILD midori-9999.ebuild 1626 RMD160 627bfffca38c9cc87d28e87b6fed4884e8a514a7 SHA1 f90c7c8655c8157cb73fccfa80dfbbab8068caa9 SHA256 3b9eaf47d8504e66f10e79b42870310339678b50fe8b85e04e0b866c2e5f7c40
+MISC ChangeLog 10953 RMD160 bed6b562b9e960d91fcca211251851c3d9dbdace SHA1 f19e294ac4227eb19eb4d62735c3fb9db66a7f33 SHA256 b5b24236e4f19e96bd2840ad0cdbdb092a4ccf96c3a3fa7af96acbcdcd68f429
 MISC metadata.xml 274 RMD160 3ae0219141cb6e103701de78f56f37f72351b20d SHA1 0458b3f1368ca30ad19355d7db79eb406e2761fb SHA256 5d1336bd8e7ed8f67cfb304d72be04a5bcb18c221e4fbeb9ae68331f5e99d9ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOqwwdAAoJEEdUh39IaPFNq2cH/2fp/UwSCO9L4wywnohChoPh
-noAMOqkuQ5QjSSZ8KPpOdlEYoaTvCo16lQenpvy2t1SdG9GpEVTGyuvk+aEpiKGE
-BBX+g6wbTdKZeubFnCIZJy0NwAOSyTVtPPXFeh3nJQE0LGQGAgs86s5cQHPrlUCa
-5JYlsoziuw5a9mRMple5eOn6wWmFGyVZ/6OFcgE+X4oJB94AjvMKpFHA+SV/igwz
-eaQ6V1p3LpMwOkh/0GabPd1qO5wJRCeQk37iphmpHJuHemjkkkzytwKXmx3eagoP
-7Lam7gkFydSMVtf3AHSHesQxAjy0xus40zrsn/WuBrDMWaHloTB+rh1eU208umE=
-=PWBm
+iF4EAREIAAYFAk68Pn8ACgkQmWq1bYTyC0NmfAEAjtffJbkxN//CpeibsBwkc7mW
+h3xwV/whFMckbdOysIAA/jht60zT7PHIQKpDd23uNm3Xw9n+B3wmJjjRuQUPD+pT
+=dcz4
 -----END PGP SIGNATURE-----

diff --git a/www-client/midori/midori-0.4.2.ebuild b/www-client/midori/midori-0.4.2.ebuild
new file mode 100644 (file)
index 0000000..ba6d8cc
--- /dev/null
+++ b/www-client/midori/midori-0.4.2.ebuild
@@ -0,0 +1,68 @@
+# 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.ebuild,v 1.1 2011/11/11 16:35:40 angelos Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils python waf-utils
+
+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}/0.4/${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-libs/libxml2:2
+       dev-db/sqlite:3
+       net-libs/libsoup:2.4
+       net-libs/webkit-gtk:2
+       x11-libs/gtk+:2
+       x11-libs/libXScrnSaver
+       gnome? ( net-libs/libsoup-gnome:2.4 )
+       libnotify? ( x11-libs/libnotify )
+       unique? ( dev-libs/libunique:1 )"
+DEPEND="${RDEPEND}
+       || ( dev-lang/python:2.7 dev-lang/python:2.6 )
+       dev-lang/vala:0.10
+       dev-util/intltool
+       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-0.10)" \
+       waf-utils_src_configure \
+               --disable-docs \
+               --enable-addons \
+               $(use_enable doc apidocs) \
+               $(use_enable libnotify) \
+               $(use_enable nls) \
+               $(use_enable unique)
+}
+
+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
+}

diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index df0dbd0fa6dae6bcf0a882fcd57b8666581f331d..f0be277fa414862be4fd936fe74f0a7a5cd00233 100644 (file)
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,8 +1,8 @@
 # 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-9999.ebuild,v 1.36 2011/10/28 20:08:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.37 2011/11/11 16:35:40 angelos Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils fdo-mime gnome2-utils python waf-utils git-2
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
@@ -12,16 +12,15 @@ EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc gnome idn libnotify nls +unique"
+IUSE="doc gnome libnotify nls +unique"
 
 RDEPEND="dev-libs/libxml2:2
-       >=dev-db/sqlite-3.0
-       >=net-libs/libsoup-2.25.2:2.4
+       dev-db/sqlite:3
+       net-libs/libsoup:2.4
        net-libs/webkit-gtk:2
        x11-libs/gtk+:2
        x11-libs/libXScrnSaver
        gnome? ( net-libs/libsoup-gnome:2.4 )
-       idn? ( net-dns/libidn )
        libnotify? ( x11-libs/libnotify )
        unique? ( dev-libs/libunique:1 )"
 DEPEND="${RDEPEND}
@@ -47,7 +46,6 @@ src_configure() {
                --disable-docs \
                --enable-addons \
                $(use_enable doc apidocs) \
-               $(use_enable idn libidn) \
                $(use_enable libnotify) \
                $(use_enable nls) \
                $(use_enable unique)