* [gentoo-commits] gentoo-x86 commit in www-client/midori: metadata.xml ChangeLog midori-0.4.5.ebuild midori-9999.ebuild
@ 2012-04-15 12:50 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2012-04-15 12:50 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/04/15 12:50:14
Modified: metadata.xml ChangeLog midori-9999.ebuild
Added: midori-0.4.5.ebuild
Log:
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)
Revision Changes Path
1.12 www-client/midori/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?r1=1.11&r2=1.12
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/metadata.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- metadata.xml 28 Oct 2011 20:11:16 -0000 1.11
+++ metadata.xml 15 Apr 2012 12:50:14 -0000 1.12
@@ -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>
1.86 www-client/midori/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.85&r2=1.86
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog 9 Mar 2012 14:33:47 -0000 1.85
+++ ChangeLog 15 Apr 2012 12:50:14 -0000 1.86
@@ -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)
1.40 www-client/midori/midori-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.39&r2=1.40
Index: midori-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- midori-9999.ebuild 28 Nov 2011 23:41:30 -0000 1.39
+++ midori-9999.ebuild 15 Apr 2012 12:50:14 -0000 1.40
@@ -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 @@
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 @@
$(use_enable libnotify) \
--enable-addons \
$(use_enable nls) \
- --enable-gtk3
+ $(use_enable !deprecated gtk3)
}
pkg_preinst() {
1.1 www-client/midori/midori-0.4.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.5.ebuild?rev=1.1&content-type=text/plain
Index: midori-0.4.5.ebuild
===================================================================
# 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-15 12:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-15 12:50 [gentoo-commits] gentoo-x86 commit in www-client/midori: metadata.xml ChangeLog midori-0.4.5.ebuild midori-9999.ebuild Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox