From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- dev-qt/qtsql/Manifest | 5 +-- dev-qt/qtsql/qtsql-5.15.2-r1.ebuild | 60 ------------------------------------ dev-qt/qtsql/qtsql-5.15.2-r10.ebuild | 2 +- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 dev-qt/qtsql/qtsql-5.15.2-r1.ebuild (limited to 'dev-qt/qtsql') diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index c2febd9cd28c..d727c52282bc 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtsql-5.15.2-r1.ebuild 1393 BLAKE2B 36b8a1f0d9aeac4b52438806b083313ac05085a08c05587e968e51a6fa22c42b70b02a20dc0bb358755cd241e080c95cb906df071c0ebc8fb67e649e68622bcd SHA512 bec25ca39a193fcfaf39fc14e98c18623ca12fd35b3eeead00a4dff8664a51af3408c913b988481f68ccd1003c0e718b7dd06125f8808271cf9fb842fc2dbcee -EBUILD qtsql-5.15.2-r10.ebuild 1302 BLAKE2B 2cf33e12878c1313f8e4f3efef74da46284f914b439ab91bbfe45bee704c23e2d8b45bda306180d7f4047d72a5114784f545ef3cafcba9b4ed8969b4aecd2344 SHA512 698ad4109aa5ec355943c9c9b00b36b538fe265484ba7033b92336db2d8b093705857f55d68d00691e83b60b2ddc3b5ff34fb2a856d70d7f706cad34a80f3f94 +EBUILD qtsql-5.15.2-r10.ebuild 1300 BLAKE2B 7eab82ffaa7105af8a96f41703a436eddd1c4842f82658ab2f2760b375d551623d213f4180d7e365929a5a9ba38381edbcea9d160527955684a96f566d52eaef SHA512 e0145ff510741ca9f94e5396ff4cb26ccd97ae6ac7a4498a04045dbcbddd324741dd48de39a510d20a9cc79d86cf6b8a08483ce84794df7606ea5ba0dd289cee MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild deleted file mode 100644 index f94643be7b4b..000000000000 --- a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 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" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) # bug 639140 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~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 -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - -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-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild index 20503946883f..7d2229ef0738 100644 --- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework" SLOT=5/${QT5_PV} # bug 639140 if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="freetds mysql oci8 odbc postgres +sqlite" -- cgit v1.2.3