Bump to 0.21-r1. Allow to build against libxul, bug #250306. Add a warning for gedit plugin, bug #245235.

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

4 files changed, 63 insertions, 14 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index f2390fd90ae6..810efa36b2f9 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.83 2009/03/15 22:03:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.84 2009/03/21 22:13:48 eva Exp $
+
+*devhelp-0.21-r1 (21 Mar 2009)
+
+  21 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/devhelp-0.21-xulrunner19.patch, -devhelp-0.20.ebuild,
+  +devhelp-0.21-r1.ebuild:
+  Bump to 0.21-r1. Allow to build against libxul, bug #250306. Add a warning
+  for gedit plugin, bug #245235.
 
   15 Mar 2009; Markus Meier <maekke@gentoo.org> devhelp-0.21.ebuild:
   x86 stable, bug #260063
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 1de3ed1c7bd0..1a95a16497c0 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,20 +1,20 @@
 -----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.20.tar.bz2 546584 RMD160 23bb4e68a25d6b3450a3a9beaf8e2942440ebbe1 SHA1 ad2d4fc9eacd3c368bd18e55785ab4ed91815cec SHA256 caa4aee811171d7f3d8a4879859e7a58a6a0e79aae828d64256ef90fd7480ec1
 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
-EBUILD devhelp-0.20.ebuild 1239 RMD160 ab6d44fca9b8bff70c71f0d53dd0d7a4137eeceb SHA1 4e0b8b7ad90438e8f5f2be1fdc5948093b7f93b0 SHA256 8181d2c05de37a5181b0e6fe16664cb95ca91ad1b2c99c4e83122871e0bb5473
+EBUILD devhelp-0.21-r1.ebuild 1615 RMD160 db61d0ec323333e11dcc145e0766de977fda65f1 SHA1 556cf32608975065bd602ed25ac4721348170d18 SHA256 f4a3042f29c171da1c7bfe78ba795efaa76e2e3928adce0e55be327d4acdef1e
 EBUILD devhelp-0.21.ebuild 1235 RMD160 e2def2cdfd5fb23b434b681b11269bde682524e1 SHA1 f7d9edeb1a7e25b9c45e8097a52e14809b4aa218 SHA256 1a14adda1f2ddc483232784498bd5bfcf3931256e769deba571fe01ea6827875
-MISC ChangeLog 10554 RMD160 45733b23a2dcbf90b825d0890d20a4739769af8e SHA1 971c261a1c0a8641acfb154e2152775c40d45c47 SHA256 3bf43a76360869a0cd704dc59576717c93bf896f1ee450a7ce2ea05d8ed76712
+MISC ChangeLog 10838 RMD160 e6d2e9615e232bcc97495dd37d5a90cfbca8248d SHA1 9a7ee31ba41186319f4c3a2a5890e98a623331e7 SHA256 3b7f30c97b6695c0f5d65b3ef53e1d152a5987f8168b38b1fde29dc0056b93d4
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm9e0wACgkQkKaRLQcq0GIkHgCgrulvTsv1sarx8TrCW6hzJMgT
-S2wAoIRUU5bo25T7sG96AsK510KhKWhT
-=ypjY
+iEYEARECAAYFAknFZqYACgkQ1fmVwcYIWAY0xQCfa+cHN00lwuuXSqWuKwC1b8Ik
+ALAAniD18VY2McZn9/SZxuANM1a96Dz7
+=4F9E
 -----END PGP SIGNATURE-----
diff --git a/dev-util/devhelp/devhelp-0.20.ebuild b/dev-util/devhelp/devhelp-0.21-r1.ebuild
index 34326c687b21..20f1ee3281ec 100644
--- a/dev-util/devhelp/devhelp-0.20.ebuild
+++ b/dev-util/devhelp/devhelp-0.21-r1.ebuild
@@ -1,8 +1,11 @@
 # 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.20.ebuild,v 1.2 2009/01/08 16:52:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.21-r1.ebuild,v 1.1 2009/03/21 22:13:48 eva Exp $
 
-inherit toolchain-funcs gnome2 python
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools eutils toolchain-funcs gnome2 python
 
 DESCRIPTION="An API documentation browser for GNOME 2"
 HOMEPAGE="http://developer.imendio.com/wiki/Devhelp"
@@ -26,17 +29,27 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_unpack() {
-	gnome2_src_unpack
-
+src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	# Allow to build against libxul, bug #250306
+	epatch "${FILESDIR}/${P}-xulrunner19.patch"
+
+	eautoreconf
 }
 
 pkg_setup() {
+	if has_version app-editors/gedit && \
+		! built_with_use app-editors/gedit python; then
+		# Add warning per bug #245235
+		ewarn "dev-util/devhelp plugin for app-editors/gedit needs python support"
+	fi
+
 	G2CONF="$(use_with zlib)
-		--with-gecko=libxul-embedding"
+		--with-gecko=libxul
+		--with-gecko-home=/usr/$(get_libdir)/xulrunner-1.9"
 
 	# ICC is crazy, silence warnings (bug #154010)
 	if [[ $(tc-getCC) == "icc" ]] ; then
diff --git a/dev-util/devhelp/files/devhelp-0.21-xulrunner19.patch b/dev-util/devhelp/files/devhelp-0.21-xulrunner19.patch
new file mode 100644
index 000000000000..3fcd70fd5fe4
--- /dev/null
+++ b/dev-util/devhelp/files/devhelp-0.21-xulrunner19.patch
@@ -0,0 +1,28 @@
+# https://bugs.gentoo.org/show_bug.cgi?id=250306
+# Allow to build xulrunner with libxul in place of libxul-embedding
+--- a/configure.in	2008-09-22 16:43:15.000000000 +0300
++++ b/configure.in	2009-03-16 20:32:14.000000000 +0200
+@@ -88,13 +88,16 @@
+ *) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
+ esac
+ 
+-if test $GECKO = libxul-embedding; then
+-	GECKO_CFLAGS=`pkg-config --cflags libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
+-	GECKO_LIBS=`pkg-config --libs libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
+-else
+-	GECKO_CFLAGS=`pkg-config --cflags ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
+-	GECKO_LIBS=`pkg-config --libs ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
+-fi
++case "$GECKO" in
++libxul*)
++	GECKO_CFLAGS=`pkg-config --cflags ${GECKO} '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`;
++	GECKO_LIBS=`pkg-config --libs ${GECKO} '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`;
++	;;
++*)
++	GECKO_CFLAGS=`pkg-config --cflags ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`;
++	GECKO_LIBS=`pkg-config --libs ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`;
++	;;
++esac
+ 
+ AC_SUBST([GECKO_CFLAGS])
+ AC_SUBST([GECKO_LIBS])