[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 669a5e0823725bb884d3e2a5a0d199a666c7db01 Author: Sam James gentoo org> AuthorDate: Wed Mar 2 03:44:19 2022 + Commit: Sam James gentoo org> CommitDate: Wed Mar 2 03:44:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669a5e08 dev-vcs/kdesvn: Stabilize 2.1.0-r1 amd64, #833859 Signed-off-by: Sam James gentoo.org> dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild index bd6101066c49..448e7d758395 100644 --- a/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdesvn/; if [[ ${PV} != * ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz; - KEYWORDS="~amd64 x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 09b552ab90f4b9b2802590a315a33bbe4e7b1a95 Author: Sam James gentoo org> AuthorDate: Mon Feb 28 23:54:59 2022 + Commit: Sam James gentoo org> CommitDate: Mon Feb 28 23:54:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b552ab dev-vcs/kdesvn: Stabilize 2.1.0-r1 x86, #833859 Signed-off-by: Sam James gentoo.org> dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild index 46954106702e..bd6101066c49 100644 --- a/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdesvn/; if [[ ${PV} != * ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz; - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" fi LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: f647487a1bda229ca967823b06cdf5f79d409725 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 21 13:01:49 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 21 16:45:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f647487a dev-vcs/kdesvn: EAPI-8 bump, several upstream fixes KDE-bug: https://bugs.kde.org/show_bug.cgi?id=410566 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=410585 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=419906 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437948 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-vcs/kdesvn/Manifest | 1 + dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild | 74 +++ 2 files changed, 75 insertions(+) diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 8eb941a0a38c..aef6190249fa 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1 +1,2 @@ +DIST kdesvn-2.1.0-patchset-1.tar.xz 7368 BLAKE2B 6da62bdad00a4846a4046535f26559d5c7738fd5a7994c7d4e3e03f0fa0afba763bfee067cb5bc745df56ef51dcafd4187784a69bce743fe6ac3d90372d1 SHA512 046b335ab2e68ff46849a6f7a3331de7f0f3da653a9971a2fe20cc12fe4af0e1aa192340c77fbadac81e58eeb238f3ec269a99032f87b0bed55bcbb5fc90d920 DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild new file mode 100644 index ..46954106702e --- /dev/null +++ b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.82.0 +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Frontend to the subversion vcs" +HOMEPAGE="https://apps.kde.org/kdesvn/; + +if [[ ${PV} != * ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz; + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="+man" + +DEPEND=" + dev-libs/apr:1 + dev-libs/apr-util:1 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[sqlite] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + dev-vcs/subversion + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 +" +RDEPEND="${DEPEND}" +BDEPEND=" + man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 ) +" + +PATCHES=( + "${WORKDIR}"/${P}-remove-help-button.patch # KDE-bug 410566 + "${WORKDIR}"/${P}-fix-openwith-context-menu.patch # KDE-bug 410585 + "${WORKDIR}"/${P}-fix-dupl-cli-options.patch + "${WORKDIR}"/${P}-crashfix-w-o-local-checkout-path.patch # KDE-bug 419906 + "${WORKDIR}"/${P}-crashfix-closing-repo.patch # KDE-bug 437948 + "${WORKDIR}"/${P}-hidpi-{1,2}.patch + "${WORKDIR}"/${P}-fix-deprecated.patch +) + +src_prepare(){ + ecm_src_prepare + + if ! use man ; then + sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die + fi +}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 5d2347dbfd37637083318987681ce6fcc7a613bf Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 13 01:49:00 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 16 17:28:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2347db dev-vcs/kdesvn: Port to ecm.eclass and kde.org.eclass Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-vcs/kdesvn/kdesvn-2.1.0.ebuild | 61 -- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild index a6bf20965e1..251a929b751 100644 --- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -KDE_HANDBOOK="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="A frontend to the subversion vcs" HOMEPAGE="https://kde.org/applications/development/org.kde.kdesvn; @@ -15,46 +17,47 @@ if [[ ${PV} != * ]]; then fi LICENSE="GPL-2" +SLOT="5" IUSE="+man" BDEPEND=" - man? ( $(add_frameworks_dep kdoctools) ) + man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 ) " DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql 'sqlite') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) dev-libs/apr:1 dev-libs/apr-util:1 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[sqlite] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 dev-vcs/subversion + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND} !kde-apps/kdesdk-kioslaves:4[subversion(-)] " src_prepare(){ - kde5_src_prepare + ecm_src_prepare if ! use man ; then sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/
commit: 88057bea215f0a54e7bde46ec42d516f9f15a7a1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 14 12:49:57 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 14 13:00:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88057bea dev-vcs/kdesvn: Drop 2.0.0-r1 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-vcs/kdesvn/Manifest| 1 - .../files/kdesvn-2.0.0-askpass-porting-fix.patch | 42 - dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch | 26 -- dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch | 47 -- dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch| 21 - .../files/kdesvn-2.0.0-fix-outofbounds.patch | 99 -- .../files/kdesvn-2.0.0-fix-runtime-warning.patch | 28 -- dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch| 25 -- dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild | 68 --- 9 files changed, 357 deletions(-) diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 614a4b10c64..8eb941a0a38 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1,2 +1 @@ -DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 4113ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch deleted file mode 100644 index 8e95270f429..000 --- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8be5c9f4f27d3312715c0d60ea6c088ae32283b7 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano -Date: Tue, 31 Jan 2017 01:29:58 +0100 -Subject: Fix porting issues with kdesvn-askpass - -- properly setup and run the command line parser, fixing the order - of the operations; -- set the translation catalog; -- remove a porting-related comment. - src/askpass/kdesvn-askpass.cpp | 7 --- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/askpass/kdesvn-askpass.cpp b/src/askpass/kdesvn-askpass.cpp -index aea5986..030fa9c 100644 a/src/askpass/kdesvn-askpass.cpp -+++ b/src/askpass/kdesvn-askpass.cpp -@@ -30,7 +30,8 @@ - - int main(int argc, char **argv) - { --QApplication app(argc, argv); // PORTING SCRIPT: move this to before the KAboutData initialization -+QApplication app(argc, argv); -+KLocalizedString::setApplicationDomain("kdesvn"); - KAboutData aboutData(QStringLiteral("kdesvnaskpass"), i18n("kdesvnaskpass"), QStringLiteral("0.2"), - i18n("ssh-askpass for kdesvn"), - KAboutLicense::LicenseKey::LGPL, -@@ -39,10 +40,10 @@ int main(int argc, char **argv) - KAboutData::setApplicationData(aboutData); - parser.addVersionOption(); - parser.addHelpOption(); --aboutData.setupCommandLine(); --aboutData.processCommandLine(); - parser.addPositionalArgument(QStringLiteral("[prompt]"), i18n("Prompt")); -+aboutData.setupCommandLine(); - parser.process(app); -+aboutData.processCommandLine(); - // no need for session management - //app.disableSessionManagement(); - --- -cgit v1.1 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch deleted file mode 100644 index f331cdb49da..000 --- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 18039eb7a3a6c5a24cd58b3e9c924ba63d60ca61 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sat, 3 Feb 2018 11:32:44 +0100 -Subject: Fix cmake syntax, this was adding -I settingsdlgs -I PUBLIC to the - command line - -(detected by -Wmissing-include-dirs) - src/settings/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt -index a983484..259a256 100644 a/src/settings/CMakeLists.txt -+++ b/src/settings/CMakeLists.txt -@@ -56,7 +56,7 @@ target_link_libraries(settingsdlgs - KF5::Completion - KF5::I18n - ) --include_directories(settingsdlgs -+target_include_directories(settingsdlgs - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ${CMAKE_CURRENT_BINARY_DIR}/../ --- -cgit v1.1 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch deleted file mode 100644
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: e1d43b58435c008a755925ebf42a32f1ef089dc2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 14 12:49:15 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 14 13:00:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d43b58 dev-vcs/kdesvn: 2.1.0 amd64 stable Closes: https://bugs.gentoo.org/691968 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-vcs/kdesvn/kdesvn-2.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild index 0a1885cceb3..a6bf20965e1 100644 --- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://kde.org/applications/development/org.kde.kdesvn; if [[ ${PV} != * ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 11db3a37f24313013030ed5a29e2f8924eb96280 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Aug 11 22:58:45 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Aug 11 23:03:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11db3a37 dev-vcs/kdesvn: x86 stable (bug #691968) Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> dev-vcs/kdesvn/kdesvn-2.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild index 52201b4605f..0a1885cceb3 100644 --- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://kde.org/applications/development/org.kde.kdesvn; if [[ ${PV} != * ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" fi LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 3ff0f458fd30dfab921697db128d41b91ee6bc26 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 20 18:47:45 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 20 19:29:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff0f458 dev-vcs/kdesvn: Fix HOMEPAGE, add missing BDEPEND Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-vcs/kdesvn/kdesvn-2.1.0.ebuild | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild index 56bc84f6f16..52201b4605f 100644 --- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild @@ -7,15 +7,19 @@ KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="A frontend to the subversion vcs" -HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git; +HOMEPAGE="https://kde.org/applications/development/org.kde.kdesvn; + if [[ ${PV} != * ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" IUSE="+man" +BDEPEND=" + man? ( $(add_frameworks_dep kdoctools) ) +" DEPEND=" $(add_frameworks_dep kbookmarks) $(add_frameworks_dep kcodecs)
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: e0f6b3fd954a9e94abfb07156753361385ef7df4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jul 11 08:52:18 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jul 11 09:21:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f6b3fd dev-vcs/kdesvn: 2.1.0 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-vcs/kdesvn/Manifest| 1 + dev-vcs/kdesvn/kdesvn-2.1.0.ebuild | 58 ++ 2 files changed, 59 insertions(+) diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 7a9ee009b30..614a4b10c64 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1 +1,2 @@ DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 4113ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 +DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild new file mode 100644 index 000..56bc84f6f16 --- /dev/null +++ b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="A frontend to the subversion vcs" +HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git; +if [[ ${PV} != * ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" +fi + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="+man" + +DEPEND=" + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtsql 'sqlite') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-libs/apr:1 + dev-libs/apr-util:1 + dev-vcs/subversion +" +RDEPEND="${DEPEND} + !kde-apps/kdesdk-kioslaves:4[subversion(-)] +" + +src_prepare(){ + kde5_src_prepare + + if ! use man ; then + sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die + fi +}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: a270acca756cc5f1902ed86b498c110950ce7931 Author: Michael Palimaka gentoo org> AuthorDate: Mon Apr 1 09:10:24 2019 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Apr 1 09:10:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a270acca dev-vcs/kdesvn: remove 2.0.0-r0 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Michael Palimaka gentoo.org> dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 65 -- 1 file changed, 65 deletions(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild deleted file mode 100644 index b89d778a3a1..000 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="A frontend to the subversion vcs" -HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git; -if [[ ${PV} != * ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" -fi - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="+man" - -DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql 'sqlite') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/apr:1 - dev-libs/apr-util:1 - dev-vcs/subversion -" -RDEPEND="${DEPEND} - !dev-vcs/kdesvn:4 - !kde-apps/kdesdk-kioslaves:4[subversion(-)] -" - -PATCHES=( - "${FILESDIR}/${P}-desktop.patch" - "${FILESDIR}/${P}-deps.patch" - "${FILESDIR}/${P}-qt-5.11.patch" -) - -src_prepare(){ - kde5_src_prepare - - if ! use man ; then - sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die - fi -}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 4d6f01711b464b6a7c91ea4f070bee6d183810f7 Author: Michael Palimaka gentoo org> AuthorDate: Mon Apr 1 09:08:24 2019 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Apr 1 09:08:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6f0171 dev-vcs/kdesvn: stabilise 2.0.0-r1 for amd64/x86 Closes: https://bugs.gentoo.org/681968 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Michael Palimaka gentoo.org> dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild index f1d2ad8f8de..3bbcbf96af4 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} != * ]]; then fi LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+man" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
commit: 88ed7290978643f3864f4fff93b2e4ade74b444c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 25 06:43:03 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 06:43:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ed7290 dev-vcs/kdesvn: EAPI-7 bump, upstream fixes Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/kdesvn-2.0.0-askpass-porting-fix.patch | 42 + dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch | 26 ++ .../files/kdesvn-2.0.0-fix-outofbounds.patch | 99 ++ .../files/kdesvn-2.0.0-fix-runtime-warning.patch | 28 ++ dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild | 68 +++ 5 files changed, 263 insertions(+) diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch new file mode 100644 index 000..8e95270f429 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch @@ -0,0 +1,42 @@ +From 8be5c9f4f27d3312715c0d60ea6c088ae32283b7 Mon Sep 17 00:00:00 2001 +From: Luigi Toscano +Date: Tue, 31 Jan 2017 01:29:58 +0100 +Subject: Fix porting issues with kdesvn-askpass + +- properly setup and run the command line parser, fixing the order + of the operations; +- set the translation catalog; +- remove a porting-related comment. +--- + src/askpass/kdesvn-askpass.cpp | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/askpass/kdesvn-askpass.cpp b/src/askpass/kdesvn-askpass.cpp +index aea5986..030fa9c 100644 +--- a/src/askpass/kdesvn-askpass.cpp b/src/askpass/kdesvn-askpass.cpp +@@ -30,7 +30,8 @@ + + int main(int argc, char **argv) + { +-QApplication app(argc, argv); // PORTING SCRIPT: move this to before the KAboutData initialization ++QApplication app(argc, argv); ++KLocalizedString::setApplicationDomain("kdesvn"); + KAboutData aboutData(QStringLiteral("kdesvnaskpass"), i18n("kdesvnaskpass"), QStringLiteral("0.2"), + i18n("ssh-askpass for kdesvn"), + KAboutLicense::LicenseKey::LGPL, +@@ -39,10 +40,10 @@ int main(int argc, char **argv) + KAboutData::setApplicationData(aboutData); + parser.addVersionOption(); + parser.addHelpOption(); +-aboutData.setupCommandLine(); +-aboutData.processCommandLine(); + parser.addPositionalArgument(QStringLiteral("[prompt]"), i18n("Prompt")); ++aboutData.setupCommandLine(); + parser.process(app); ++aboutData.processCommandLine(); + // no need for session management + //app.disableSessionManagement(); + +-- +cgit v1.1 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch new file mode 100644 index 000..f331cdb49da --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch @@ -0,0 +1,26 @@ +From 18039eb7a3a6c5a24cd58b3e9c924ba63d60ca61 Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Sat, 3 Feb 2018 11:32:44 +0100 +Subject: Fix cmake syntax, this was adding -I settingsdlgs -I PUBLIC to the + command line + +(detected by -Wmissing-include-dirs) +--- + src/settings/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt +index a983484..259a256 100644 +--- a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt +@@ -56,7 +56,7 @@ target_link_libraries(settingsdlgs + KF5::Completion + KF5::I18n + ) +-include_directories(settingsdlgs ++target_include_directories(settingsdlgs + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_CURRENT_BINARY_DIR}/../ +-- +cgit v1.1 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch new file mode 100644 index 000..fa12c2db868 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch @@ -0,0 +1,99 @@ +From f87f3c9cfc5924742236bee606cc2107475968ce Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Fri, 15 Feb 2019 16:22:50 +0100 +Subject: Fix ASSERTs when calling beginRemoveRows with out of bounds + parameters. + +The last param must be the last row, not the row count. +--- + src/ksvnwidgets/models/commitmodel.cpp | 49 +++-- + src/svnfrontend/models/svnitemmodel.cpp | 6 ++-- + 2 files changed, 33 insertions(+), 22 deletions(-) + +diff --git a/src/ksvnwidgets/models/commitmodel.cpp b/src/ksvnwidgets/models/commitmodel.cpp +index 4b5be8a..ac9d1ff 100644 +--- a/src/ksvnwidgets/models/commitmodel.cpp b/src/ksvnwidgets/models/commitmodel.cpp +@@ -46,33 +46,42 @@ CommitModel::~CommitModel() + + void CommitModel::setCommitData(const svn::CommitItemList ) + { +-beginRemoveRows(QModelIndex(), 0, m_List.count()); +-m_List.clear(); +-endRemoveRows();
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
commit: 811b41c7bf7417326e393a1157ce6587b9f6f21e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 10 07:43:00 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 10 08:01:09 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811b41c7 dev-vcs/kdesvn: Fix build with Qt 5.11 Package-Manager: Portage-2.3.36, Repoman-2.3.9 dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch | 25 + dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch new file mode 100644 index 000..019d2271001 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch @@ -0,0 +1,25 @@ +From 605484fd9fc873b9b8d571f398c3cab05c68d860 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame+Date: Thu, 10 May 2018 09:28:15 +0200 +Subject: Fix build with Qt 5.11 + +Some includes added transitively previously now need to be explicitly +put. +--- + src/svnfrontend/blamedisplay.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp +index 2d87502..5673181 100644 +--- a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp +@@ -30,6 +30,7 @@ + #include + #include + ++#include + #include + #include + #include +-- +cgit v0.11.2 diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild index 483633ed6ea..b89d778a3a1 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,6 +53,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${P}-desktop.patch" "${FILESDIR}/${P}-deps.patch" + "${FILESDIR}/${P}-qt-5.11.patch" ) src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: cca5995d27a6fa02eb07e53145b9cd2c880a73bd Author: Michael Palimaka gentoo org> AuthorDate: Sat Aug 26 12:37:42 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Aug 27 03:22:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca5995d dev-vcs/kdesvn: update HOMEPAGE Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild index 33501d6e646..483633ed6ea 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="A frontend to the subversion vcs" -HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git/; +HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git; if [[ ${PV} != * ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: ce506b3a4a801716f328b973a40beadce7284364 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 18 12:01:09 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 18 12:08:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce506b3a dev-vcs/kdesvn: use HTTPS Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild index a2425ef558e..33501d6e646 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="A frontend to the subversion vcs" -HOMEPAGE="http://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git/; +HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git/; if [[ ${PV} != * ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
commit: f17b08710c0faefc7ed8026806277e8abc512254 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 1 14:01:49 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 1 14:04:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17b0871 dev-vcs/kdesvn: Fix bogus dependency Reported-by: CoacherGentoo-bug: 614248 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch | 47 dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 5 ++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch new file mode 100644 index 000..d943ded7d74 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch @@ -0,0 +1,47 @@ +commit f62020c59ffb2d8ec84ff3328dddc06cd57d73ed +Author: Andreas Sturmlechner +Date: Sat Apr 1 15:12:20 2017 +0200 + +Replace KF5TextEditor with actual implicit deps + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08a2104a..53d279fc 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -46,13 +46,14 @@ include(FeatureSummary) + include(ECMInstallIcons) + + find_package(KF5 REQUIRED COMPONENTS +-Bookmarks Config ConfigWidgets CoreAddons +-DBusAddons DocTools I18n IconThemes ItemViews +-JobWidgets KIO Notifications Parts Service +-TextEditor Wallet WidgetsAddons ++Bookmarks Codecs Completion Config ++ConfigWidgets CoreAddons DBusAddons DocTools ++I18n IconThemes ItemViews JobWidgets KIO ++Notifications Parts Service TextWidgets ++Wallet WidgetsAddons XmlGui + ) + find_package(Qt5 REQUIRED COMPONENTS +-Core DBus Gui Sql Widgets ++Core DBus Gui Sql Widgets Xml + ) + + # Set the version +diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt +index 44b8d219..2b0087c8 100644 +--- a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt +@@ -79,5 +79,11 @@ target_link_libraries(ksvnwidgets + PUBLIC + svnqt + Qt5::Widgets +-KF5::TextEditor ++KF5::Completion ++KF5::ConfigWidgets ++KF5::I18n ++KF5::KIOWidgets ++KF5::Parts ++KF5::TextWidgets ++KF5::XmlGui + ) diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild index fa5e12004bc..a2425ef558e 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -50,7 +50,10 @@ RDEPEND="${DEPEND} !kde-apps/kdesdk-kioslaves:4[subversion(-)] " -PATCHES=( "${FILESDIR}/${P}-desktop.patch" ) +PATCHES=( + "${FILESDIR}/${P}-desktop.patch" + "${FILESDIR}/${P}-deps.patch" +) src_prepare(){ kde5_src_prepare
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 7b7e7e3ccba126559db4f6da735ed2bbc009dedc Author: Johannes Huber gentoo org> AuthorDate: Tue Jan 10 17:31:41 2017 + Commit: Johannes Huber gentoo org> CommitDate: Tue Jan 10 17:35:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7e7e3c dev-vcs/kdesvn: Drop slot 4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-vcs/kdesvn/Manifest| 1 - dev-vcs/kdesvn/kdesvn-1.7.0.ebuild | 43 -- 2 files changed, 44 deletions(-) diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 99159fe..c18532f 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1,2 +1 @@ -DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01 DIST kdesvn-2.0.0.tar.xz 2014660 SHA256 d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 WHIRLPOOL ebd26101e8779c047f186c408b5694647a07f565d295e6f1a1cfcf118c2fdfeb19298fb254928061c51ce8a4be7d5d651ea2c4021bf19fdcbd011bd109160a70 diff --git a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild deleted file mode 100644 index 1d7e0cf.. --- a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru" -KDE_LINGUAS_LIVE_OVERRIDE="true" -inherit flag-o-matic kde4-base - -DESCRIPTION="A frontend to the subversion vcs" -HOMEPAGE="http://kdesvn.alwins-world.de/; -if [[ ${PV} != * ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" -fi - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -SLOT="4" -IUSE="debug" - -DEPEND=" - dev-libs/apr:1 - dev-libs/apr-util:1 - dev-qt/qtsql:4[sqlite] - >=dev-vcs/subversion-1.7 - sys-devel/gettext -" -RDEPEND="${DEPEND} - !kde-apps/kdesdk-kioslaves:4[subversion(-)] -" - -# bug #583286: needs network access -RESTRICT="test" - -src_configure() { - append-cppflags -DQT_THREAD_SUPPORT - - [[ ${PV} = * ]] && local mycmakeargs=(-DDAILY_BUILD=ON) - - kde4-base_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 75c37009dfe9cc7d23f13798ddec9776dc317c05 Author: Aaron Bauman gentoo org> AuthorDate: Sun Jan 8 11:52:41 2017 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Jan 8 11:55:29 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c37009 dev-vcs/kdesvn: amd64 stable dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild index 6f695c5..93ea646 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} != * ]]; then fi LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="+man" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 35d6e22cff9b728993b47b94e949f3ce553ccdb5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 5 19:44:21 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 5 19:44:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d6e22c dev-vcs/kdesvn: Fix blocker after kdesdk-kioslaves[subversion] removal Package-Manager: portage-2.3.0 dev-vcs/kdesvn/kdesvn-1.7.0.ebuild | 4 ++-- dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild index fc89840..1d7e0cf 100644 --- a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -28,7 +28,7 @@ DEPEND=" sys-devel/gettext " RDEPEND="${DEPEND} - !kde-apps/kdesdk-kioslaves:4[subversion(+)] + !kde-apps/kdesdk-kioslaves:4[subversion(-)] " # bug #583286: needs network access diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild index c632b26..6f695c5 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,7 +48,7 @@ DEPEND=" " RDEPEND="${DEPEND} !dev-vcs/kdesvn:4 - !kde-apps/kdesdk-kioslaves:4[subversion(+)] + !kde-apps/kdesdk-kioslaves:4[subversion(-)] " PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/
commit: f4c9c765f7952257c2d8d1f419bf67ae2166ca4b Author: Johannes Huber gentoo org> AuthorDate: Thu Dec 29 18:25:29 2016 + Commit: Johannes Huber gentoo org> CommitDate: Thu Dec 29 18:26:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c9c765 dev-vcs/kdesvn: Remove 1.6.0 (r1) Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-vcs/kdesvn/Manifest| 1 - .../kdesvn/files/kdesvn-1.6.0-bug-address.patch| 20 -- dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch | 75 -- dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild | 45 - 4 files changed, 141 deletions(-) diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index a3a3558..99159fe 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1,3 +1,2 @@ -DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01 DIST kdesvn-2.0.0.tar.xz 2014660 SHA256 d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 WHIRLPOOL ebd26101e8779c047f186c408b5694647a07f565d295e6f1a1cfcf118c2fdfeb19298fb254928061c51ce8a4be7d5d651ea2c4021bf19fdcbd011bd109160a70 diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch deleted file mode 100644 index e1c9907.. --- a/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch +++ /dev/null @@ -1,20 +0,0 @@ src/main.cpp.old 2013-07-07 17:37:05.617114521 +0200 -+++ src/main.cpp 2013-07-07 17:37:20.322929644 +0200 -@@ -40,7 +40,6 @@ - KAboutData::License_GPL,ki18n("(C) 2005-2009 Rajko Albrecht")); - about.addAuthor( ki18n("Rajko Albrecht"),ki18n("Developer"),QByteArray("r...@alwins-world.de"),QByteArray()); - about.setHomepage("http://kdesvn.alwins-world.de/;); --about.setBugAddress("kdesvn-b...@alwins-world.de"); - - KCmdLineArgs::init(argc, argv, ); - KCmdLineOptions options; src/kdesvn_part.cpp.old2013-07-07 17:37:41.415664472 +0200 -+++ src/kdesvn_part.cpp2013-07-07 17:37:53.484512746 +0200 -@@ -174,7 +174,6 @@ - about.addAuthor(ki18n("Rajko Albrecht"), ki18n("Original author and maintainer"), "r...@alwins-world.de" ); - about.setOtherText(m_Extratext); - about.setHomepage("http://kdesvn.alwins-world.de/;); --about.setBugAddress("kdesvn-b...@alwins-world.de"); - about.setProgramIconName("kdesvn"); - about.setTranslator(ki18n("kdesvn: NAME OF TRANSLATORS\\nYour names"), - ki18n("kdesvn: EMAIL OF TRANSLATORS\\nYour emails")); diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch deleted file mode 100644 index 1a3c4b7.. --- a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Christophe Giboudeaux-Date: Thu, 04 Jul 2013 13:59:57 + -Subject: Drop cmake_uninstall.cmake.in -X-Git-Url: http://quickgit.kde.org/?p=kdesvn.git=commitdiff=267bda11388934cf126334269f15611e96729983 -Drop cmake_uninstall.cmake.in - -FindKDE4Internal.cmake already creates an cmake_uninstall file. -Backported to 1.6.0 (toUppercase, cmake path) - a/CMakeLists.txt 2010-03-20 17:08:10.0 +0100 -+++ b/CMakeLists.txt 2015-12-29 18:40:33.550299882 +0100 -@@ -165,14 +165,6 @@ - IMMEDIATE - @ONLY) - --CONFIGURE_FILE( --"${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/cmake_uninstall.cmake.in" --"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" --IMMEDIATE @ONLY) -- --ADD_CUSTOM_TARGET(uninstall --"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -- - ADD_CUSTOM_TARGET(dist - "${CMAKE_BINARY_DIR}/makedist.sh" - DEPENDS doc a/cmakemodules/cmake_uninstall.cmake.in -+++ /dev/null -@@ -1,43 +1 @@ -- -- # Copyright (C) 2005-2009 by Rajko Albrecht r...@alwins-world.de# -- # http://kdesvn.alwins-world.de/# -- # # -- # This program is free software; you can redistribute it and/or modify # --
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 253762bbddb34966208a75ca442302103a6719d7 Author: Johannes Huber gentoo org> AuthorDate: Fri Dec 23 09:40:02 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Dec 23 10:11:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253762bb dev-vcs/kdesvn: Drop CMAKE_MIN_VERSION Covered by cmake-utils now. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild index 03be555..c632b26 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -4,7 +4,6 @@ EAPI=6 -CMAKE_MIN_VERSION="3.1.0" KDE_HANDBOOK="forceoptional" inherit kde5
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/
commit: 919da144ca755daa1e9784ca7ddca2910bbaa736 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Dec 4 21:58:59 2016 + Commit: Johannes Huber gentoo org> CommitDate: Mon Dec 5 08:36:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919da144 dev-vcs/kdesvn: Version bump 2.0.0 Closes #3012 Package-Manager: portage-2.3.0 Signed-off-by: Johannes Huber gentoo.org> dev-vcs/kdesvn/Manifest | 1 + dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch | 21 + dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 63 + dev-vcs/kdesvn/metadata.xml | 3 ++ 4 files changed, 88 insertions(+) diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index da15a41..a3a3558 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1,2 +1,3 @@ DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01 +DIST kdesvn-2.0.0.tar.xz 2014660 SHA256 d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 WHIRLPOOL ebd26101e8779c047f186c408b5694647a07f565d295e6f1a1cfcf118c2fdfeb19298fb254928061c51ce8a4be7d5d651ea2c4021bf19fdcbd011bd109160a70 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch new file mode 100644 index ..d6427c5 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch @@ -0,0 +1,21 @@ +commit 5ea40285741a885198a351bd9afe58ff746a1192 +Author: Andreas Sturmlechner+Date: Sun Dec 4 23:26:07 2016 +0100 + +Fix startup: s/caption/qwindowtitle/ + +REVIEW: 129614 + +diff --git a/src/org.kde.kdesvn.desktop b/src/org.kde.kdesvn.desktop +index 0fbac0d..5455338 100644 +--- a/src/org.kde.kdesvn.desktop b/src/org.kde.kdesvn.desktop +@@ -49,7 +49,7 @@ GenericName[sl]=Odjemalec za SVN + GenericName[sv]=SVN-klient + GenericName[uk]=Клієнт SVN + GenericName[x-test]=xxSVN Clientxx +-Exec=kdesvn -caption "%c" %u ++Exec=kdesvn -qwindowtitle "%c" %u + Icon=kdesvn + Type=Application + X-DocPath=kdesvn/index.html diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild new file mode 100644 index ..03be555 --- /dev/null +++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +CMAKE_MIN_VERSION="3.1.0" +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="A frontend to the subversion vcs" +HOMEPAGE="http://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git/; +if [[ ${PV} != * ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" +fi + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="+man" + +DEPEND=" + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtsql 'sqlite') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-libs/apr:1 + dev-libs/apr-util:1 + dev-vcs/subversion +" +RDEPEND="${DEPEND} + !dev-vcs/kdesvn:4 + !kde-apps/kdesdk-kioslaves:4[subversion(+)] +" + +PATCHES=( "${FILESDIR}/${P}-desktop.patch" ) + +src_prepare(){ + kde5_src_prepare + + if ! use man ; then + sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die + fi +} diff --git
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 7f1c4f4cecefaf1ba68ac6f3ecf5bb9f64dc5b48 Author: Johannes Huber gentoo org> AuthorDate: Wed Nov 2 17:48:39 2016 + Commit: Johannes Huber gentoo org> CommitDate: Wed Nov 2 17:48:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1c4f4c dev-vcs/kdesvn: Restrict tests Gentoo-bug: 583286 Package-Manager: portage-2.3.2 dev-vcs/kdesvn/kdesvn-1.7.0.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild index f624f13..656cbc0 100644 --- a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild @@ -31,6 +31,9 @@ RDEPEND="${DEPEND} !kde-apps/kdesdk-kioslaves:4[subversion(+)] " +# bug #583286: needs network access +RESTRICT="test" + src_configure() { append-cppflags -DQT_THREAD_SUPPORT
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 3b2941f2173ac2cdfd69bbcf076e6e60526542ed Author: Johannes Huber gentoo org> AuthorDate: Sat May 21 19:31:09 2016 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 21 19:31:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2941f2 dev-vcs/kdesvn: Indention Package-Manager: portage-2.3.0_rc1 dev-vcs/kdesvn/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/metadata.xml b/dev-vcs/kdesvn/metadata.xml index 4ada27b..2fdbf33 100644 --- a/dev-vcs/kdesvn/metadata.xml +++ b/dev-vcs/kdesvn/metadata.xml @@ -1,7 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + k...@gentoo.org Gentoo KDE Project
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: cf02b1933c9c643f65c2df4592758ea0860992ac Author: Pacho Ramos gentoo org> AuthorDate: Sat May 21 15:57:47 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sat May 21 17:51:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf02b193 dev-vcs/kdesvn: Cleanup due to #343769 Package-Manager: portage-2.3.0_rc1 dev-vcs/kdesvn/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/dev-vcs/kdesvn/metadata.xml b/dev-vcs/kdesvn/metadata.xml index 059f580..4ada27b 100644 --- a/dev-vcs/kdesvn/metadata.xml +++ b/dev-vcs/kdesvn/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - geo...@gentoo.org - George Shapovalov - k...@gentoo.org Gentoo KDE Project
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 10f2b985a5ec30cf1a2b299dc0a9658996fa1794 Author: Johannes Huber gentoo org> AuthorDate: Tue May 17 13:08:08 2016 + Commit: Johannes Huber gentoo org> CommitDate: Tue May 17 13:08:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f2b985 dev-vcs/kdesvn: EAPI 6 Package-Manager: portage-2.3.0_rc1 dev-vcs/kdesvn/kdesvn-1.7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild index 4804b7b..9f1c8e7 100644 --- a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK="optional" KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru"
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/
commit: 325972580af126dd19d05a3573167cefe20a3cd2 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jan 23 10:53:53 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Jan 23 16:46:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32597258 dev-vcs/kdesvn: Version bump to 1.7.0 Package-Manager: portage-2.2.26 dev-vcs/kdesvn/Manifest| 1 + dev-vcs/kdesvn/kdesvn-1.7.0.ebuild | 40 ++ 2 files changed, 41 insertions(+) diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 9515671..da15a41 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1 +1,2 @@ DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f +DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01 diff --git a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild new file mode 100644 index 000..4804b7b --- /dev/null +++ b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK="optional" +KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru" +KDE_LINGUAS_LIVE_OVERRIDE="true" +inherit flag-o-matic kde4-base + +DESCRIPTION="A frontend to the subversion vcs" +HOMEPAGE="http://kdesvn.alwins-world.de/; +if [[ ${PV} != * ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" +fi + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="4" +IUSE="debug" + +DEPEND=" + dev-libs/apr:1 + dev-libs/apr-util:1 + dev-qt/qtsql:4[sqlite] + >=dev-vcs/subversion-1.7 + sys-devel/gettext +" +RDEPEND="${DEPEND} + !kde-apps/kdesdk-kioslaves:4[subversion(+)] +" + +src_configure() { + append-cppflags -DQT_THREAD_SUPPORT + + [[ ${PV} = * ]] && local mycmakeargs=(-DDAILY_BUILD=ON) + + kde4-base_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
commit: 680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Dec 29 17:55:24 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Dec 30 12:07:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680ff47b dev-vcs/kdesvn: Fix configure, bug 559638 Package-Manager: portage-2.2.24 dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch | 75 +++ dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild | 7 ++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch new file mode 100644 index 000..1a3c4b7 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch @@ -0,0 +1,75 @@ +From: Christophe Giboudeaux+Date: Thu, 04 Jul 2013 13:59:57 + +Subject: Drop cmake_uninstall.cmake.in +X-Git-Url: http://quickgit.kde.org/?p=kdesvn.git=commitdiff=267bda11388934cf126334269f15611e96729983 +--- +Drop cmake_uninstall.cmake.in + +FindKDE4Internal.cmake already creates an cmake_uninstall file. +--- +Backported to 1.6.0 (toUppercase, cmake path) + +--- a/CMakeLists.txt 2010-03-20 17:08:10.0 +0100 b/CMakeLists.txt 2015-12-29 18:40:33.550299882 +0100 +@@ -165,14 +165,6 @@ + IMMEDIATE + @ONLY) + +-CONFIGURE_FILE( +-"${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/cmake_uninstall.cmake.in" +-"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" +-IMMEDIATE @ONLY) +- +-ADD_CUSTOM_TARGET(uninstall +-"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +- + ADD_CUSTOM_TARGET(dist + "${CMAKE_BINARY_DIR}/makedist.sh" + DEPENDS doc +--- a/cmakemodules/cmake_uninstall.cmake.in /dev/null +@@ -1,43 +1 @@ +- +- # Copyright (C) 2005-2009 by Rajko Albrecht r...@alwins-world.de# +- # http://kdesvn.alwins-world.de/# +- # # +- # This program is free software; you can redistribute it and/or modify # +- # it under the terms of the GNU General Public License as published by # +- # the Free Software Foundation; either version 2 of the License, or # +- # (at your option) any later version. # +- # # +- # This program is distributed in the hope that it will be useful, # +- # but WITHOUT ANY WARRANTY; without even the implied warranty of# +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +- # GNU General Public License for more details. # +- # # +- # You should have received a copy of the GNU General Public License # +- # along with this program; if not, write to the # +- # Free Software Foundation, Inc., # +- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +- + +-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") +- MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") +-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") +- +-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +-STRING(REGEX REPLACE "\n" ";" files "${files}") +-FOREACH(file ${files}) +- MESSAGE(STATUS "Uninstalling \"${file}\"") +- IF(NOT EXISTS "${file}") +-#not a failure - missing links are marked as missed too, so when lib is removed the links are +-#there but invalid! +-MESSAGE(STATUS "File \"${file}\" does not exists.") +- ENDIF(NOT EXISTS "${file}") +- EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\"" +-OUTPUT_VARIABLE rm_out +-RETURN_VARIABLE rm_retval) +- IF("${rm_retval}" GREATER 0) +-MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"") +- ENDIF("${rm_retval}" GREATER 0) +-ENDFOREACH(file) +- +- +- + diff --git a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild index af14991..8564f3b 100644 --- a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild +++ b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild @@ -9,7 +9,7 @@ KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru" KDE_LINGUAS_LIVE_OVERRIDE="true" inherit flag-o-matic kde4-base -DESCRIPTION="KDESvn is a frontend to the subversion vcs" +DESCRIPTION="A frontend to the subversion vcs" HOMEPAGE="http://kdesvn.alwins-world.de/; if [[ ${PV} != * ]]; then SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2; @@ -31,7 +31,10 @@ RDEPEND="${DEPEND} !kde-apps/kdesdk-kioslaves:4[subversion(+)] " -PATCHES=( "${FILESDIR}/${P}-bug-address.patch" ) +PATCHES=( + "${FILESDIR}/${P}-bug-address.patch" + "${FILESDIR}/${P}-cmake.patch" +)