diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-15 12:50:14 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-15 12:50:14 +0000 |
commit | efd0414ba79f6094149d7be09d4e143bab5a7761 (patch) | |
tree | e375d47a0c4672b0c8bcac017f06e0c3f50244d8 /www-client/midori | |
parent | amd64/ppc/ppc64/x86 stable wrt #412089 (diff) | |
download | gentoo-2-efd0414ba79f6094149d7be09d4e143bab5a7761.tar.gz gentoo-2-efd0414ba79f6094149d7be09d4e143bab5a7761.tar.bz2 gentoo-2-efd0414ba79f6094149d7be09d4e143bab5a7761.zip |
Version bump. Introduce USE="deprecated" to enable GTK+-2 instead of GTK+-3 for external plugins like adobe-flash wrt #410841 by Klaus Kusche.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'www-client/midori')
-rw-r--r-- | www-client/midori/ChangeLog | 9 | ||||
-rw-r--r-- | www-client/midori/metadata.xml | 1 | ||||
-rw-r--r-- | www-client/midori/midori-0.4.5.ebuild | 97 | ||||
-rw-r--r-- | www-client/midori/midori-9999.ebuild | 46 |
4 files changed, 141 insertions, 12 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog index dfe87182c05a..43bdfe5c801e 100644 --- a/www-client/midori/ChangeLog +++ b/www-client/midori/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/midori # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.85 2012/03/09 14:33:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.86 2012/04/15 12:50:14 ssuominen Exp $ + +*midori-0.4.5 (15 Apr 2012) + + 15 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> +midori-0.4.5.ebuild, + midori-9999.ebuild, metadata.xml: + Version bump. Introduce USE="deprecated" to enable GTK+-2 instead of GTK+-3 + for external plugins like adobe-flash wrt #410841 by Klaus Kusche. *midori-0.4.4 (09 Mar 2012) diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml index 79f168f61d12..2653f68aafff 100644 --- a/www-client/midori/metadata.xml +++ b/www-client/midori/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>xfce</herd> <use> + <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag> <flag name='unique'>Enable single instance support using <pkg>dev-libs/libunique</pkg></flag> </use> </pkgmetadata> diff --git a/www-client/midori/midori-0.4.5.ebuild b/www-client/midori/midori-0.4.5.ebuild new file mode 100644 index 000000000000..d0a11f049fc2 --- /dev/null +++ b/www-client/midori/midori-0.4.5.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.5.ebuild,v 1.1 2012/04/15 12:50:14 ssuominen Exp $ + +EAPI=4 + +unset _live_inherits + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://git.xfce.org/apps/${PN}" + _live_inherits=git-2 +else + KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" + SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" +fi + +inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits} + +PV_vala_version=0.14 + +DESCRIPTION="A lightweight web browser based on WebKitGTK+" +HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html" + +LICENSE="LGPL-2.1 MIT" +SLOT="0" +IUSE="+deprecated doc gnome libnotify nls +unique" + +RDEPEND="dev-db/sqlite:3 + >=dev-libs/glib-2.22 + dev-libs/libxml2 + net-libs/libsoup:2.4 + x11-libs/libXScrnSaver + deprecated? ( + net-libs/webkit-gtk:2 + x11-libs/gtk+:2 + unique? ( dev-libs/libunique:1 ) + ) + !deprecated? ( + net-libs/webkit-gtk:3 + x11-libs/gtk+:3 + unique? ( dev-libs/libunique:3 ) + ) + gnome? ( net-libs/libsoup-gnome:2.4 ) + libnotify? ( >=x11-libs/libnotify-0.7 )" +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_unpack() { + if [[ ${PV} == *9999* ]]; then + git-2_src_unpack + else + default + fi +} + +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) \ + $(use_enable !deprecated 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 +} diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild index 76748a13044a..54fd1187c308 100644 --- a/www-client/midori/midori-9999.ebuild +++ b/www-client/midori/midori-9999.ebuild @@ -1,31 +1,47 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.39 2011/11/28 23:41:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.40 2012/04/15 12:50:14 ssuominen Exp $ EAPI=4 -inherit eutils fdo-mime gnome2-utils python waf-utils git-2 + +unset _live_inherits + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://git.xfce.org/apps/${PN}" + _live_inherits=git-2 +else + KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" + SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" +fi + +inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits} PV_vala_version=0.14 DESCRIPTION="A lightweight web browser based on WebKitGTK+" HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html" -EGIT_REPO_URI="git://git.xfce.org/apps/${PN}" LICENSE="LGPL-2.1 MIT" SLOT="0" -KEYWORDS="" -IUSE="doc gnome libnotify nls +unique" +IUSE="+deprecated 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 + deprecated? ( + net-libs/webkit-gtk:2 + x11-libs/gtk+:2 + unique? ( dev-libs/libunique:1 ) + ) + !deprecated? ( + net-libs/webkit-gtk:3 + x11-libs/gtk+:3 + unique? ( dev-libs/libunique:3 ) + ) gnome? ( net-libs/libsoup-gnome:2.4 ) - libnotify? ( x11-libs/libnotify ) - unique? ( dev-libs/libunique:3 )" + libnotify? ( >=x11-libs/libnotify-0.7 )" DEPEND="${RDEPEND} || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:${PV_vala_version} @@ -42,6 +58,14 @@ pkg_setup() { HTML_DOCS=( data/faq.html data/faq.css ) } +src_unpack() { + if [[ ${PV} == *9999* ]]; then + git-2_src_unpack + else + default + fi +} + src_configure() { strip-linguas -i po @@ -53,7 +77,7 @@ src_configure() { $(use_enable libnotify) \ --enable-addons \ $(use_enable nls) \ - --enable-gtk3 + $(use_enable !deprecated gtk3) } pkg_preinst() { |