app-doc/root-docs: backport fixes from portage

And remove redundant dep in 5.32.03.

5 files changed, 22 insertions, 17 deletions

diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest
index fe27625f3..a6785d8c6 100644
--- a/app-doc/root-docs/Manifest
+++ b/app-doc/root-docs/Manifest
@@ -2,8 +2,8 @@ AUX root-docs-5.32-makehtml.patch 1074 RMD160 66a5184f36aec74b3f04f93ec3d7790eb2
 AUX root-docs-5.34-makehtml.patch 1389 RMD160 ab7affbe7b525bdfa7822784e6aa8619604417c8 SHA1 3cd6f5fd9495c75e0b24dc008d94072943f68e2c SHA256 dc0395adc808432506d4c18fdd56bf20e2e51a414c6cf4345d45e657889763e1
 DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
 DIST root_v5.34.00.source.tar.gz 56214534 RMD160 6089493c70f94a1c4edd87ebe79adb9f3570f903 SHA1 e7c8352d92be8510b36001efb020f3eb0bf22ed1 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1
-EBUILD root-docs-5.32.03.ebuild 2751 RMD160 853b557e921d364f57fd0d7f6f11e323482413df SHA1 73caca1f03bf5be034d15a4e8d7b578afda262c1 SHA256 b508d9fb60407b0df12fc7d3fc9be933fb895a79d3e59cf6a46132351157b010
-EBUILD root-docs-5.34.00.ebuild 2689 RMD160 a34459ccd2002b0a7ede2c07e01205bb842d255a SHA1 9123d6916390beda5207eb582d994c4c72646d6c SHA256 8db4b13106fc81e618776d19b8f7bce306ade63ac86881b994f67984c0a26b62
-EBUILD root-docs-9999.ebuild 2689 RMD160 a34459ccd2002b0a7ede2c07e01205bb842d255a SHA1 9123d6916390beda5207eb582d994c4c72646d6c SHA256 8db4b13106fc81e618776d19b8f7bce306ade63ac86881b994f67984c0a26b62
+EBUILD root-docs-5.32.03.ebuild 2680 RMD160 7afaac5cc162f05c2172438d8740ce1a1c5ad4c7 SHA1 a0ca1ee250512870547aa4d4a0421d5c803c2ed0 SHA256 b4ee9fc8e465171bafd90ef6aa6fe333a669b029d6695f299c28ed4191ea1614
+EBUILD root-docs-5.34.00.ebuild 2680 RMD160 49fa4a3adf1c2a54ed349e43acdee84cbac5e6c8 SHA1 c14c03e379c99fc99b74e8351d57441c120036aa SHA256 8b2ccf034b1bfa42ba4ed96e0931245582e62849599362eab933df36710600e5
+EBUILD root-docs-9999.ebuild 2680 RMD160 49fa4a3adf1c2a54ed349e43acdee84cbac5e6c8 SHA1 c14c03e379c99fc99b74e8351d57441c120036aa SHA256 8b2ccf034b1bfa42ba4ed96e0931245582e62849599362eab933df36710600e5
 MISC ChangeLog 1334 RMD160 82a11846c16c1e6d796b9edbc1d8668a1a9f0927 SHA1 982e2da4714fe70292f6c14a29c7af4e284a44e9 SHA256 04935384ea3738bc649adc33b1472bf18c2da5000f886846c0fc05c8bb6d25af
-MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
+MISC metadata.xml 445 RMD160 7c03cc156077e890bc7051bb37a7bda72c4425b0 SHA1 85cd2df4d36e312634491d536aefc51d629d64a8 SHA256 00cd4d82a3a02cc4a2ac6dc347b57713f3772635f9be6987d05bb024ad9f3b72
diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
index 131ee598c..8d64e524d 100644
--- a/app-doc/root-docs/metadata.xml
+++ b/app-doc/root-docs/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+  <email>bircoph@gmail.com</email>
+  <name>Andrew Savchenko</name>
+  <description>Maintainer. Assign bugs to him</description>
+</maintainer>
 <herd>sci-physics</herd>
+<longdescription lang="en">
+  This package contains the automatically generated ROOT class
+  documentation.
+</longdescription>
 </pkgmetadata>
diff --git a/app-doc/root-docs/root-docs-5.32.03.ebuild b/app-doc/root-docs/root-docs-5.32.03.ebuild
index 567cbb1cd..4615bc9cc 100644
--- a/app-doc/root-docs/root-docs-5.32.03.ebuild
+++ b/app-doc/root-docs/root-docs-5.32.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.32.03.ebuild,v 1.1 2012/06/27 17:30:22 bicatali Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit eutils multilib toolchain-funcs virtualx
@@ -24,14 +24,12 @@ HOMEPAGE="http://root.cern.ch/"
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${ROOT_PN}"
 VIRTUALX_REQUIRED="always"
 
 DEPEND="
 	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
-	>=sci-physics/root-5.32.03-r3[X,doc,graphviz,htmldoc,opengl]
 	virtual/pkgconfig
 	${_SVN_DEP}"
 RDEPEND=""
@@ -88,7 +86,7 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED}usr/share/doc/${PF}/"
+	dodir /usr/share/doc/${PF}
 	# too large data to copy
 	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
 }
diff --git a/app-doc/root-docs/root-docs-5.34.00.ebuild b/app-doc/root-docs/root-docs-5.34.00.ebuild
index a4c77b178..ca2754851 100644
--- a/app-doc/root-docs/root-docs-5.34.00.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.00.ebuild,v 1.2 2012/06/27 17:31:12 bicatali Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit eutils multilib toolchain-funcs virtualx
@@ -24,7 +24,6 @@ HOMEPAGE="http://root.cern.ch/"
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${ROOT_PN}"
 VIRTUALX_REQUIRED="always"
@@ -87,7 +86,7 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED}usr/share/doc/${PF}/"
+	dodir /usr/share/doc/${PF}
 	# too large data to copy
 	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
 }
diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index a4c77b178..ca2754851 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.00.ebuild,v 1.2 2012/06/27 17:31:12 bicatali Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit eutils multilib toolchain-funcs virtualx
@@ -24,7 +24,6 @@ HOMEPAGE="http://root.cern.ch/"
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${ROOT_PN}"
 VIRTUALX_REQUIRED="always"
@@ -87,7 +86,7 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED}usr/share/doc/${PF}/"
+	dodir /usr/share/doc/${PF}
 	# too large data to copy
 	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
 }