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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1A14158091 for ; Tue, 7 Jun 2022 11:34:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B870EE0896; Tue, 7 Jun 2022 11:34:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41708E088C for ; Tue, 7 Jun 2022 11:34:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA2D234195C for ; Tue, 7 Jun 2022 11:34:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC7DB4F5 for ; Tue, 7 Jun 2022 11:34:44 +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: <1654601491.6906b497df7a5b437455b070fa098db983e026a6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, dev-db/kdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch dev-db/kdb/kdb-3.2.0-r1.ebuild X-VCS-Directories: dev-db/kdb/files/ dev-db/kdb/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6906b497df7a5b437455b070fa098db983e026a6 X-VCS-Branch: master Date: Tue, 7 Jun 2022 11:34:44 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 39686da7-6ff7-4ca2-a444-fd244a672d3f X-Archives-Hash: 5224733e88b9949d6b7602f91e5017c3 commit: 6906b497df7a5b437455b070fa098db983e026a6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 7 11:31:31 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 7 11:31:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6906b497 dev-db/kdb: Drop 3.2.0-r1 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch | 24 ---------- dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch | 25 ----------- dev-db/kdb/kdb-3.2.0-r1.ebuild | 69 ----------------------------- 3 files changed, 118 deletions(-) diff --git a/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch deleted file mode 100644 index 4258fdc47453..000000000000 --- a/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6bba3130f8968abb2e904bda1e8b59f83dd43bdc Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Sat, 25 May 2019 06:59:44 +0200 -Subject: cmake: find PostgreSQL 12 - ---- - cmake/modules/FindPostgreSQL.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake -index 8ec30db..74e6f6b 100644 ---- a/cmake/modules/FindPostgreSQL.cmake -+++ b/cmake/modules/FindPostgreSQL.cmake -@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e - set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4") - - set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} -- "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") -+ "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") - - # Define additional search paths for root directories. - foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} ) --- -cgit v1.1 diff --git a/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch deleted file mode 100644 index 83785533fa87..000000000000 --- a/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fb5dafb01ffba27b5868eaeb99816f3e8c1cf91c Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Fri, 22 May 2020 18:59:11 +0200 -Subject: [PATCH] cmake: find PostgreSQL 13 - ---- - cmake/modules/FindPostgreSQL.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake -index 74e6f6b4..90db33ba 100644 ---- a/cmake/modules/FindPostgreSQL.cmake -+++ b/cmake/modules/FindPostgreSQL.cmake -@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e - set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4") - - set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} -- "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") -+ "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") - - # Define additional search paths for root directories. - foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} ) --- -2.31.1 - diff --git a/dev-db/kdb/kdb-3.2.0-r1.ebuild b/dev-db/kdb/kdb-3.2.0-r1.ebuild deleted file mode 100644 index 4fe1be128542..000000000000 --- a/dev-db/kdb/kdb-3.2.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_QTHELP="true" -ECM_TEST="true" -PYTHON_COMPAT=( python3_{7,8,9} ) -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org python-any-r1 - -DESCRIPTION="Database connectivity and creation framework for various vendors" -HOMEPAGE="https://community.kde.org/KDb" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="LGPL-2+" -SLOT="5/4" -IUSE="debug mysql postgres sqlite" - -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 -" -DEPEND=" - dev-libs/icu:= - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( - >=dev-qt/qtnetwork-${QTMIN}:5 - dev-db/postgresql:* - ) - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - # 3.2 branch - "${FILESDIR}"/${P}-cmake-pg12.patch - "${WORKDIR}"/${P}-patches/${P}-build-w-pg12.patch - "${FILESDIR}"/${P}-cmake-pg13.patch - "${WORKDIR}"/${P}-patches/${P}-qt-5.15.patch - # master - "${WORKDIR}"/${P}-patches/${P}-KDEInstallDirs.patch -) - -pkg_setup() { - python-any-r1_pkg_setup - ecm_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DKDB_DEBUG_GUI=$(usex debug) - $(cmake_use_find_package mysql MySQL) - $(cmake_use_find_package postgres PostgreSQL) - $(cmake_use_find_package sqlite Sqlite) - ) - - ecm_src_configure -}