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.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 39 insertions, 25 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/Manifest b/app-doc/gnucash-docs/Manifest
index ef5d915256bb..7bcd4934155d 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -3,14 +3,18 @@ Hash: SHA1
 
 DIST gnucash-docs-2.2.0.tar.gz 10023082 RMD160 3f413e3a5e5f4f9cce2ae5e4a8a3ad1b468c2603 SHA1 3e76293735243cb4f356c2ac98e04e0e64c5c341 SHA256 8530d00b7dbe7c06022608ce134a10206ca58558a5bb61cb83b859e74fc337b3
 DIST gnucash-docs-2.4.1.tar.gz 34037913 RMD160 ae23b3db4e6bddbf1e477826d2f9cc02977e128b SHA1 fe3e6516f008febd00c5300c448b185983728822 SHA256 28517368a77786b2a31b568fa3a8fd5b159bf0776deee52a51af8658c43c8221
-EBUILD gnucash-docs-2.2.0.ebuild 699 RMD160 9128fb53af1639e3a55b611e274b916c88c0c49f SHA1 07ceb6e5c99d80be91e916c6df87e3d565c90537 SHA256 629eef46fbff555a82bc2382d5227ae7ab7c89b865281b8b815840e462e8fd09
-EBUILD gnucash-docs-2.4.1.ebuild 841 RMD160 f12de3c44d0c657d3df8fb4b8748f20ce45a0418 SHA1 6c7666d2501a138091a945c0517518c09d1f2086 SHA256 35725dcac32b3ce234bba5769ac6f64c6e1805910202c134ff4e46c72f837eb0
-MISC ChangeLog 1973 RMD160 309a44e3322bb948d3fcc2cfc86eb6db15f70ce6 SHA1 59a116ee6ec978fceea3e23343200bf45be72634 SHA256 71742fae02c7e03b63f03b4a9fe40b098d10541bf64f5332afdc7948cfb0fbf2
+EBUILD gnucash-docs-2.2.0.ebuild 795 RMD160 edd756418b5b5f4c2b3c5e4d5f4169114f6fdb6d SHA1 95f24d109e800500383cd79888358f16480e7666 SHA256 936db579da64b906a19d3dc85e6fa0c2605b0a634a7eb3264a184212e7da5bab
+EBUILD gnucash-docs-2.4.1.ebuild 875 RMD160 c385c1f839705f23869890267b67785d144f4112 SHA1 c857faa952ca74639e33ab914710829afee3c1f7 SHA256 d4f335ce8d50a66158b7277c36ca0c576587aca986a96cb735009840f650367a
+MISC ChangeLog 2292 RMD160 678db9534cb8e39f47d6bc580ba7ed1fe9346088 SHA1 fab9952b0c77d833cfe4525cd7fba1370688e5a2 SHA256 c45e83abb2ae19bebdac0131c576b6a99f35c66203378bc3f47a598a3f7a21a9
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9vMMgACgkQuQc30/atMkCT+wCgmGlMxsomVWIAgVAbnP9DwQx5
-FG4An0WrEczscurAF/+6cZMp7jqS4CJc
-=hnyV
+iQEcBAEBAgAGBQJPueq1AAoJEEdUh39IaPFN1dEH/jq0R4Z83J8+yUv+pHC38lzS
+PLh9D8wxYLTDtHHjSm5FbDDX7TQU/aHF46/x1ggkbM9GM8NjPvyhU96PHzpliqlY
+QOXMHZufVRhQ1h6sjoQiKxcVCMVe3dEJoIWYcNcbuGiL5aB2H5y5CYhcVCYWFEjA
+QkRXP8ELqwtzNhLL7l/OfEAVXHYa4CJoTccK/mpyqw9vLIKyVT51UtP8t+AoZzzm
+CozIZEdQkcMn5y4K94sK5K4z24EJZVQTWa9NlJbEPW8F8Pl/ffbgAoKmACznHDvr
+CJ1zbynegYNeEhPbnc55JDzuW+RLXMpte093BApm9h+wqOBKKkaLR/0RB2IkG2c=
+=f7na
 -----END PGP SIGNATURE-----
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."
 }