summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-05-12 16:33:34 +0000
committerPacho Ramos <pacho@gentoo.org>2013-05-12 16:33:34 +0000
commit58d0066efc06ba62d5d9471211f803db1d4d8b6a (patch)
tree4b3d7bf5ab72a399996325a5bc6640e5219f9f77 /gnome-extra/gtkhtml
parentVersion bump, drop old (diff)
downloadgentoo-2-58d0066efc06ba62d5d9471211f803db1d4d8b6a.tar.gz
gentoo-2-58d0066efc06ba62d5d9471211f803db1d4d8b6a.tar.bz2
gentoo-2-58d0066efc06ba62d5d9471211f803db1d4d8b6a.zip
Version bump, drop old
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-extra/gtkhtml')
-rw-r--r--gnome-extra/gtkhtml/ChangeLog8
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild54
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-4.6.5.ebuild (renamed from gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild)34
3 files changed, 25 insertions, 71 deletions
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index c8665a8bb12f..2d20c5c56e6b 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-extra/gtkhtml
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.279 2013/04/09 16:43:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.280 2013/05/12 16:33:34 pacho Exp $
+
+*gtkhtml-4.6.5 (12 May 2013)
+
+ 12 May 2013; Pacho Ramos <pacho@gentoo.org> +gtkhtml-4.6.5.ebuild,
+ -gtkhtml-4.4.3.ebuild, -gtkhtml-4.4.4.ebuild:
+ Version bump, drop old
09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> gtkhtml-4.6.4.ebuild:
Stable for sh, wrt bug #458984
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild
deleted file mode 100644
index 167acf8677f4..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild,v 1.9 2013/03/29 22:46:26 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="sh sparc"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND=">=x11-libs/gtk+-3.0.2:3
- >=x11-libs/cairo-1.10
- x11-libs/pango
- >=x11-themes/gnome-icon-theme-2.22.0
- >=app-text/enchant-1.1.7
- gnome-base/gsettings-desktop-schemas
- >=app-text/iso-codes-0.49
- >=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- sys-devel/gettext
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig"
-
-pkg_setup() {
- ELTCONF="--reverse-deps"
- G2CONF="${G2CONF}
- --disable-static"
- DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
- # Regenerate marshallers for <glib-2.31 compatibility
- rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
- components/editor/gtkhtml-editor-marshal.{c,h} || die
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
-
- elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test-${SLOT}"
- # Don't collide with 3.14 slot
- mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.6.5.ebuild
index 2c95ce54cef3..71a235529daf 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.6.5.ebuild
@@ -1,54 +1,56 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild,v 1.4 2013/03/29 22:46:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.6.5.ebuild,v 1.1 2013/05/12 16:33:34 pacho Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 eutils
+inherit gnome2
DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
HOMEPAGE="http://projects.gnome.org/evolution/"
LICENSE="GPL-2+ LGPL-2+"
SLOT="4.0"
-KEYWORDS="alpha"
+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/cairo-1.10
+RDEPEND="
+ >=x11-libs/gtk+-3.0.2:3
+ >=x11-libs/cairo-1.10:=
x11-libs/pango
>=x11-themes/gnome-icon-theme-2.22.0
- >=app-text/enchant-1.1.7
+ >=app-text/enchant-1.1.7:=
gnome-base/gsettings-desktop-schemas
>=app-text/iso-codes-0.49
- >=net-libs/libsoup-2.26.0:2.4"
+ >=net-libs/libsoup-2.26.0:2.4
+"
DEPEND="${RDEPEND}
x11-proto/xproto
sys-devel/gettext
>=dev-util/intltool-0.40.0
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
-pkg_setup() {
+src_prepare() {
ELTCONF="--reverse-deps"
- G2CONF="${G2CONF}
- --disable-static"
- DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
-src_prepare() {
# Regenerate marshallers for <glib-2.31 compatibility
rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
components/editor/gtkhtml-editor-marshal.{c,h} || die
+
gnome2_src_prepare
}
+src_configure() {
+ gnome2_src_configure --disable-static
+}
+
src_install() {
gnome2_src_install
- elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test-${SLOT}"
# Don't collide with 3.14 slot
mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
}