Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/
Date: Sun, 01 Jul 2012 06:35:08
Message-Id: 1341124415.c0ac1589d0d80263c5529d1f7c3c56b202d8e3c1.bircoph@gentoo
1 commit: c0ac1589d0d80263c5529d1f7c3c56b202d8e3c1
2 Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
3 AuthorDate: Sun Jul 1 06:33:35 2012 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
5 CommitDate: Sun Jul 1 06:33:35 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c0ac1589
7
8 app-doc/root-docs: backport fixes from portage
9
10 And remove redundant dep in 5.32.03.
11
12 ---
13 app-doc/root-docs/metadata.xml | 9 +++++++++
14 app-doc/root-docs/root-docs-5.32.03.ebuild | 8 +++-----
15 app-doc/root-docs/root-docs-5.34.00.ebuild | 7 +++----
16 app-doc/root-docs/root-docs-9999.ebuild | 7 +++----
17 4 files changed, 18 insertions(+), 13 deletions(-)
18
19 diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
20 index 131ee59..8d64e52 100644
21 --- a/app-doc/root-docs/metadata.xml
22 +++ b/app-doc/root-docs/metadata.xml
23 @@ -1,5 +1,14 @@
24 <?xml version="1.0" encoding="UTF-8"?>
25 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
26 <pkgmetadata>
27 +<maintainer>
28 + <email>bircoph@×××××.com</email>
29 + <name>Andrew Savchenko</name>
30 + <description>Maintainer. Assign bugs to him</description>
31 +</maintainer>
32 <herd>sci-physics</herd>
33 +<longdescription lang="en">
34 + This package contains the automatically generated ROOT class
35 + documentation.
36 +</longdescription>
37 </pkgmetadata>
38
39 diff --git a/app-doc/root-docs/root-docs-5.32.03.ebuild b/app-doc/root-docs/root-docs-5.32.03.ebuild
40 index 567cbb1..4615bc9 100644
41 --- a/app-doc/root-docs/root-docs-5.32.03.ebuild
42 +++ b/app-doc/root-docs/root-docs-5.32.03.ebuild
43 @@ -1,6 +1,6 @@
44 # Copyright 1999-2012 Gentoo Foundation
45 # Distributed under the terms of the GNU General Public License v2
46 -# $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 $
47 +# $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 $
48
49 EAPI=4
50
51 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
52 KEYWORDS=""
53 else
54 SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
55 - KEYWORDS="~amd64 ~x86"
56 + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
57 fi
58
59 inherit eutils multilib toolchain-funcs virtualx
60 @@ -24,14 +24,12 @@ HOMEPAGE="http://root.cern.ch/"
61 SLOT="0"
62 LICENSE="LGPL-2.1"
63 IUSE=""
64 -KEYWORDS="~amd64 ~x86"
65
66 S="${WORKDIR}/${ROOT_PN}"
67 VIRTUALX_REQUIRED="always"
68
69 DEPEND="
70 ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
71 - >=sci-physics/root-5.32.03-r3[X,doc,graphviz,htmldoc,opengl]
72 virtual/pkgconfig
73 ${_SVN_DEP}"
74 RDEPEND=""
75 @@ -88,7 +86,7 @@ src_compile() {
76 }
77
78 src_install() {
79 - mkdir -p "${ED}usr/share/doc/${PF}/"
80 + dodir /usr/share/doc/${PF}
81 # too large data to copy
82 mv htmldoc/* "${ED}usr/share/doc/${PF}/"
83 }
84
85 diff --git a/app-doc/root-docs/root-docs-5.34.00.ebuild b/app-doc/root-docs/root-docs-5.34.00.ebuild
86 index a4c77b1..ca27548 100644
87 --- a/app-doc/root-docs/root-docs-5.34.00.ebuild
88 +++ b/app-doc/root-docs/root-docs-5.34.00.ebuild
89 @@ -1,6 +1,6 @@
90 # Copyright 1999-2012 Gentoo Foundation
91 # Distributed under the terms of the GNU General Public License v2
92 -# $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 $
93 +# $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 $
94
95 EAPI=4
96
97 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
98 KEYWORDS=""
99 else
100 SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
101 - KEYWORDS="~amd64 ~x86"
102 + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
103 fi
104
105 inherit eutils multilib toolchain-funcs virtualx
106 @@ -24,7 +24,6 @@ HOMEPAGE="http://root.cern.ch/"
107 SLOT="0"
108 LICENSE="LGPL-2.1"
109 IUSE=""
110 -KEYWORDS="~amd64 ~x86"
111
112 S="${WORKDIR}/${ROOT_PN}"
113 VIRTUALX_REQUIRED="always"
114 @@ -87,7 +86,7 @@ src_compile() {
115 }
116
117 src_install() {
118 - mkdir -p "${ED}usr/share/doc/${PF}/"
119 + dodir /usr/share/doc/${PF}
120 # too large data to copy
121 mv htmldoc/* "${ED}usr/share/doc/${PF}/"
122 }
123
124 diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
125 index a4c77b1..ca27548 100644
126 --- a/app-doc/root-docs/root-docs-9999.ebuild
127 +++ b/app-doc/root-docs/root-docs-9999.ebuild
128 @@ -1,6 +1,6 @@
129 # Copyright 1999-2012 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 -# $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 $
132 +# $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 $
133
134 EAPI=4
135
136 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
137 KEYWORDS=""
138 else
139 SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
140 - KEYWORDS="~amd64 ~x86"
141 + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
142 fi
143
144 inherit eutils multilib toolchain-funcs virtualx
145 @@ -24,7 +24,6 @@ HOMEPAGE="http://root.cern.ch/"
146 SLOT="0"
147 LICENSE="LGPL-2.1"
148 IUSE=""
149 -KEYWORDS="~amd64 ~x86"
150
151 S="${WORKDIR}/${ROOT_PN}"
152 VIRTUALX_REQUIRED="always"
153 @@ -87,7 +86,7 @@ src_compile() {
154 }
155
156 src_install() {
157 - mkdir -p "${ED}usr/share/doc/${PF}/"
158 + dodir /usr/share/doc/${PF}
159 # too large data to copy
160 mv htmldoc/* "${ED}usr/share/doc/${PF}/"
161 }