1 |
commit: 0fc3dc7cd2dabc62b52e5fdba7acc838263e07f4 |
2 |
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
3 |
AuthorDate: Thu Jun 26 20:44:53 2014 +0000 |
4 |
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
5 |
CommitDate: Thu Jun 26 20:44:53 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0fc3dc7c |
7 |
|
8 |
sci-biology/ncbi-tools++: bring back USE=mesa although it is about OSMesa |
9 |
|
10 |
--- |
11 |
sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild | 8 +++----- |
12 |
sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild | 6 +++--- |
13 |
sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild | 6 +++--- |
14 |
3 files changed, 9 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild |
17 |
index 3429e05..8280670 100644 |
18 |
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild |
19 |
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild |
20 |
@@ -26,7 +26,7 @@ IUSE=" |
21 |
debug static-libs static threads pch |
22 |
test wxwidgets odbc |
23 |
berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif |
24 |
- glut gnutls hdf5 icu jpeg lzo osmesa mysql muparser opengl pcre png python |
25 |
+ glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python |
26 |
sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X" |
27 |
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
28 |
KEYWORDS="" |
29 |
@@ -42,9 +42,7 @@ DEPEND=" |
30 |
mysql? ( virtual/mysql ) |
31 |
fltk? ( x11-libs/fltk ) |
32 |
opengl? ( virtual/opengl media-libs/glew ) |
33 |
- osmesa? ( media-libs/mesa |
34 |
- media-libs/glew |
35 |
- ) |
36 |
+ mesa? ( media-libs/mesa ) |
37 |
glut? ( media-libs/freeglut ) |
38 |
freetype? ( media-libs/freetype ) |
39 |
fastcgi? ( www-apache/mod_fastcgi ) |
40 |
@@ -231,7 +229,7 @@ src_configure() { |
41 |
$(use_with mysql mysql "${EPREFIX}/usr") |
42 |
$(usex fltk --with-fltk="${EPREFIX}/usr" "") |
43 |
$(use_with opengl opengl "${EPREFIX}/usr") |
44 |
- $(use_with osmesa mesa "${EPREFIX}/usr") |
45 |
+ $(use_with mesa mesa "${EPREFIX}/usr") |
46 |
$(use_with opengl glut "${EPREFIX}/usr") |
47 |
$(use_with opengl glew "${EPREFIX}/usr") |
48 |
$(use_with opengl glew-mx) |
49 |
|
50 |
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild |
51 |
index 44c444e..e0ca14c 100644 |
52 |
--- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild |
53 |
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild |
54 |
@@ -27,7 +27,7 @@ IUSE=" |
55 |
debug static-libs static threads pch |
56 |
test wxwidgets odbc |
57 |
berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif |
58 |
- glut gnutls hdf5 icu lzo jpeg osmesa mysql muparser opengl pcre png python |
59 |
+ glut gnutls hdf5 icu lzo jpeg mesa mysql muparser opengl pcre png python |
60 |
sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X" |
61 |
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
62 |
KEYWORDS="" |
63 |
@@ -43,7 +43,7 @@ DEPEND=" |
64 |
gnutls? ( net-libs/gnutls ) |
65 |
fltk? ( x11-libs/fltk ) |
66 |
opengl? ( virtual/opengl ) |
67 |
- osmesa? ( media-libs/osmesa |
68 |
+ mesa? ( media-libs/mesa |
69 |
media-libs/glew |
70 |
) |
71 |
glut? ( media-libs/freeglut ) |
72 |
@@ -227,7 +227,7 @@ src_configure() { |
73 |
$(use_with mysql mysql "${EPREFIX}/usr") |
74 |
$(use_with fltk fltk "${EPREFIX}/usr") |
75 |
$(use_with opengl opengl "${EPREFIX}/usr") |
76 |
- $(use_with osmesa mesa "${EPREFIX}/usr") |
77 |
+ $(use_with mesa mesa "${EPREFIX}/usr") |
78 |
$(use_with opengl glut "${EPREFIX}/usr") |
79 |
$(use_with opengl glew "${EPREFIX}/usr") |
80 |
$(use_with opengl glew-mx) |
81 |
|
82 |
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild |
83 |
index 89b6a96..ab553c5 100644 |
84 |
--- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild |
85 |
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild |
86 |
@@ -23,7 +23,7 @@ SRC_URI=" |
87 |
|
88 |
LICENSE="public-domain" |
89 |
SLOT="0" |
90 |
-IUSE="berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif glut gnutls hdf5 icu jpeg lzo osmesa mysql muparser opengl pcre png python sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X" |
91 |
+IUSE="berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X" |
92 |
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
93 |
KEYWORDS="" |
94 |
|
95 |
@@ -37,7 +37,7 @@ DEPEND="berkdb? ( sys-libs/db:4.3 ) |
96 |
gnutls? ( net-libs/gnutls ) |
97 |
fltk? ( x11-libs/fltk ) |
98 |
opengl? ( virtual/opengl ) |
99 |
- osmesa? ( media-libs/mesa ) |
100 |
+ mesa? ( media-libs/mesa ) |
101 |
glut? ( media-libs/freeglut ) |
102 |
freetype? ( media-libs/freetype ) |
103 |
fastcgi? ( www-apache/mod_fastcgi ) |
104 |
@@ -192,7 +192,7 @@ src_configure() { |
105 |
if ! use opengl; then |
106 |
myconf="--without-opengl" |
107 |
fi |
108 |
- if ! use osmesa; then |
109 |
+ if ! use mesa; then |
110 |
myconf="--without-mesa" |
111 |
fi |
112 |
if ! use glut; then |