commit: f64bf72a114db2bf3b10c26e69a9eba75efc0615
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 12:01:52 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 13:34:38 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f64bf72a
gnome-extra/gtkhtml: 4.6.6 → 4.8.0
---
.../{gtkhtml-9999.ebuild => gtkhtml-4.8.0.ebuild} | 16 +++++-----------
gnome-extra/gtkhtml/gtkhtml-9999.ebuild | 2 +-
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
b/gnome-extra/gtkhtml/gtkhtml-4.8.0.ebuild
similarity index 72%
copy from gnome-extra/gtkhtml/gtkhtml-9999.ebuild
copy to gnome-extra/gtkhtml/gtkhtml-4.8.0.ebuild
index ec8839b..641b92a 100644
--- a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.8.0.ebuild
@@ -6,23 +6,18 @@ EAPI="5"
GCONF_DEBUG="no"
inherit gnome2
-[[ ${PV} = 9999 ]] && inherit gnome2-live
DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
HOMEPAGE="http://projects.gnome.org/evolution/";
LICENSE="GPL-2+ LGPL-2+"
SLOT="4.0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE=""
# orbit is referenced in configure, but is not used anywhere else
RDEPEND="
- >=x11-libs/gtk+-3.0.2:3
+ >=x11-libs/gtk+-3.2:3
>=x11-libs/cairo-1.10:=
x11-libs/pango
>=x11-themes/gnome-icon-theme-2.22.0
@@ -43,10 +38,9 @@ src_prepare() {
ELTCONF="--reverse-deps"
# Regenerate marshallers for <glib-2.31 compatibility
- if [[ ${PV} != 9999 ]]; then
- rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
- components/editor/gtkhtml-editor-marshal.{c,h} || die
- fi
+ rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
+ components/editor/gtkhtml-editor-marshal.{c,h} || die
+
gnome2_src_prepare
}
diff --git a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
index ec8839b..6b27c95 100644
--- a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
@@ -22,7 +22,7 @@ IUSE=""
# orbit is referenced in configure, but is not used anywhere else
RDEPEND="
- >=x11-libs/gtk+-3.0.2:3
+ >=x11-libs/gtk+-3.2:3
>=x11-libs/cairo-1.10:=
x11-libs/pango
>=x11-themes/gnome-icon-theme-2.22.0
