* [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/
@ 2024-08-26 6:31 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-08-26 6:31 UTC (permalink / raw
To: gentoo-commits
commit: b43132c812a75fd6bf4526aaf6874b4d4b45c525
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 22:34:34 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 22:36:13 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b43132c8
kde-misc/kio-gdrive-common: Accept kde-apps/kaccounts-integration:6[qt5]
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild | 5 ++++-
kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
index f43aac9cdf..d2f0a8a641 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
@@ -6,7 +6,10 @@ EAPI=8
ECM_HANDBOOK="true"
KDE_ORG_CATEGORY="network"
KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF5_BDEPEND=( "|| (
+ kde-apps/kaccounts-integration:6[qt5]
+ kde-apps/kaccounts-integration:5
+)" )
KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
KFMIN=5.115.0
inherit ecm-common gear.kde.org
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
index f43aac9cdf..d2f0a8a641 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
@@ -6,7 +6,10 @@ EAPI=8
ECM_HANDBOOK="true"
KDE_ORG_CATEGORY="network"
KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF5_BDEPEND=( "|| (
+ kde-apps/kaccounts-integration:6[qt5]
+ kde-apps/kaccounts-integration:5
+)" )
KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
KFMIN=5.115.0
inherit ecm-common gear.kde.org
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/
@ 2024-11-09 11:42 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-11-09 11:42 UTC (permalink / raw
To: gentoo-commits
commit: 0d4f867740ff69ae548afe412949074198fa1e59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 11:22:25 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 11:22:25 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d4f8677
kde-misc/kio-gdrive-common: Cleanup KF5-compat remnants
Amends ce1293d2437263ef7ce8d54c00114197786af0f8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
index eefb73a676..26afc07ab1 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
@@ -6,8 +6,6 @@ EAPI=8
ECM_HANDBOOK="true"
KDE_ORG_CATEGORY="network"
KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "kde-apps/kaccounts-integration:6[qt5(-)]" )
-KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
inherit ecm-common gear.kde.org
LICENSE="GPL-2+"
@@ -18,16 +16,13 @@ RDEPEND="
!<kde-misc/kio-gdrive-23.08.5-r2:5
!<kde-misc/kio-gdrive-24.05.2-r1:6
"
+BDEPEND="kde-apps/kaccounts-integration:6"
ECM_INSTALL_FILES=(
desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
)
-ecm-common-check_deps() {
- return $(has_version -b "kde-apps/kaccounts-integration:6")
-}
-
ecm-common_inject_heredoc() {
cat >> CMakeLists.txt <<- _EOF_ || die
find_package(KAccounts6 REQUIRED)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/
@ 2024-09-09 14:39 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-09-09 14:39 UTC (permalink / raw
To: gentoo-commits
commit: ce1293d2437263ef7ce8d54c00114197786af0f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 9 14:39:30 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 9 14:39:30 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce1293d2
kde-misc/kio-gdrive-common: Drop kde-apps/kaccounts-integration:5 support
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-gdrive-common-24.08.49.9999.ebuild | 13 ++-----------
kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild | 13 ++-----------
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
index d2f0a8a641..eefb73a676 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
@@ -6,12 +6,8 @@ EAPI=8
ECM_HANDBOOK="true"
KDE_ORG_CATEGORY="network"
KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "|| (
- kde-apps/kaccounts-integration:6[qt5]
- kde-apps/kaccounts-integration:5
-)" )
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:6[qt5(-)]" )
KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
-KFMIN=5.115.0
inherit ecm-common gear.kde.org
LICENSE="GPL-2+"
@@ -34,12 +30,7 @@ ecm-common-check_deps() {
ecm-common_inject_heredoc() {
cat >> CMakeLists.txt <<- _EOF_ || die
- if(KFSLOT STREQUAL "6")
- find_package(KAccounts6 REQUIRED)
- else()
- find_package(KAccounts REQUIRED)
- endif()
-
+ find_package(KAccounts6 REQUIRED)
kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
_EOF_
}
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
index d2f0a8a641..eefb73a676 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
@@ -6,12 +6,8 @@ EAPI=8
ECM_HANDBOOK="true"
KDE_ORG_CATEGORY="network"
KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "|| (
- kde-apps/kaccounts-integration:6[qt5]
- kde-apps/kaccounts-integration:5
-)" )
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:6[qt5(-)]" )
KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
-KFMIN=5.115.0
inherit ecm-common gear.kde.org
LICENSE="GPL-2+"
@@ -34,12 +30,7 @@ ecm-common-check_deps() {
ecm-common_inject_heredoc() {
cat >> CMakeLists.txt <<- _EOF_ || die
- if(KFSLOT STREQUAL "6")
- find_package(KAccounts6 REQUIRED)
- else()
- find_package(KAccounts REQUIRED)
- endif()
-
+ find_package(KAccounts6 REQUIRED)
kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
_EOF_
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/
@ 2024-08-21 21:47 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-08-21 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 7f70f5fce728fdf8ce1aaad95701d9c976ed7249
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 23:32:31 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 20:53:49 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f70f5fc
kde-misc/kio-gdrive-common: new package, add 9999
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-gdrive-common-24.07.90.ebuild | 56 ++++++++++++++++++++++
.../kio-gdrive-common-24.08.0.ebuild | 56 ++++++++++++++++++++++
.../kio-gdrive-common-24.08.49.9999.ebuild | 56 ++++++++++++++++++++++
.../kio-gdrive-common-9999.ebuild | 56 ++++++++++++++++++++++
kde-misc/kio-gdrive-common/metadata.xml | 12 +++++
5 files changed, 236 insertions(+)
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.07.90.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.07.90.ebuild
new file mode 100644
index 0000000000..732c572a03
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.07.90.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_CATEGORY="network"
+KDE_ORG_NAME="${PN/-common/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ !<kde-misc/kio-gdrive-23.08.5-r2:5
+ !<kde-misc/kio-gdrive-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+ desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+ desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common-check_deps() {
+ return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+ cat >> CMakeLists.txt <<- _EOF_ || die
+ if(KFSLOT STREQUAL "6")
+ find_package(KAccounts6 REQUIRED)
+ else()
+ find_package(KAccounts REQUIRED)
+ endif()
+
+ kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
+ _EOF_
+}
+
+src_prepare() {
+ ecm-common_src_prepare
+
+ # Safety measure in case new services are added in the future
+ local known_num_of_services=1
+ local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+ if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+ eerror "Number of service files mismatch!"
+ eerror "Expected: ${known_num_of_services}"
+ eerror "Found: ${found_num_of_services}"
+ die
+ fi
+}
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild
new file mode 100644
index 0000000000..732c572a03
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_CATEGORY="network"
+KDE_ORG_NAME="${PN/-common/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ !<kde-misc/kio-gdrive-23.08.5-r2:5
+ !<kde-misc/kio-gdrive-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+ desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+ desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common-check_deps() {
+ return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+ cat >> CMakeLists.txt <<- _EOF_ || die
+ if(KFSLOT STREQUAL "6")
+ find_package(KAccounts6 REQUIRED)
+ else()
+ find_package(KAccounts REQUIRED)
+ endif()
+
+ kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
+ _EOF_
+}
+
+src_prepare() {
+ ecm-common_src_prepare
+
+ # Safety measure in case new services are added in the future
+ local known_num_of_services=1
+ local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+ if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+ eerror "Number of service files mismatch!"
+ eerror "Expected: ${known_num_of_services}"
+ eerror "Found: ${found_num_of_services}"
+ die
+ fi
+}
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
new file mode 100644
index 0000000000..f43aac9cdf
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_CATEGORY="network"
+KDE_ORG_NAME="${PN/-common/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+ !<kde-misc/kio-gdrive-23.08.5-r2:5
+ !<kde-misc/kio-gdrive-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+ desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+ desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common-check_deps() {
+ return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+ cat >> CMakeLists.txt <<- _EOF_ || die
+ if(KFSLOT STREQUAL "6")
+ find_package(KAccounts6 REQUIRED)
+ else()
+ find_package(KAccounts REQUIRED)
+ endif()
+
+ kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
+ _EOF_
+}
+
+src_prepare() {
+ ecm-common_src_prepare
+
+ # Safety measure in case new services are added in the future
+ local known_num_of_services=1
+ local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+ if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+ eerror "Number of service files mismatch!"
+ eerror "Expected: ${known_num_of_services}"
+ eerror "Found: ${found_num_of_services}"
+ die
+ fi
+}
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
new file mode 100644
index 0000000000..f43aac9cdf
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_CATEGORY="network"
+KDE_ORG_NAME="${PN/-common/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+ !<kde-misc/kio-gdrive-23.08.5-r2:5
+ !<kde-misc/kio-gdrive-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+ desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+ desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common-check_deps() {
+ return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+ cat >> CMakeLists.txt <<- _EOF_ || die
+ if(KFSLOT STREQUAL "6")
+ find_package(KAccounts6 REQUIRED)
+ else()
+ find_package(KAccounts REQUIRED)
+ endif()
+
+ kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
+ _EOF_
+}
+
+src_prepare() {
+ ecm-common_src_prepare
+
+ # Safety measure in case new services are added in the future
+ local known_num_of_services=1
+ local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+ if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+ eerror "Number of service files mismatch!"
+ eerror "Expected: ${known_num_of_services}"
+ eerror "Found: ${found_num_of_services}"
+ die
+ fi
+}
diff --git a/kde-misc/kio-gdrive-common/metadata.xml b/kde-misc/kio-gdrive-common/metadata.xml
new file mode 100644
index 0000000000..676893a630
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kio-gdrive</bugs-to>
+ <remote-id type="kde-invent">network/kio-gdrive</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-09 11:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-26 6:31 [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-09 11:42 Andreas Sturmlechner
2024-09-09 14:39 Andreas Sturmlechner
2024-08-21 21:47 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox