commit: 117c5d4c6b237b1f38bb63a3cd7320cc55fb958b Author: Oliver Freyermuth <freyermuth <AT> physik <DOT> uni-bonn <DOT> de> AuthorDate: Fri Jan 30 15:10:16 2026 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Sun Feb 1 14:02:56 2026 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=117c5d4c
net-misc/cernbox-client: treeclean CERN does not provide full sourcecode anymore (only binary AppImage) and from support contact, no plans to change that. OwnCloud remains open, but CERN-specific branding (quota path etc.) are now effectively closed-source. Treeclean, users should use net-misc/owncloud-client which works fine apart from branding and showing available quota. Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> Part-of: https://github.com/gentoo/sci/pull/1389 Closes: https://github.com/gentoo/sci/pull/1389 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> .../cernbox-client-4.1.0.11250.ebuild | 92 ---------------------- .../cernbox-client-4.2.0.11670.ebuild | 92 ---------------------- ...owncloud-client-3.1.0.9872-no_cmake_fetch.patch | 17 ---- ...ud-client-3.2.0.10193-no_fortify_override.patch | 16 ---- .../owncloud-client-4.1.0.11250-fix-mirall.patch | 73 ----------------- net-misc/cernbox-client/metadata.xml | 32 -------- 6 files changed, 322 deletions(-) diff --git a/net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild b/net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild deleted file mode 100644 index 741aa66f1..000000000 --- a/net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake rpm xdg - -DESCRIPTION="Synchronize files from CERNBox EOS with your computer" - -# Origin is classic owncloud-client, branded for CERN during compilation. -ORIGIN_PN="ownCloud" -BRANDED_P="cernbox" -BRANDED_PV="4.1.0" -BRANDED_REL="11373" -REGRAPHAPI_PV="1.0.1" -HOMEPAGE="https://cernbox.cern.ch/"; -SRC_URI="https://download.owncloud.com/desktop/${ORIGIN_PN}/stable/${PV}/source/${ORIGIN_PN}-${PV}.tar.xz - https://cernboxdistr.web.cern.ch/cernboxdistr/Linux/repo.future/Fedora_38/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm - https://cern.ch/ofreyerm/gentoo/cernbox/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm - https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${REGRAPHAPI_PV}.tar.gz - -> libregraphapi-${REGRAPHAPI_PV}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dolphin keyring nautilus test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[keyring?,qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python )" - -DEPEND="${RDEPEND} - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -BDEPEND=" - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules" - -S=${WORKDIR}/${ORIGIN_PN}-${PV} - -src_unpack() { - rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm || die "failed to extract branding RPM" - mv ${PN%-*}-${BRANDED_PV}.${BRANDED_REL}/branding "${S}" || die "failed to extract branding" -} - -PATCHES=( - "${FILESDIR}"/owncloud-client-3.1.0.9872-no_cmake_fetch.patch - "${FILESDIR}"/owncloud-client-3.2.0.10193-no_fortify_override.patch - "${FILESDIR}"/owncloud-client-4.1.0.11250-fix-mirall.patch -) - -src_prepare() { - mv ../libre-graph-api-cpp-qt-client-${REGRAPHAPI_PV} \ - src/libsync/libregraphapisrc-src || die - - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} diff --git a/net-misc/cernbox-client/cernbox-client-4.2.0.11670.ebuild b/net-misc/cernbox-client/cernbox-client-4.2.0.11670.ebuild deleted file mode 100644 index 741aa66f1..000000000 --- a/net-misc/cernbox-client/cernbox-client-4.2.0.11670.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake rpm xdg - -DESCRIPTION="Synchronize files from CERNBox EOS with your computer" - -# Origin is classic owncloud-client, branded for CERN during compilation. -ORIGIN_PN="ownCloud" -BRANDED_P="cernbox" -BRANDED_PV="4.1.0" -BRANDED_REL="11373" -REGRAPHAPI_PV="1.0.1" -HOMEPAGE="https://cernbox.cern.ch/"; -SRC_URI="https://download.owncloud.com/desktop/${ORIGIN_PN}/stable/${PV}/source/${ORIGIN_PN}-${PV}.tar.xz - https://cernboxdistr.web.cern.ch/cernboxdistr/Linux/repo.future/Fedora_38/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm - https://cern.ch/ofreyerm/gentoo/cernbox/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm - https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${REGRAPHAPI_PV}.tar.gz - -> libregraphapi-${REGRAPHAPI_PV}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dolphin keyring nautilus test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[keyring?,qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python )" - -DEPEND="${RDEPEND} - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -BDEPEND=" - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules" - -S=${WORKDIR}/${ORIGIN_PN}-${PV} - -src_unpack() { - rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm || die "failed to extract branding RPM" - mv ${PN%-*}-${BRANDED_PV}.${BRANDED_REL}/branding "${S}" || die "failed to extract branding" -} - -PATCHES=( - "${FILESDIR}"/owncloud-client-3.1.0.9872-no_cmake_fetch.patch - "${FILESDIR}"/owncloud-client-3.2.0.10193-no_fortify_override.patch - "${FILESDIR}"/owncloud-client-4.1.0.11250-fix-mirall.patch -) - -src_prepare() { - mv ../libre-graph-api-cpp-qt-client-${REGRAPHAPI_PV} \ - src/libsync/libregraphapisrc-src || die - - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} diff --git a/net-misc/cernbox-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch b/net-misc/cernbox-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch deleted file mode 100644 index d9762292e..000000000 --- a/net-misc/cernbox-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt ---- ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt.orig -+++ ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt -@@ -3,12 +3,7 @@ set(LibreGraphAPIVersion v0.13.2) - find_package(LibreGraphAPI QUIET) - if (NOT TARGET OpenAPI::LibreGraphAPI) - message(WARNING "Failed to find system OpenAPI::LibreGraphAPI: fetching ${LibreGraphAPIVersion}") -- include(FetchContent) -- FetchContent_Populate(LibreGraphAPISrc -- QUIET -- GIT_REPOSITORY https://github.com/owncloud/libre-graph-api-cpp-qt-client.git -- GIT_TAG ${LibreGraphAPIVersion}) -- add_subdirectory(${libregraphapisrc_SOURCE_DIR}/client ${libregraphapisrc_BINARY_DIR}/client EXCLUDE_FROM_ALL) -+ add_subdirectory(libregraphapisrc-src/client libregraphapisrc-src/client EXCLUDE_FROM_ALL) - endif() - - set(libsync_SRCS diff --git a/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch b/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch deleted file mode 100644 index 266596b7b..000000000 --- a/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur ownCloud-3.2.0.10193.orig/src/CMakeLists.txt ownCloud-3.2.0.10193/src/CMakeLists.txt ---- ownCloud-3.2.0.10193.orig/src/CMakeLists.txt 2023-02-15 18:27:55.000000000 +0100 -+++ ownCloud-3.2.0.10193/src/CMakeLists.txt 2023-02-22 22:55:29.352847663 +0100 -@@ -16,12 +16,6 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") - endif() - endif() -- -- string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) -- if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") -- endif() - endif() - - if(WIN32) diff --git a/net-misc/cernbox-client/files/owncloud-client-4.1.0.11250-fix-mirall.patch b/net-misc/cernbox-client/files/owncloud-client-4.1.0.11250-fix-mirall.patch deleted file mode 100644 index 5e00e23aa..000000000 --- a/net-misc/cernbox-client/files/owncloud-client-4.1.0.11250-fix-mirall.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Fabian Müller <[email protected]> -Bug: https://github.com/owncloud/client/pull/10969 - -Fix installation of branded client in parallel to unbranded client. - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4d73f2cc3..49228dbb6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -54,10 +54,12 @@ endif(NOT BUILD_LIBRARIES_ONLY) - - add_subdirectory(plugins) - --install(EXPORT ownCloudConfig DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/ownCloud" NAMESPACE ownCloud::) -+install(EXPORT ${APPLICATION_SHORTNAME}Config DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/${APPLICATION_SHORTNAME}" NAMESPACE ownCloud::) - --ecm_setup_version(PROJECT VARIABLE_PREFIX ownCloud -- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/ownCloudConfigVersion.cmake" -- SOVERSION ${MIRALL_SOVERSION}) -+ecm_setup_version(PROJECT -+ VARIABLE_PREFIX ${APPLICATION_SHORTNAME} -+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}ConfigVersion.cmake" -+ SOVERSION ${MIRALL_SOVERSION} -+) - --install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ownCloudConfigVersion.cmake" DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/ownCloud") -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}ConfigVersion.cmake" DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/${APPLICATION_SHORTNAME}") -diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt -index fcf665e44..15c0a8130 100644 ---- a/src/csync/CMakeLists.txt -+++ b/src/csync/CMakeLists.txt -@@ -98,10 +98,10 @@ INSTALL( - ../common/filesystembase.h - ../common/utility.h - DESTINATION -- ${INCLUDE_INSTALL_DIR}/ownCloud/common -+ ${INCLUDE_INSTALL_DIR}/${APPLICATION_SHORTNAME}/common - ) - --INSTALL(TARGETS csync EXPORT ownCloudConfig ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -+INSTALL(TARGETS csync EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - - configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h) - -diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt -index 3995bcfe9..eeaef8450 100644 ---- a/src/libsync/CMakeLists.txt -+++ b/src/libsync/CMakeLists.txt -@@ -85,7 +85,7 @@ INSTALL( - ${CMAKE_CURRENT_BINARY_DIR}/owncloudlib.h - logger.h - accessmanager.h -- DESTINATION ${INCLUDE_INSTALL_DIR}/ownCloud/libsync -+ DESTINATION ${INCLUDE_INSTALL_DIR}/${APPLICATION_SHORTNAME}/libsync - ) - - add_library(libsync SHARED ${libsync_SRCS}) -@@ -138,4 +138,4 @@ set_target_properties(libsync PROPERTIES - VERSION ${MIRALL_VERSION} - SOVERSION ${MIRALL_SOVERSION} - ) --install(TARGETS libsync EXPORT ownCloudConfig ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS libsync EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt -index 6f50bf3be..7e0ff05b7 100644 ---- a/src/resources/CMakeLists.txt -+++ b/src/resources/CMakeLists.txt -@@ -42,4 +42,4 @@ if(Qt5LinguistTools_FOUND) - ) - endif() - --install(TARGETS owncloudResources EXPORT ownCloudConfig ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS owncloudResources EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/net-misc/cernbox-client/metadata.xml b/net-misc/cernbox-client/metadata.xml deleted file mode 100644 index e8384eb02..000000000 --- a/net-misc/cernbox-client/metadata.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Oliver Freyermuth</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Physics Project</name> - </maintainer> - <longdescription lang="en"> - This service provides a cloud synchronisation service for all CERN users between personal devices (like a laptop) and a centrally-managed data storage. - - Available to all CERN users. This service provides synchronisation capabilities: - everyone having a CERN computing account can use box to synchronise data (files and directories) across a series of (mobile) devices (smartphones, tablet, laptop, desktop). - Major software distributions are supported (notably recent Mac, Linux and Windows). - - The service provides off-line eventually synchronised access to data and it is also meant for data sharing across collaborators (for example to share presentations or text documents). - - The service is not suitable for critical-path activities like data acquisition, world-wide data distribution and massive batch processing. - </longdescription> - <use> - <flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag> - <flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag> - </use> - <upstream> - <doc>https://cernbox.web.cern.ch/cernbox/</doc> - <remote-id type="github">owncloud/client</remote-id> - <remote-id type="github">owncloud/libre-graph-api-cpp-qt-client</remote-id> - </upstream> -</pkgmetadata>
