From 0fc3dc7cd2dabc62b52e5fdba7acc838263e07f4 Mon Sep 17 00:00:00 2001 From: Martin Mokrejš Date: Thu, 26 Jun 2014 22:44:53 +0200 Subject: sci-biology/ncbi-tools++: bring back USE=mesa although it is about OSMesa --- sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild | 8 +++----- sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild | 6 +++--- sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild | 6 +++--- 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 -- cgit v1.2.3-18-g5258