| 1 |
commit: 3099606f10ffe89696d65c1e3b077c1cd76a372f |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Apr 3 07:51:54 2012 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Apr 3 07:51:54 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3099606f |
| 7 |
|
| 8 |
sci-physics/root: fix bug 408987 |
| 9 |
|
| 10 |
--- |
| 11 |
sci-physics/root/ChangeLog | 10 ++++++++++ |
| 12 |
...oot-5.28.00h.ebuild => root-5.28.00h-r1.ebuild} | 5 ++++- |
| 13 |
...{root-5.32.02.ebuild => root-5.32.02-r1.ebuild} | 5 ++++- |
| 14 |
sci-physics/root/root-9999.ebuild | 7 +++++-- |
| 15 |
4 files changed, 23 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
| 18 |
index 307e584..d290f70 100644 |
| 19 |
--- a/sci-physics/root/ChangeLog |
| 20 |
+++ b/sci-physics/root/ChangeLog |
| 21 |
@@ -2,6 +2,16 @@ |
| 22 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
| 24 |
|
| 25 |
+*root-5.32.02-r1 (03 Apr 2012) |
| 26 |
+*root-5.28.00h-r1 (03 Apr 2012) |
| 27 |
+ |
| 28 |
+ 03 Apr 2012; Andrew Savchenko <bircoph@×××××.com> -root-5.28.00h.ebuild, |
| 29 |
+ +root-5.28.00h-r1.ebuild, -root-5.32.02.ebuild, +root-5.32.02-r1.ebuild, |
| 30 |
+ root-9999.ebuild: |
| 31 |
+ Force format library dependencies on libafterimage and afterstep. |
| 32 |
+ This fixes bug 408987. Port to other versions, 5.26 branch is not |
| 33 |
+ affected. |
| 34 |
+ |
| 35 |
*root-5.32.02 (02 Apr 2012) |
| 36 |
|
| 37 |
02 Apr 2012; Andrew Savchenko <bircoph@×××××.com> -root-5.32.01-r2.ebuild, |
| 38 |
|
| 39 |
diff --git a/sci-physics/root/root-5.28.00h.ebuild b/sci-physics/root/root-5.28.00h-r1.ebuild |
| 40 |
similarity index 98% |
| 41 |
rename from sci-physics/root/root-5.28.00h.ebuild |
| 42 |
rename to sci-physics/root/root-5.28.00h-r1.ebuild |
| 43 |
index 51a00d0..64b7966 100644 |
| 44 |
--- a/sci-physics/root/root-5.28.00h.ebuild |
| 45 |
+++ b/sci-physics/root/root-5.28.00h-r1.ebuild |
| 46 |
@@ -44,7 +44,10 @@ CDEPEND=" |
| 47 |
x11-libs/libXext |
| 48 |
x11-libs/libXft |
| 49 |
x11-libs/libXpm |
| 50 |
- || ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 ) |
| 51 |
+ || ( |
| 52 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 53 |
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
| 54 |
+ ) |
| 55 |
afs? ( net-fs/openafs ) |
| 56 |
avahi? ( net-dns/avahi ) |
| 57 |
clarens? ( dev-libs/xmlrpc-c ) |
| 58 |
|
| 59 |
diff --git a/sci-physics/root/root-5.32.02.ebuild b/sci-physics/root/root-5.32.02-r1.ebuild |
| 60 |
similarity index 98% |
| 61 |
rename from sci-physics/root/root-5.32.02.ebuild |
| 62 |
rename to sci-physics/root/root-5.32.02-r1.ebuild |
| 63 |
index 025dbfb..44ca400 100644 |
| 64 |
--- a/sci-physics/root/root-5.32.02.ebuild |
| 65 |
+++ b/sci-physics/root/root-5.32.02-r1.ebuild |
| 66 |
@@ -44,7 +44,10 @@ CDEPEND=" |
| 67 |
x11-libs/libX11 |
| 68 |
x11-libs/libXext |
| 69 |
x11-libs/libXpm |
| 70 |
- || ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 ) |
| 71 |
+ || ( |
| 72 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 73 |
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
| 74 |
+ ) |
| 75 |
opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) |
| 76 |
qt4? ( |
| 77 |
x11-libs/qt-gui:4 |
| 78 |
|
| 79 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
| 80 |
index 6a05fd1..3ffcc4f 100644 |
| 81 |
--- a/sci-physics/root/root-9999.ebuild |
| 82 |
+++ b/sci-physics/root/root-9999.ebuild |
| 83 |
@@ -45,16 +45,19 @@ CDEPEND=" |
| 84 |
media-libs/giflib |
| 85 |
media-libs/libpng:0 |
| 86 |
media-libs/tiff:0 |
| 87 |
- virtual/shadow |
| 88 |
sys-libs/zlib |
| 89 |
virtual/jpeg |
| 90 |
+ virtual/shadow |
| 91 |
X? ( |
| 92 |
media-libs/ftgl |
| 93 |
media-libs/glew |
| 94 |
x11-libs/libX11 |
| 95 |
x11-libs/libXext |
| 96 |
x11-libs/libXpm |
| 97 |
- || ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 ) |
| 98 |
+ || ( |
| 99 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 100 |
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
| 101 |
+ ) |
| 102 |
opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) |
| 103 |
qt4? ( |
| 104 |
x11-libs/qt-gui:4 |
Archives