From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- dev-qt/qtsql/Manifest | 6 ++-- dev-qt/qtsql/qtsql-5.15.2-r10.ebuild | 57 ------------------------------------ dev-qt/qtsql/qtsql-5.15.2-r11.ebuild | 4 +-- 3 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 dev-qt/qtsql/qtsql-5.15.2-r10.ebuild (limited to 'dev-qt/qtsql') diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index cb2124dad396..395fc14171e2 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,5 +1,3 @@ -DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8 -EBUILD qtsql-5.15.2-r10.ebuild 1300 BLAKE2B 7eab82ffaa7105af8a96f41703a436eddd1c4842f82658ab2f2760b375d551623d213f4180d7e365929a5a9ba38381edbcea9d160527955684a96f566d52eaef SHA512 e0145ff510741ca9f94e5396ff4cb26ccd97ae6ac7a4498a04045dbcbddd324741dd48de39a510d20a9cc79d86cf6b8a08483ce84794df7606ea5ba0dd289cee -EBUILD qtsql-5.15.2-r11.ebuild 1306 BLAKE2B 5ab9c16feb71f9a2a7c5b4011071cfd2ad011042c448708230627c4c5e72ee5a6709e4a952fa2bfa36c085be4b643d03803082ea6644299377bd9472a92ec1c4 SHA512 df37ad0b769544b948c08781d9b4fd133f9f2b51fd9d771faf8b49c2bc0febb5a6a119d433cdbceb465fdf19adfea5ce973d9aee257a0be7702801b955118631 +DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc +EBUILD qtsql-5.15.2-r11.ebuild 1300 BLAKE2B e81525e25353115ee217f98e84b08a6fc2743a5694c26f3d85087c8a9681432957cbb13701179377b792c0a4d49e0756bde814f365c9b4d802f286c403961fc7 SHA512 8083c829967dc8a55e2a91f2240aa6772f63ed2a9bbd7e2455eaccad61288d48e6bd0374f715cc091f66cfd22bac0d12cb4534cfaf71a51f949b5ef5390c8e92 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild deleted file mode 100644 index 7d2229ef0738..000000000000 --- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd -QT5_MODULE="qtbase" -inherit qt5-build - -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" -fi - -IUSE="freetds mysql oci8 odbc postgres +sqlite" - -REQUIRED_USE=" - || ( freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - =dev-qt/qtcore-${QT5_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) - $(usev 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-r11.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild index b0ef48872854..c20f4081db7e 100644 --- a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild @@ -3,7 +3,7 @@ EAPI=8 -KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a +KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860 QT5_MODULE="qtbase" inherit qt5-build @@ -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