aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2014-06-26 22:44:53 +0200
committerMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2014-06-26 22:44:53 +0200
commit0fc3dc7cd2dabc62b52e5fdba7acc838263e07f4 (patch)
tree12350547ce26e8a1b1f61862398fdfebe007a85c /sci-biology/ncbi-tools++
parentsci-biology/ncbi-tools++: fix 'make install if USE=pch (diff)
downloadsci-0fc3dc7cd2dabc62b52e5fdba7acc838263e07f4.tar.gz
sci-0fc3dc7cd2dabc62b52e5fdba7acc838263e07f4.tar.bz2
sci-0fc3dc7cd2dabc62b52e5fdba7acc838263e07f4.zip
sci-biology/ncbi-tools++: bring back USE=mesa although it is about OSMesa
Diffstat (limited to 'sci-biology/ncbi-tools++')
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild8
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild6
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild6
3 files changed, 9 insertions, 11 deletions
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
index 3429e0570..82806705e 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
@@ -26,7 +26,7 @@ IUSE="
debug static-libs static threads pch
test wxwidgets odbc
berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif
- glut gnutls hdf5 icu jpeg lzo osmesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X"
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS=""
@@ -42,9 +42,7 @@ DEPEND="
mysql? ( virtual/mysql )
fltk? ( x11-libs/fltk )
opengl? ( virtual/opengl media-libs/glew )
- osmesa? ( media-libs/mesa
- media-libs/glew
- )
+ mesa? ( media-libs/mesa )
glut? ( media-libs/freeglut )
freetype? ( media-libs/freetype )
fastcgi? ( www-apache/mod_fastcgi )
@@ -231,7 +229,7 @@ src_configure() {
$(use_with mysql mysql "${EPREFIX}/usr")
$(usex fltk --with-fltk="${EPREFIX}/usr" "")
$(use_with opengl opengl "${EPREFIX}/usr")
- $(use_with osmesa mesa "${EPREFIX}/usr")
+ $(use_with mesa mesa "${EPREFIX}/usr")
$(use_with opengl glut "${EPREFIX}/usr")
$(use_with opengl glew "${EPREFIX}/usr")
$(use_with opengl glew-mx)
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
index 44c444e31..e0ca14c3d 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
@@ -27,7 +27,7 @@ IUSE="
debug static-libs static threads pch
test wxwidgets odbc
berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif
- glut gnutls hdf5 icu lzo jpeg osmesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu lzo jpeg mesa mysql muparser opengl pcre png python
sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X"
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS=""
@@ -43,7 +43,7 @@ DEPEND="
gnutls? ( net-libs/gnutls )
fltk? ( x11-libs/fltk )
opengl? ( virtual/opengl )
- osmesa? ( media-libs/osmesa
+ mesa? ( media-libs/mesa
media-libs/glew
)
glut? ( media-libs/freeglut )
@@ -227,7 +227,7 @@ src_configure() {
$(use_with mysql mysql "${EPREFIX}/usr")
$(use_with fltk fltk "${EPREFIX}/usr")
$(use_with opengl opengl "${EPREFIX}/usr")
- $(use_with osmesa mesa "${EPREFIX}/usr")
+ $(use_with mesa mesa "${EPREFIX}/usr")
$(use_with opengl glut "${EPREFIX}/usr")
$(use_with opengl glew "${EPREFIX}/usr")
$(use_with opengl glew-mx)
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
index 89b6a96c7..ab553c5fa 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-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"
+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"
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS=""
@@ -37,7 +37,7 @@ DEPEND="berkdb? ( sys-libs/db:4.3 )
gnutls? ( net-libs/gnutls )
fltk? ( x11-libs/fltk )
opengl? ( virtual/opengl )
- osmesa? ( media-libs/mesa )
+ mesa? ( media-libs/mesa )
glut? ( media-libs/freeglut )
freetype? ( media-libs/freetype )
fastcgi? ( www-apache/mod_fastcgi )
@@ -192,7 +192,7 @@ src_configure() {
if ! use opengl; then
myconf="--without-opengl"
fi
- if ! use osmesa; then
+ if ! use mesa; then
myconf="--without-mesa"
fi
if ! use glut; then