Bump to 0.23. Now uses webkit for rendering. Drop old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 33 insertions, 89 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 448b47a3b11b..1e9c3b95129b 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.87 2009/04/12 21:25:45 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.88 2009/06/01 20:08:59 eva Exp $
+
+*devhelp-0.23 (01 Jun 2009)
+
+  01 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org> -devhelp-0.19.ebuild,
+  -devhelp-0.19.1.ebuild, +devhelp-0.23.ebuild:
+  Bump to 0.23. Now uses webkit for rendering. Drop old revisions.
 
   12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> devhelp-0.21.ebuild:
   Stable on sparc, bug #260063
diff --git a/dev-util/devhelp/devhelp-0.19.1.ebuild b/dev-util/devhelp/devhelp-0.19.1.ebuild
deleted file mode 100644
index e9f8a89bca84..000000000000
--- a/dev-util/devhelp/devhelp-0.19.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.19.1.ebuild,v 1.3 2008/06/07 14:36:18 jer Exp $
-
-inherit toolchain-funcs gnome2 python
-
-DESCRIPTION="An API documentation browser for GNOME 2"
-HOMEPAGE="http://developer.imendio.com/wiki/Devhelp"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="xulrunner zlib"
-
-RDEPEND=">=gnome-base/gconf-2.6
-	>=x11-libs/gtk+-2.8
-	>=dev-libs/glib-2.8
-	>=gnome-base/libglade-2.4
-	>=x11-libs/libwnck-2.10
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.35.5
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_setup() {
-	G2CONF="$(use_with zlib)"
-
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		G2CONF="${G2CONF} --with-compile-warnings=no"
-	fi
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins/devhelp
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/devhelp/devhelp-0.19.ebuild b/dev-util/devhelp/devhelp-0.23.ebuild
index 309231584127..9a31bf5fb2b4 100644
--- a/dev-util/devhelp/devhelp-0.19.ebuild
+++ b/dev-util/devhelp/devhelp-0.23.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.19.ebuild,v 1.6 2008/05/29 16:43:27 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.23.ebuild,v 1.1 2009/06/01 20:08:59 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
 
 inherit toolchain-funcs gnome2 python
 
@@ -9,52 +12,47 @@ HOMEPAGE="http://developer.imendio.com/wiki/Devhelp"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="xulrunner zlib"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
 
 RDEPEND=">=gnome-base/gconf-2.6
-	>=x11-libs/gtk+-2.8
-	>=dev-libs/glib-2.8
-	>=gnome-base/libglade-2.4
+	>=x11-libs/gtk+-2.10
+	>=dev-libs/glib-2.10
 	>=x11-libs/libwnck-2.10
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	zlib? ( sys-libs/zlib )"
+	net-libs/webkit-gtk"
 DEPEND="${RDEPEND}
 	  sys-devel/gettext
-	>=dev-util/intltool-0.35.5
+	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
 pkg_setup() {
-	G2CONF="$(use_with zlib)"
-
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-
 	# ICC is crazy, silence warnings (bug #154010)
 	if [[ $(tc-getCC) == "icc" ]] ; then
 		G2CONF="${G2CONF} --with-compile-warnings=no"
 	fi
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	rm build/py-compile
+	ln -s $(type -P true) build/py-compile
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}
+
 pkg_postinst() {
+	gnome2_pkg_postinst
 	python_version
+	python_need_rebuild
 	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins/devhelp
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins/devhelp
 }