diff options
Diffstat (limited to 'kde-misc')
18 files changed, 97 insertions, 141 deletions
diff --git a/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild b/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild index 8ef5c2b4847..f77b893a6e1 100644 --- a/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild +++ b/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild @@ -15,6 +15,6 @@ KEYWORDS="" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') - =dev-libs/libgit2-0.17* + $(add_kdebase_dep kdepimlibs) + >=dev-libs/libgit2-0.17 " diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest index 75579f5aad2..5146398185c 100644 --- a/kde-misc/kdeconnect/Manifest +++ b/kde-misc/kdeconnect/Manifest @@ -1 +1 @@ -DIST kdeconnect-kde-0.1.tar.xz 34856 SHA256 ad7b2563b811d55053f37f72e226b6d4cd13e16abfb1242250bb8aaae7140c87 SHA512 09944f81448978d541d57a2ad0bc2257eea50a547062ea42aaa8206d896284b38c741e6bdc9e62be76ff6fbc827eeed191ffe33e0f84bf2f14e9195314ea59ca WHIRLPOOL 14e40a30415c0b8503fd76203821697997506f249ffba1c268be9b907de6bcab5b8e56a0114e4040db333c0d92136ef6fc21413a985c5449206c0f438021680f +DIST kdeconnect-kde-0.4.1.tar.xz 55020 SHA256 b31291cec999aca26372e15cb04b32dcfd8f61b1a931275a53c2f83703538a34 SHA512 5e66a11e68d00e674373fd5b0351dce01451609c14074ec324bc6a3afbce0f016680014be71bd9233cf81ab13ac50f4e26b46495a31d41cc4393e17839d26828 WHIRLPOOL c17f15c66a5cd2eae437126b695b29c11ac73840bb5b0fc8576b66607055ec7b4a8f597d3ea0c746b1cf324956357ffb133c67f64829bd5351175f55139ab0c5 diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch b/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch new file mode 100644 index 00000000000..dc55f23639d --- /dev/null +++ b/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch @@ -0,0 +1,22 @@ +commit e3b4b3660fe3e217e68516e2222551787bffda5c +Author: Aleix Pol <aleixpol@kde.org> +Date: Fri Nov 8 03:13:13 2013 +0100 + + Compile everything + + Albert, this is asking you to be a library ;) + + CCMAIL: albertvaka@gmail.com + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index a9a8bad..b559abf 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -24,6 +24,6 @@ set(kdeconnect_libraries + ) + + #NetworkPackage +-kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp) ++kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/kdebugnamespace.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp) + target_link_libraries(kdeconnect_tests ${kdeconnect_libraries}) + diff --git a/kde-misc/kdeconnect/kdeconnect-0.1.ebuild b/kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild index 45547b858af..21ff93d97b1 100644 --- a/kde-misc/kdeconnect/kdeconnect-0.1.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild @@ -4,15 +4,16 @@ EAPI=5 +MY_PN=${PN}-kde +DECLARATIVE_REQUIRED="always" inherit kde4-base if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_PN=${PN}-kde MY_P=${MY_PN}-${PV} SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${MY_P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" else - EGIT_REPO_URI="git://anongit.kde.org/kdeconnect-kde" + EGIT_REPO_URI="git://anongit.kde.org/${MY_PN}" KEYWORDS="" fi @@ -21,18 +22,20 @@ HOMEPAGE="http://www.kde.org/" LICENSE="GPL-2+" SLOT="4" -IUSE="" +IUSE="debug" -DEPEND="$(add_kdebase_dep kdelibs ) +DEPEND=" app-crypt/qca:2 dev-libs/qjson - dev-qt/qtdbus " RDEPEND="${DEPEND} + $(add_kdebase_dep plasma-workspace) net-dns/avahi " -S=${WORKDIR}/${MY_P} +[[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P} + +PATCHES=( "${FILESDIR}/${P}-compile.patch" ) src_prepare(){ sed -i -e "s:QtCrypto/QtCrypto:QtCrypto:" kded/networkpackage.cpp || die diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index 65e426d85a1..3ca60a1a672 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -4,15 +4,16 @@ EAPI=5 +MY_PN=${PN}-kde +DECLARATIVE_REQUIRED="always" inherit kde4-base if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_PN=${PN}-kde MY_P=${MY_PN}-${PV} SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${MY_P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" else - EGIT_REPO_URI="git://anongit.kde.org/kdeconnect-kde" + EGIT_REPO_URI="git://anongit.kde.org/${MY_PN}" KEYWORDS="" fi @@ -21,17 +22,18 @@ HOMEPAGE="http://www.kde.org/" LICENSE="GPL-2+" SLOT="4" -IUSE="" +IUSE="debug" -DEPEND="$(add_kdebase_dep kdelibs ) +DEPEND=" app-crypt/qca:2 dev-libs/qjson - dev-qt/qtdbus" +" RDEPEND="${DEPEND} + $(add_kdebase_dep plasma-workspace) net-dns/avahi " -S=${WORKDIR}/${MY_P} +[[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P} src_prepare(){ sed -i -e "s:QtCrypto/QtCrypto:QtCrypto:" kded/networkpackage.cpp || die diff --git a/kde-misc/kdiff3/files/kdiff3-build.patch b/kde-misc/kdiff3/files/kdiff3-build.patch new file mode 100644 index 00000000000..14b7147c8cc --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-build.patch @@ -0,0 +1,25 @@ +diff --git a/kdiff3/src-QT4/difftextwindow.cpp b/kdiff3/src-QT4/difftextwindow.cpp +index c2c0779..ee104a3 100644 +--- a/kdiff3/src-QT4/difftextwindow.cpp ++++ b/kdiff3/src-QT4/difftextwindow.cpp +@@ -33,6 +33,8 @@ + #include <QUrl> + #include <QMenu> + #include <QTextLayout> ++#include <QRunnable> ++#include <QThreadPool> + + + +diff --git a/kdiff3/src-QT4/progress.cpp b/kdiff3/src-QT4/progress.cpp +index 9e585a3..88947db 100644 +--- a/kdiff3/src-QT4/progress.cpp ++++ b/kdiff3/src-QT4/progress.cpp +@@ -15,6 +15,7 @@ + #include <QPushButton> + #include <QLabel> + #include <QApplication> ++#include <QThread> + #include <kio/job.h> + + #include <klocale.h> diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild index 825b43fba4f..5c3eccc55a1 100644 --- a/kde-misc/kdiff3/kdiff3-9999.ebuild +++ b/kde-misc/kdiff3/kdiff3-9999.ebuild @@ -20,8 +20,7 @@ inherit kde4-base qt4-r2 DESCRIPTION="Qt/KDE based frontend to diff3" HOMEPAGE="http://kdiff3.sourceforge.net/" -EGIT_REPO_URI="git://git.code.sf.net/p/kdiff3/code" -EGIT_PROJECT="${PN}" +EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" ) LICENSE="GPL-2" SLOT="4" @@ -38,9 +37,11 @@ RDEPEND="${DEPEND} RESTRICT="!kde? ( test )" +PATCHES=( "${FILESDIR}/${PN}-build.patch" ) + src_unpack(){ if [[ ${PV} == *9999* ]]; then - git-2_src_unpack + git-r3_src_unpack mv "${S}"/${PN}/* "${S}" || die elif use kde; then kde4-base_src_unpack diff --git a/kde-misc/kio-mtp/Manifest b/kde-misc/kio-mtp/Manifest deleted file mode 100644 index cc5fa347748..00000000000 --- a/kde-misc/kio-mtp/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kio-mtp-0.75_p20130912.tar.gz 22307 SHA256 61733750e8d43d05336b02faf929f6dc132120fc39d91289b994a8ace465e221 SHA512 7c6a94b44c5fcf210d8f9816114f5a0569ab313490bf3266ac9d21fcece0407d1a23d719169c784b6f4e7abd570bbad1c7496338e492c0946d534e034f12e52b WHIRLPOOL 2a7d3a9e29bc29cf40305a39ad008e58ca21480cd81f60346645ab57fae5bc8356d05e9fb8ce7ca122341dc379ddbf8a31249a23a7daf9c044c1096340a2f55a -DIST kio-mtp-0_p20130211.tar.xz 25984 SHA256 fc8cc3453ac1429ec600b0e7995a86a5df999ab4f74914fb89cb24af4d2e5ad9 SHA512 b0b0c58ad633a8cee25f3224a73d84ff41ece25da42eda602acbb906c5a429a0bb6191ff76105e0efa8a16bb3a4812ff595f0d9bbf34ffbb956fbb986daec30a WHIRLPOOL 9ab31fe33cca166676e3f115b024a4bbe1628659d907346c1f78c95b06482fd24efcf5ddabd589d33b9739ca715634ba18a5907ad67e5021788bf26c63046360 diff --git a/kde-misc/kio-mtp/kio-mtp-0.75_p20130912.ebuild b/kde-misc/kio-mtp/kio-mtp-0.75_p20130912.ebuild deleted file mode 100644 index 990309fb330..00000000000 --- a/kde-misc/kio-mtp/kio-mtp-0.75_p20130912.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit kde4-base - -DESCRIPTION="MTP KIO-Client for KDE" -HOMEPAGE="https://projects.kde.org/projects/playground/base/kio-mtp" -SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND=" - >=media-libs/libmtp-1.1.3 -" -RDEPEND="${DEPEND}" diff --git a/kde-misc/kio-mtp/kio-mtp-0_p20130211.ebuild b/kde-misc/kio-mtp/kio-mtp-0_p20130211.ebuild deleted file mode 100644 index c199755adb7..00000000000 --- a/kde-misc/kio-mtp/kio-mtp-0_p20130211.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit kde4-base - -DESCRIPTION="MTP KIO-Client for KDE" -HOMEPAGE="https://projects.kde.org/projects/playground/base/kio-mtp" -SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND=" - >=media-libs/libmtp-1.1.3 -" -RDEPEND="${DEPEND}" diff --git a/kde-misc/kscreen/kscreen-9999.ebuild b/kde-misc/kscreen/kscreen-9999.ebuild index c07d7e0553f..06b0bb31701 100644 --- a/kde-misc/kscreen/kscreen-9999.ebuild +++ b/kde-misc/kscreen/kscreen-9999.ebuild @@ -6,12 +6,12 @@ EAPI=5 VIRTUALX_REQUIRED="test" DECLARATIVE_REQUIRED="always" -KDE_LINGUAS="bs cs da de el es et fi fr ga gl lt mr nl pt pt_BR ro ru sk sv tr -uk zh_CN" +KDE_LINGUAS="bs cs da de el es et fi fr ga gl hu it lt mr nl pt pt_BR ro ru sk +sl sv tr uk zh_CN zh_TW" inherit kde4-base DESCRIPTION="Alternative KDE screen management" -HOMEPAGE="https://projects.kde.org/projects/playground/base/kscreen" +HOMEPAGE="https://projects.kde.org/projects/kdereview/kscreen" LICENSE="GPL-2 LGPL-2.1" SLOT="4" diff --git a/kde-misc/kte-collaborative/Manifest b/kde-misc/kte-collaborative/Manifest deleted file mode 100644 index c50c1fbeb02..00000000000 --- a/kde-misc/kte-collaborative/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kte-collaborative-0.0.95.tar.xz 86412 SHA256 37026b8bcfd4469243dd694f4e62aa19601416792bdb8c184453715fe950ab71 SHA512 a1786cf3ca19828861a5e271053e9dba5b90f27977dcc453bc7da3bfef011ee283b9de2b3b3147bb8020b823284507bb26e8f710ad8cc54f8744a117dd2e2042 WHIRLPOOL c601dc488597dbd7fc4585993eeb1d7d58913c2a9b685d087e83120846421f45a95158c8f3319e54acc7ce157e86420098f28cfc6a78bcd6a1bc7cc36cb468f0 diff --git a/kde-misc/kte-collaborative/kte-collaborative-0.0.95.ebuild b/kde-misc/kte-collaborative/kte-collaborative-0.0.95.ebuild deleted file mode 100644 index a0cf272205b..00000000000 --- a/kde-misc/kte-collaborative/kte-collaborative-0.0.95.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DECLARATIVE_REQUIRED="always" -VIRTUALX_REQUIRED="test" -inherit kde4-base - -DESCRIPTION="Collaborative text editor via kde-telepathy" -HOMEPAGE="https://projects.kde.org/projects/playground/network/kte-collaborative" -SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="~amd64" -IUSE="debug" - -RDEPEND=" - dev-libs/glib:2 - net-im/ktp-common-internals - net-libs/libinfinity[server] - net-libs/libqinfinity - >=net-libs/telepathy-qt-0.8.9 -" -DEPEND="${RDEPEND} - app-arch/xz-utils -" - -# hangs -RESTRICT="test" diff --git a/kde-misc/nepomukshell/nepomukshell-9999.ebuild b/kde-misc/nepomukshell/nepomukshell-9999.ebuild index efa7e8f56d3..fe85243545c 100644 --- a/kde-misc/nepomukshell/nepomukshell-9999.ebuild +++ b/kde-misc/nepomukshell/nepomukshell-9999.ebuild @@ -15,7 +15,7 @@ KEYWORDS="" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdelibs 'semantic-desktop(+)') + $(add_kdebase_dep kdelibs 'semantic-desktop') " RDEPEND="${DEPEND}" diff --git a/kde-misc/plasma-nm/Manifest b/kde-misc/plasma-nm/Manifest deleted file mode 100644 index ee3bbea7e7d..00000000000 --- a/kde-misc/plasma-nm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST plasma-nm-0.9.3.0.tar.xz 445916 SHA256 6c4e7c46af7df90bee490369601c77046a24893a9104507cb5f891350b43d42d SHA512 fdef42dd9cac4527383024ec56f81f68c25a9997c21f0a636a5aeffa9a97e78fde5aea94b6677283f62c48964e967b81aa6d2246a95b2f487b475496b3113563 WHIRLPOOL a5b5e5b1b09131702ea8c4240f8bae497a0242a77ecab63fd35df7f54fa2466433ba60464710934ee1afbd9b5e611be1bb671213b68fc4ea4dc74c3dbcc6d829 diff --git a/kde-misc/plasma-nm/metadata.xml b/kde-misc/plasma-nm/metadata.xml index 8d1e86a9cef..c5ae96e2c63 100644 --- a/kde-misc/plasma-nm/metadata.xml +++ b/kde-misc/plasma-nm/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>kde</herd> + <herd>kde</herd> + <use> + <flag name="modemmanager">Enable support for mobile broadband devices</flag> + </use> </pkgmetadata> diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.0.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.0.ebuild deleted file mode 100644 index f8b168b49f1..00000000000 --- a/kde-misc/plasma-nm/plasma-nm-0.9.3.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KDE_LINGUAS="ar bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl hr -hu is it ja km lt lv mai mr ms nb nds nl nn pa pl pt pt_BR ro ru sk sl sr -sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW" -DECLARATIVE_REQUIRED="always" -inherit kde4-base - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KEYWORDS="~amd64" - SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz" -else - KEYWORDS="" -fi - -DESCRIPTION="KDE Plasma applet for NetworkManager" -HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm" - -LICENSE="GPL-2" -SLOT="4" -IUSE="debug" - -DEPEND=" - net-libs/libmm-qt - net-libs/libnm-qt - >=net-misc/networkmanager-0.9.8.0 -" -RDEPEND="${DEPEND}" diff --git a/kde-misc/plasma-nm/plasma-nm-9999.ebuild b/kde-misc/plasma-nm/plasma-nm-9999.ebuild index f8b168b49f1..eff7dec2a72 100644 --- a/kde-misc/plasma-nm/plasma-nm-9999.ebuild +++ b/kde-misc/plasma-nm/plasma-nm-9999.ebuild @@ -11,7 +11,7 @@ DECLARATIVE_REQUIRED="always" inherit kde4-base if [[ ${KDE_BUILD_TYPE} != live ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz" else KEYWORDS="" @@ -20,13 +20,23 @@ fi DESCRIPTION="KDE Plasma applet for NetworkManager" HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm" -LICENSE="GPL-2" +LICENSE="GPL-2 LGPL-2.1" SLOT="4" -IUSE="debug" +IUSE="debug modemmanager" DEPEND=" - net-libs/libmm-qt - net-libs/libnm-qt + net-libs/libnm-qt[modemmanager?] >=net-misc/networkmanager-0.9.8.0 + modemmanager? ( net-libs/libmm-qt ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-misc/networkmanagement +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT) + ) + + kde4-base_src_configure +} |
