From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- dev-qt/qtsql/Manifest | 4 +-- dev-qt/qtsql/qtsql-5.15.1.ebuild | 55 ---------------------------------------- dev-qt/qtsql/qtsql-5.15.2.ebuild | 4 +-- 3 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 dev-qt/qtsql/qtsql-5.15.1.ebuild (limited to 'dev-qt/qtsql') diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index f00dbb8e9912..e71f2c9c5c96 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,5 +1,3 @@ -DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtsql-5.15.1.ebuild 1239 BLAKE2B a65b09ed09699d01364d43f487323b0ef5e1c58a607c6e7e533672fbcf8c0ebf5f4269e319b667e46993950656686f8f6cb53d9e9e508fdab9e8e4711b832d30 SHA512 1aff70d3a2c73024c88c51d9ba523f47031b1c66dfda7b62aeb7267018b4e9f6fb22ac067f11fad84eea917badba57c4563b0a1902df825905a9ecc96a28e1cf -EBUILD qtsql-5.15.2.ebuild 1245 BLAKE2B b2306d8520913bc9532e8e3c1913dfc54afd485e670fa2f556d02fbe8ae11bb33e53cbe98fbe897f9be6b6031b1b5c894f24430cd9c58d984b2e3f5a2a5978c2 SHA512 2b3fd69def9c1c24f672f78600daf57d1f85f5f0f4971b6488d280f9318cd182fde889040ecc883888fc2d0675499baccc5d615f1e40c39a9df34c6388fd9d3a +EBUILD qtsql-5.15.2.ebuild 1239 BLAKE2B f1f290f8ba5f3e74ebb2faad5694429bd2fb899f75d1c24e39368f54ec3559d21154e4a82971ee362f7caf0c8023406c204a622358da990b4b8af2b410d4f191 SHA512 c55c1c3290bd79dbaf31b985e0403d38a5053fbd18098cf24af24f20c31dfa27bbab9aaed25772c672686ec86edec812fdf03faaa1c208019216577816e2575a MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtsql/qtsql-5.15.1.ebuild b/dev-qt/qtsql/qtsql-5.15.1.ebuild deleted file mode 100644 index 3b493c72fbbb..000000000000 --- a/dev-qt/qtsql/qtsql-5.15.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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" -fi - -IUSE="freetds mysql oci8 odbc postgres +sqlite" - -REQUIRED_USE=" - || ( freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - freetds? ( dev-db/freetds ) - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite: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 oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") - - qt5-build_src_configure -} diff --git a/dev-qt/qtsql/qtsql-5.15.2.ebuild b/dev-qt/qtsql/qtsql-5.15.2.ebuild index 4853177b0b96..97938c24fdbf 100644 --- a/dev-qt/qtsql/qtsql-5.15.2.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" fi IUSE="freetds mysql oci8 odbc postgres +sqlite" -- cgit v1.2.3