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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 46 insertions, 94 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/Manifest b/dev-util/devhelp/Manifest
index 6ddf8ec4ca82..81ddf83bee50 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX devhelp-0.21-xulrunner19.patch 1299 RMD160 2e3801569bf600a3f7cd3a96fa88b4697ca09f4d SHA1 aa517228fc0f62b8396d137eead6223fb72a98bb SHA256 920fe91fc14d4d1a3f6bd668c7575d7a83fb16159a676c60c9941e89518e2fb5
-DIST devhelp-0.19.1.tar.bz2 533193 RMD160 4519e96492adff79f5aeafcafa88815f03a9f592 SHA1 6e0f82d3a7128fd3d29038560264b4960ac6ac63 SHA256 be447b9496b09e97bde51e6d638c94e6e4718feebe6b3c76cf256a18baf22e4f
-DIST devhelp-0.19.tar.bz2 517745 RMD160 d6fb8b820d448459c219a360a2aca569960b5f02 SHA1 8d0976b4004a156b491379befb55391208d8a945 SHA256 1a4f6d27099bbfd0df3278b74ced042699d79abad441407fedcfce0f8400115e
 DIST devhelp-0.21.tar.bz2 549576 RMD160 885112d07c86a4d1c91a46bfc74ff6638c9a6c92 SHA1 3acf06d8d58cbae5319795a59d987b97e4ec849e SHA256 f2f76e1804afcad248216d494ebc331b670851ccf701dacd295baf87f1273c20
-EBUILD devhelp-0.19.1.ebuild 1400 RMD160 c886f6ff92b9370d11e997b11509dcc043c6534f SHA1 fb9ab31af4aa4ae064a1f5a51896041765e44016 SHA256 e2e89d30abf33410b1ebb77914ead2b42430e1a4e0f2ce179d7e61120ea0567e
-EBUILD devhelp-0.19.ebuild 1392 RMD160 392e77878af3dea89a9452ab0cd09a98a1e53f28 SHA1 134e8775603d44f69faec0cf317e0b8bc3c091ca SHA256 8d9899fe994338ffada68a247b7f95ee84d008013812c865f0587168cc9a65f8
+DIST devhelp-0.23.tar.bz2 521287 RMD160 324b74336570291c1a966e63c2d7450f3ae7b678 SHA1 a7ed9c56cd77bb46fb041df539285ce3012ad177 SHA256 60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2
 EBUILD devhelp-0.21-r1.ebuild 1619 RMD160 0c26306431617d499c40a21cc1e540b0e8f3c837 SHA1 5dbc39c15bcda4309146af8826eef25647eb91dc SHA256 d52791d57f11062abbf04eb94cd78a3b70cc476e9289b54069322d32e296b230
 EBUILD devhelp-0.21.ebuild 1236 RMD160 9ec02b568c07fa0ece80c3bf7e73e8c924006743 SHA1 cf7b83bb13210a7a38229006079dc5372b6295c3 SHA256 b147fd1bad429e0c443782420bdfa2ac7582c40168942ce248220c0010d68e57
-MISC ChangeLog 11174 RMD160 f09a4a6254dd73a03fb264383aea9085c7c9543e SHA1 175a0a2682c63bf5e769fa36a88b4f5c36d1ebe9 SHA256 dfaba6d54fce3074983ac10a9aa204e338af0eec2e2a1512e8fea2d7440b2dea
+EBUILD devhelp-0.23.ebuild 1375 RMD160 532dcb002b985b906b513d12d027eae68a65ebc6 SHA1 d64229eacc2383cce3091d50cf0d2fbace398b12 SHA256 50c8e688daa5207e67a04db63764c9b6154f46ac6efb6d8440a734207855e5bb
+MISC ChangeLog 11390 RMD160 02afead583034da9b3b4789c27684a302913121a SHA1 6776c4d45bd53ddf62e5d34be092e96c9f3d1878 SHA256 1b8ce087feeae1c5072429cac92509226af10c911665a5e3f91d37a3e64556d8
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkokNWYACgkQ1fmVwcYIWAZGEACg6AZPI8/ThEOIIcDGE3BAFhbf
+Cq8An2dx73b8Yq8Aa2R9LKWTUSeSVrXQ
+=dgg6
+-----END PGP SIGNATURE-----
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
 }