From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 440FC138335 for ; Thu, 12 Jul 2018 10:38:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 235A2E083D; Thu, 12 Jul 2018 10:38:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC24FE083D for ; Thu, 12 Jul 2018 10:38:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 117E9335CC3 for ; Thu, 12 Jul 2018 10:38:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60BDF371 for ; Thu, 12 Jul 2018 10:38:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1531389571.29d51fd835c47766e95d56a49701f451d4ecf792.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsql/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtsql/qtsql-5.11.1.ebuild dev-qt/qtsql/qtsql-5.9.6.ebuild X-VCS-Directories: dev-qt/qtsql/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 29d51fd835c47766e95d56a49701f451d4ecf792 X-VCS-Branch: master Date: Thu, 12 Jul 2018 10:38:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 98ed547e-0836-42f8-8aa1-6657736a81e1 X-Archives-Hash: ea2763d7ed99a963217891964f1238df commit: 29d51fd835c47766e95d56a49701f451d4ecf792 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jul 6 20:46:40 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jul 12 09:59:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d51fd8 dev-qt/qtsql: Drop old Package-Manager: Portage-2.3.41, Repoman-2.3.9 dev-qt/qtsql/qtsql-5.11.1.ebuild | 57 ------------------------------------ dev-qt/qtsql/qtsql-5.9.6.ebuild | 62 ---------------------------------------- 2 files changed, 119 deletions(-) diff --git a/dev-qt/qtsql/qtsql-5.11.1.ebuild b/dev-qt/qtsql/qtsql-5.11.1.ebuild deleted file mode 100644 index db29e42db71..00000000000 --- a/dev-qt/qtsql/qtsql-5.11.1.ebuild +++ /dev/null @@ -1,57 +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" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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.ebuild b/dev-qt/qtsql/qtsql-5.9.6.ebuild deleted file mode 100644 index ae73581446b..00000000000 --- a/dev-qt/qtsql/qtsql-5.9.6.ebuild +++ /dev/null @@ -1,62 +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" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 -}