From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- dev-qt/qtsql/Manifest | 9 ++-- dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch | 35 ------------- dev-qt/qtsql/qtsql-5.11.1-r1.ebuild | 2 +- dev-qt/qtsql/qtsql-5.11.2.ebuild | 58 --------------------- dev-qt/qtsql/qtsql-5.11.3.ebuild | 58 +++++++++++++++++++++ dev-qt/qtsql/qtsql-5.9.6-r1.ebuild | 63 ----------------------- 6 files changed, 62 insertions(+), 163 deletions(-) delete mode 100644 dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch delete mode 100644 dev-qt/qtsql/qtsql-5.11.2.ebuild create mode 100644 dev-qt/qtsql/qtsql-5.11.3.ebuild delete mode 100644 dev-qt/qtsql/qtsql-5.9.6-r1.ebuild (limited to 'dev-qt/qtsql') diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index 32494eaf3cc7..d60540a4a9a8 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,8 +1,5 @@ -AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 -DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 -DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -EBUILD qtsql-5.11.1-r1.ebuild 1506 BLAKE2B 30f185e48e90ef6dcce69ca84af1ce5fdfa509b39c1fac6b7a775d87a35172572274cf802ea7df1c089c6a5ef0e387a9b054fd30139e306c39f0143545469508 SHA512 99cc1aebb01681199cb64410a5f35933beedc12a00c7f9f518f28f12b8c049cfc17f398c014ec66172e865a2728bf1a4a8d4f7f04e4d34f202c4f04323d27027 -EBUILD qtsql-5.11.2.ebuild 1508 BLAKE2B 4190f03f7b604221262e4bb0ded1a7afc3059305acf7c9c7b1560ce7448d870c0f9dc62358e98df69478ff861569d1605ce9906e1adf6ba524d61f474454da2d SHA512 c58b32fd78e9837d632bfe499f43bfd876e83634d0d9a5911a54ba0a71f148a6f835d680d5055889de4a44f108d979443d8a9ce9b7e6176467bb83ed6fad7da7 -EBUILD qtsql-5.9.6-r1.ebuild 1625 BLAKE2B 28b3b4d38223284cb2469d987754c9c7245449d64cfec867b474f935c4135858b1847926eb78d9700c8009615ca4276342fccfe5166193ea8460d7fb479562c3 SHA512 82a76b2e4c180844883edeadfea697bed04d699f35d72e9abf4e7139c087a99d4a9edcdcc60fd783220f7ac508dc2334a8a24d11d72f28c9af7154aefaa3ed5d +DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 +EBUILD qtsql-5.11.1-r1.ebuild 1504 BLAKE2B 3c202a8d83c7cca11a939e91b11dd906004a0267e8c29b0a04f118912b67001a3e35f78c246b467df2417225995bfa8b954faf6174554cd77bef4cbf8854611a SHA512 580bc985a9bc13b9d7cdf4ce2de19c6db967e1aef2e00e0066c791a7bfc6338c843a472bf7c906f9473530e79b0ff0bd97ad1f443b928d0186c28308560cdeee +EBUILD qtsql-5.11.3.ebuild 1508 BLAKE2B 4190f03f7b604221262e4bb0ded1a7afc3059305acf7c9c7b1560ce7448d870c0f9dc62358e98df69478ff861569d1605ce9906e1adf6ba524d61f474454da2d SHA512 c58b32fd78e9837d632bfe499f43bfd876e83634d0d9a5911a54ba0a71f148a6f835d680d5055889de4a44f108d979443d8a9ce9b7e6176467bb83ed6fad7da7 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch deleted file mode 100644 index 79de44dca959..000000000000 --- a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001 -From: Andy Shaw -Date: Wed, 27 Sep 2017 09:23:10 +0200 -Subject: [PATCH] Extend the MariaDB define check to cover the later versions - too - -Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1 ---- - src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -index 6e428fb..b2d3e85 100644 ---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -@@ -1159,14 +1159,14 @@ static void qLibraryInit() - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED - --#ifdef MARIADB_BASE_VERSION -+#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) - qAddPostRoutine([]() { mysql_server_end(); }); - #endif - } - - static void qLibraryEnd() - { --#if !defined(MARIADB_BASE_VERSION) -+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) - # if !defined(Q_NO_MYSQL_EMBEDDED) - # if MYSQL_VERSION_ID > 40000 - # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 --- -2.7.4 - diff --git a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild index 1641d48345c3..536e5dd413ae 100644 --- a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild +++ b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework" SLOT=5/$(ver_cut 1-3) # bug 639140 if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd" fi IUSE="freetds mysql oci8 odbc postgres +sqlite" diff --git a/dev-qt/qtsql/qtsql-5.11.2.ebuild b/dev-qt/qtsql/qtsql-5.11.2.ebuild deleted file mode 100644 index 09b2d08531db..000000000000 --- a/dev-qt/qtsql/qtsql-5.11.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="SQL abstraction library for the Qt5 framework" -SLOT=5/$(ver_cut 1-3) # bug 639140 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -fi - -IUSE="freetds mysql oci8 odbc postgres +sqlite" - -REQUIRED_USE=" - || ( freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV} - freetds? ( dev-db/freetds ) - mysql? ( virtual/libmysqlclient:= ) - oci8? ( dev-db/oracle-instantclient-basic ) - odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/sql - src/plugins/sqldrivers -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :sql -) - -src_configure() { - local myconf=( - $(qt_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) - $(qt_use oci8 sql-oci plugin) - $(qt_use odbc sql-odbc plugin) - $(qt_use postgres sql-psql plugin) - $(qt_use sqlite sql-sqlite plugin) - $(usex sqlite -system-sqlite '') - ) - - use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") - use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") - use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc") - use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql") - - qt5-build_src_configure -} diff --git a/dev-qt/qtsql/qtsql-5.11.3.ebuild b/dev-qt/qtsql/qtsql-5.11.3.ebuild new file mode 100644 index 000000000000..09b2d08531db --- /dev/null +++ b/dev-qt/qtsql/qtsql-5.11.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="SQL abstraction library for the Qt5 framework" +SLOT=5/$(ver_cut 1-3) # bug 639140 + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +fi + +IUSE="freetds mysql oci8 odbc postgres +sqlite" + +REQUIRED_USE=" + || ( freetds mysql oci8 odbc postgres sqlite ) +" + +DEPEND=" + ~dev-qt/qtcore-${PV} + freetds? ( dev-db/freetds ) + mysql? ( virtual/libmysqlclient:= ) + oci8? ( dev-db/oracle-instantclient-basic ) + odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/sql + src/plugins/sqldrivers +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :sql +) + +src_configure() { + local myconf=( + $(qt_use freetds sql-tds plugin) + $(qt_use mysql sql-mysql plugin) + $(qt_use oci8 sql-oci plugin) + $(qt_use odbc sql-odbc plugin) + $(qt_use postgres sql-psql plugin) + $(qt_use sqlite sql-sqlite plugin) + $(usex sqlite -system-sqlite '') + ) + + use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") + use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") + use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc") + use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql") + + qt5-build_src_configure +} diff --git a/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild deleted file mode 100644 index c40771bbe943..000000000000 --- a/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="SQL abstraction library for the Qt5 framework" -SLOT=5/$(ver_cut 1-3) # bug 639140 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd" -fi - -IUSE="freetds mysql oci8 odbc postgres +sqlite" - -REQUIRED_USE=" - || ( freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV} - freetds? ( dev-db/freetds ) - mysql? ( virtual/libmysqlclient:= ) - oci8? ( dev-db/oracle-instantclient-basic ) - odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch" - # See also: https://codereview.qt-project.org/#/c/206850/ -) - -QT5_TARGET_SUBDIRS=( - src/sql - src/plugins/sqldrivers -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :sql -) - -src_configure() { - local myconf=( - $(qt_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) - $(qt_use oci8 sql-oci plugin) - $(qt_use odbc sql-odbc plugin) - $(qt_use postgres sql-psql plugin) - $(qt_use sqlite sql-sqlite plugin) - $(usex sqlite -system-sqlite '') - ) - - use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") - use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") - use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc") - use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql") - - qt5-build_src_configure -} -- cgit v1.2.3