gnome-extra/gtkhtml: bump to EAPI=5

1 files changed, 20 insertions, 34 deletions

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
index f65a362..64cdc5b 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/Attic/gtkhtml-3.32.2.ebuild,v 1.10 2014/11/13 11:59:18 pacho dead $
+# $Header: $
 
-EAPI="3"
+EAPI="5"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit eutils gnome2
 
@@ -12,50 +13,35 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3.14"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
+	>=app-text/enchant-1.1.7
+	>=app-text/iso-codes-0.49
 	>=dev-libs/glib-2.24:2
+	gnome-base/gconf:2
+	>=gnome-base/orbit-2
+	>=net-libs/libsoup-2.26.0:2.4
 	>=x11-libs/gtk+-2.20:2
 	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=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
-		--disable-deprecated-warning-flags"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
 
 src_prepare() {
 	# Fix build with recent glib, bug #436462
 	epatch "${FILESDIR}/${P}-g_thread_init.patch"
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	# Remove .la files since old will be removed anyway while updating
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
 
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgtkhtml-editor.so.0
+	ELTCONF="--reverse-deps" gnome2_src_prepare
 }
 
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgtkhtml-editor.so.0
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-deprecated-warning-flags
 }