diff options
Diffstat (limited to 'dev-tqt')
| -rw-r--r-- | dev-tqt/tqt/tqt-14.0.11.ebuild | 17 | ||||
| -rw-r--r-- | dev-tqt/tqt/tqt-9999.ebuild | 16 |
2 files changed, 29 insertions, 4 deletions
diff --git a/dev-tqt/tqt/tqt-14.0.11.ebuild b/dev-tqt/tqt/tqt-14.0.11.ebuild index ee52d98f..e3dd35d9 100644 --- a/dev-tqt/tqt/tqt-14.0.11.ebuild +++ b/dev-tqt/tqt/tqt-14.0.11.ebuild @@ -22,8 +22,11 @@ HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="3.5" + IUSE="cups debug doc examples firebird fontconfig glib +hiddenvisibility imext ipv6 - mng mysql nas nis +opengl postgres sqlite styles tablet +xinerama +xrandr" + mariadb mng mysql nas nis +opengl postgres sqlite styles tablet +xinerama +xrandr" + +REQUIRED_USE="mysql? ( !mariadb )" # Don't use Gentoo mirrors RESTRICT="mirror" @@ -48,7 +51,8 @@ RDEPEND=" fontconfig? ( media-libs/fontconfig ) glib? ( dev-libs/glib ) mng? ( media-libs/libmng ) - mysql? ( virtual/mysql ) + mysql? ( dev-db/mysql-connector-c ) + mariadb? ( dev-db/mariadb-connector-c ) nas? ( media-libs/nas ) nis? ( net-libs/libnsl ) opengl? ( virtual/opengl virtual/glu ) @@ -156,6 +160,14 @@ src_prepare() { # Remove docs from install if we don't need them use doc || sed -i -e '/INSTALLS.*=.*htmldocs/d' \ "src/qt_install.pri" || die + + # Ensuring tqt build with mariadb flag + if use mariadb ; then + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/configure" || die + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/config.tests/unix/checkavail" || dei + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/src/sql/qt_sql.pri" || die + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/plugins/src/sqldrivers/mysql/mysql.pro" || die + fi } src_configure() { @@ -190,6 +202,7 @@ src_configure() { use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" + use mariadb && myconf+=" -plugin-sql-mysql -I/usr/include/mariadb -L/usr/$(get_libdir)/mariadb" || myconf+=" -no-sql-mysql" use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" use sqlite && myconf+=" -plugin-sql-sqlite -plugin-sql-sqlite3" || myconf+=" -no-sql-sqlite -no-sql-sqlite3" diff --git a/dev-tqt/tqt/tqt-9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild index f7616610..8cc7a769 100644 --- a/dev-tqt/tqt/tqt-9999.ebuild +++ b/dev-tqt/tqt/tqt-9999.ebuild @@ -23,7 +23,9 @@ HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="3.5" IUSE="cups debug doc examples firebird fontconfig glib +hiddenvisibility imext ipv6 - mng mysql nas nis +opengl postgres sqlite styles tablet +xinerama +xrandr" + mariadb mng mysql nas nis +opengl postgres sqlite styles tablet +xinerama +xrandr" + +REQUIRED_USE="mysql? ( !mariadb )" # Don't use Gentoo mirrors RESTRICT="mirror" @@ -48,7 +50,8 @@ RDEPEND=" fontconfig? ( media-libs/fontconfig ) glib? ( dev-libs/glib ) mng? ( media-libs/libmng ) - mysql? ( virtual/mysql ) + mysql? ( dev-db/mysql-connector-c ) + mariadb? ( dev-db/mariadb-connector-c ) nas? ( media-libs/nas ) nis? ( net-libs/libnsl ) opengl? ( virtual/opengl virtual/glu ) @@ -156,6 +159,14 @@ src_prepare() { # Remove docs from install if we don't need them use doc || sed -i -e '/INSTALLS.*=.*htmldocs/d' \ "src/qt_install.pri" || die + + # Ensuring tqt build with mariadb flag + if use mariadb ; then + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/configure" || die + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/config.tests/unix/checkavail" || die + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/src/sql/qt_sql.pri" || die + sed -i 's/-lmysqlclient/-lmariadb/' "${S}/plugins/src/sqldrivers/mysql/mysql.pro" || die + fi } src_configure() { @@ -190,6 +201,7 @@ src_configure() { use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" + use mariadb && myconf+=" -plugin-sql-mysql -I/usr/include/mariadb -L/usr/$(get_libdir)/mariadb" || myconf+=" -no-sql-mysql" use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" use sqlite && myconf+=" -plugin-sql-sqlite -plugin-sql-sqlite3" || myconf+=" -no-sql-sqlite -no-sql-sqlite3" |