| 1 |
commit: 828afd57ecdea77d0f74b90168384cf03adbf2d4 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 2 19:41:47 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 2 19:41:47 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=828afd57 |
| 7 |
|
| 8 |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci |
| 9 |
|
| 10 |
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: |
| 11 |
sci-physics/root: backport fixes from the portage |
| 12 |
app-doc/root-docs: backport fixes from portage |
| 13 |
|
| 14 |
Conflicts: |
| 15 |
sci-physics/root/ChangeLog |
| 16 |
sci-physics/root/Manifest |
| 17 |
sci-physics/root/metadata.xml |
| 18 |
sci-physics/root/root-5.34.00.ebuild |
| 19 |
|
| 20 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 21 |
|
| 22 |
|
| 23 |
app-doc/root-docs/Manifest | 8 ++++---- |
| 24 |
app-doc/root-docs/metadata.xml | 9 +++++++++ |
| 25 |
app-doc/root-docs/root-docs-5.32.03.ebuild | 8 +++----- |
| 26 |
app-doc/root-docs/root-docs-5.34.00.ebuild | 7 +++---- |
| 27 |
app-doc/root-docs/root-docs-9999.ebuild | 7 +++---- |
| 28 |
sci-physics/root/ChangeLog | 6 ++++++ |
| 29 |
sci-physics/root/files/olbd.confd | 9 --------- |
| 30 |
sci-physics/root/files/olbd.initd | 26 -------------------------- |
| 31 |
sci-physics/root/files/xrootd.confd | 8 -------- |
| 32 |
sci-physics/root/files/xrootd.initd | 26 -------------------------- |
| 33 |
sci-physics/root/metadata.xml | 15 +++++++-------- |
| 34 |
sci-physics/root/root-9999.ebuild | 14 +++++++++----- |
| 35 |
12 files changed, 44 insertions(+), 99 deletions(-) |
| 36 |
|
| 37 |
diff --cc sci-physics/root/ChangeLog |
| 38 |
index 6bd39ed,1c0138f..cd986fd |
| 39 |
--- a/sci-physics/root/ChangeLog |
| 40 |
+++ b/sci-physics/root/ChangeLog |
| 41 |
@@@ -2,10 -2,12 +2,16 @@@ |
| 42 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 43 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
| 44 |
|
| 45 |
+ 01 Jul 2012; Andrew Savchenko <bircoph@×××××.com> root-5.34.00.ebuild, |
| 46 |
+ root-9999.ebuild, -files/olbd.confd, -files/olbd.initd, -files/xrootd.confd, |
| 47 |
+ -files/xrootd.initd, metadata.xml: |
| 48 |
+ Backport fixes from the portage. |
| 49 |
+ Remove unused files and USE flag description. |
| 50 |
+ |
| 51 |
+ 28 Jun 2012; Justin Lecher <jlec@g.o> -root-5.32.03-r3.ebuild, |
| 52 |
+ -root-5.34.00.ebuild, metadata.xml: |
| 53 |
+ Drop in tree versions |
| 54 |
+ |
| 55 |
*root-5.32.03-r3 (20 Jun 2012) |
| 56 |
|
| 57 |
20 Jun 2012; Andrew Savchenko <bircoph@×××××.com> -root-5.32.03-r2.ebuild, |
| 58 |
diff --cc sci-physics/root/metadata.xml |
| 59 |
index 5317980,e7da68b..4e6d2b2 |
| 60 |
--- a/sci-physics/root/metadata.xml |
| 61 |
+++ b/sci-physics/root/metadata.xml |
| 62 |
@@@ -1,13 -1,13 +1,13 @@@ |
| 63 |
<?xml version="1.0" encoding="UTF-8"?> |
| 64 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 65 |
<pkgmetadata> |
| 66 |
-- <maintainer> |
| 67 |
-- <email>bircoph@×××××.com</email> |
| 68 |
-- <name>Andrew Savchenko</name> |
| 69 |
-- <description>Maintainer. Assign bugs to him</description> |
| 70 |
-- </maintainer> |
| 71 |
-- <herd>sci-physics</herd> |
| 72 |
-- <longdescription lang="en"> |
| 73 |
++<maintainer> |
| 74 |
++ <email>bircoph@×××××.com</email> |
| 75 |
++ <name>Andrew Savchenko</name> |
| 76 |
++ <description>Maintainer. Assign bugs to him</description> |
| 77 |
++</maintainer> |
| 78 |
++<herd>sci-physics</herd> |
| 79 |
++<longdescription lang="en"> |
| 80 |
ROOT Object Oriented Technologies is an object oriented data |
| 81 |
analysis framework written in C++ by the CERN. Widely used in |
| 82 |
high energy physics, but also in other data analysis applications. It |
Archives