Synchronize ebuild for 2.2.0 with 2.4.1; convert forced gnome-extra/yelp runtime dependency to message in pkg_postinst(). This will avoid pulling in vulnerable copy of net-libs/xulrunner wrt #416843.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

3 files changed, 28 insertions, 18 deletions

diff --git a/app-doc/gnucash-docs/ChangeLog b/app-doc/gnucash-docs/ChangeLog
index edd951ba930a..a6d228898c5c 100644
--- a/app-doc/gnucash-docs/ChangeLog
+++ b/app-doc/gnucash-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/gnucash-docs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/ChangeLog,v 1.16 2012/03/25 14:50:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/ChangeLog,v 1.17 2012/05/21 07:14:48 ssuominen Exp $
+
+  21 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  gnucash-docs-2.2.0.ebuild, gnucash-docs-2.4.1.ebuild:
+  Synchronize ebuild for 2.2.0 with 2.4.1; convert forced gnome-extra/yelp
+  runtime dependency to message in pkg_postinst(). This will avoid pulling in
+  vulnerable copy of net-libs/xulrunner wrt #416843.
 
   05 Mar 2012; Brent Baude <ranger@gentoo.org> gnucash-docs-2.4.1.ebuild:
   Marking gnucash-docs-2.4.1 ppc stable for bug 393007
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.2.0.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.2.0.ebuild
index f4caf8a54513..e67895cec563 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.2.0.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-2.2.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/gnucash-docs-2.2.0.ebuild,v 1.10 2012/02/19 15:05:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/gnucash-docs-2.2.0.ebuild,v 1.11 2012/05/21 07:14:48 ssuominen Exp $
 
+EAPI=4
 GCONF_DEBUG=no
 
 inherit gnome2
@@ -16,12 +17,17 @@ KEYWORDS="amd64 ppc ~ppc64 x86"
 
 IUSE=""
 
-RDEPEND="gnome-extra/yelp
-	!<=app-office/gnucash-2.2.1"
+RDEPEND="!<=app-office/gnucash-2.2.1"
 
 DEPEND="${RDEPEND}
 	>=dev-libs/libxml2-2.5.10
-	  dev-libs/libxslt
-	>=app-text/scrollkeeper-0.3.4
-	  app-text/docbook-xsl-stylesheets
-	 =app-text/docbook-xml-dtd-4.1.2*"
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian"
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.4.1.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.4.1.ebuild
index 567edea3bee0..2e790c3be657 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.4.1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-2.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/gnucash-docs-2.4.1.ebuild,v 1.8 2012/03/25 14:50:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/gnucash-docs-2.4.1.ebuild,v 1.9 2012/05/21 07:14:48 ssuominen Exp $
 
-EAPI="4"
+EAPI=4
 GCONF_DEBUG=no
 
 inherit gnome2
@@ -17,20 +17,18 @@ KEYWORDS="amd64 ppc ~ppc64 x86"
 
 IUSE=""
 
-RDEPEND="gnome-extra/yelp
-	!<=app-office/gnucash-2.2.1"
+RDEPEND="!<=app-office/gnucash-2.2.1"
 
 DEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.5.10:2
+	>=dev-libs/libxml2-2.5.10
 	dev-libs/libxslt
-	>=app-text/scrollkeeper-0.3.4
 	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2"
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian"
 
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	if ! has_version "dev-java/fop"; then
-		elog "You need dev-java/fop to generate pdf files."
-	fi
+	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
 }