diff options
27 files changed, 40 insertions, 92 deletions
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild index ac73c1d8782..db7a7e2a191 100644 --- a/kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild +++ b/kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="Akonadi developer console" diff --git a/kde-base/akregator/akregator-4.9999.ebuild b/kde-base/akregator/akregator-4.9999.ebuild index fb71fce6930..21ee4828a70 100644 --- a/kde-base/akregator/akregator-4.9999.ebuild +++ b/kde-base/akregator/akregator-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="KDE news feed aggregator" diff --git a/kde-base/blogilo/blogilo-4.9999.ebuild b/kde-base/blogilo/blogilo-4.9999.ebuild index 304efe799f7..62030cdb4e4 100644 --- a/kde-base/blogilo/blogilo-4.9999.ebuild +++ b/kde-base/blogilo/blogilo-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="KDE Blogging Client" diff --git a/kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild index dfce9a73215..6cd78956318 100644 --- a/kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild +++ b/kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" KMMODULE="console/${PN}" inherit kde4-meta diff --git a/kde-base/kabcclient/kabcclient-4.9999.ebuild b/kde-base/kabcclient/kabcclient-4.9999.ebuild index ec4dbcba6ad..828ccc116ff 100644 --- a/kde-base/kabcclient/kabcclient-4.9999.ebuild +++ b/kde-base/kabcclient/kabcclient-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" KMMODULE="console/${PN}" inherit kde4-meta diff --git a/kde-base/kaddressbook/kaddressbook-4.9999.ebuild b/kde-base/kaddressbook/kaddressbook-4.9999.ebuild index 5bb9902b042..d5b04dd5a21 100644 --- a/kde-base/kaddressbook/kaddressbook-4.9999.ebuild +++ b/kde-base/kaddressbook/kaddressbook-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="The KDE Address Book" diff --git a/kde-base/kalarm/kalarm-4.9999.ebuild b/kde-base/kalarm/kalarm-4.9999.ebuild index f704d9fa305..92c647fc2b7 100644 --- a/kde-base/kalarm/kalarm-4.9999.ebuild +++ b/kde-base/kalarm/kalarm-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="Personal alarm message, command and email scheduler for KDE" diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild index 03eddbc72de..941673a771f 100644 --- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild +++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" KMNOMODULE="true" inherit kde4-meta diff --git a/kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild index 676577c8d2a..2d0b9828153 100644 --- a/kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild +++ b/kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" KMMODULE="icons" inherit kde4-meta diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild index 2550388713e..abdcbacc189 100644 --- a/kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild +++ b/kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" KMMODULE="kresources" inherit kde4-meta diff --git a/kde-base/kjots/kjots-4.9999.ebuild b/kde-base/kjots/kjots-4.9999.ebuild index 1efd49c4334..b063b2152c4 100644 --- a/kde-base/kjots/kjots-4.9999.ebuild +++ b/kde-base/kjots/kjots-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="KDE note taking utility" diff --git a/kde-base/kleopatra/kleopatra-4.9999.ebuild b/kde-base/kleopatra/kleopatra-4.9999.ebuild index eced4ba76b8..ac847264180 100644 --- a/kde-base/kleopatra/kleopatra-4.9999.ebuild +++ b/kde-base/kleopatra/kleopatra-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="Kleopatra - KDE X.509 key manager" diff --git a/kde-base/kmail/kmail-4.9999.ebuild b/kde-base/kmail/kmail-4.9999.ebuild index c28ed9f502a..c3978bcedc5 100644 --- a/kde-base/kmail/kmail-4.9999.ebuild +++ b/kde-base/kmail/kmail-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" VIRTUALX_REQUIRED=test inherit flag-o-matic kde4-meta diff --git a/kde-base/knode/knode-4.9999.ebuild b/kde-base/knode/knode-4.9999.ebuild index 4e51cc58b55..1d0417ee07f 100644 --- a/kde-base/knode/knode-4.9999.ebuild +++ b/kde-base/knode/knode-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="A newsreader for KDE" diff --git a/kde-base/knotes/knotes-4.9999.ebuild b/kde-base/knotes/knotes-4.9999.ebuild index 0355e40c96f..77eeba4f59b 100644 --- a/kde-base/knotes/knotes-4.9999.ebuild +++ b/kde-base/knotes/knotes-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="KDE Notes application" diff --git a/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild index c74f11103a2..580a6150f6b 100644 --- a/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild +++ b/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" KMMODULE="console/${PN}" inherit kde4-meta diff --git a/kde-base/kontact/kontact-4.9999.ebuild b/kde-base/kontact/kontact-4.9999.ebuild index c1e781e7969..5b6da9a3f68 100644 --- a/kde-base/kontact/kontact-4.9999.ebuild +++ b/kde-base/kontact/kontact-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="KDE personal information manager" diff --git a/kde-base/korganizer/korganizer-4.9999.ebuild b/kde-base/korganizer/korganizer-4.9999.ebuild index f8ee8f39dbe..0690d42b58c 100644 --- a/kde-base/korganizer/korganizer-4.9999.ebuild +++ b/kde-base/korganizer/korganizer-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="A Personal Organizer for KDE" diff --git a/kde-base/ktimetracker/ktimetracker-4.9999.ebuild b/kde-base/ktimetracker/ktimetracker-4.9999.ebuild index f588ce32057..644c3abf873 100644 --- a/kde-base/ktimetracker/ktimetracker-4.9999.ebuild +++ b/kde-base/ktimetracker/ktimetracker-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="KTimeTracker tracks time spent on various tasks" diff --git a/kde-base/ktnef/ktnef-4.9999.ebuild b/kde-base/ktnef/ktnef-4.9999.ebuild index 3315e7c27a8..67b4d7edfb4 100644 --- a/kde-base/ktnef/ktnef-4.9999.ebuild +++ b/kde-base/ktnef/ktnef-4.9999.ebuild @@ -6,6 +6,7 @@ EAPI=5 KDE_HANDBOOK="optional" KMNAME="kdepim" +EGIT_BRANCH="KDE/4.14" inherit kde4-meta DESCRIPTION="A viewer for TNEF attachments" diff --git a/kde-base/nepomuk-core/metadata.xml b/kde-base/nepomuk-core/metadata.xml deleted file mode 100644 index e8cf53419bd..00000000000 --- a/kde-base/nepomuk-core/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>kde</herd> - <use> - <flag name="epub">Adds support for reading EPUB ebook metadata</flag> - <flag name="migrator">Installs a <pkg>kde-base/baloo</pkg> migration tool</flag> - </use> -</pkgmetadata> diff --git a/kde-base/nepomuk-core/nepomuk-core-4.9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.9999.ebuild deleted file mode 100644 index 7dc0ee33135..00000000000 --- a/kde-base/nepomuk-core/nepomuk-core-4.9999.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit kde4-base - -DESCRIPTION="Nepomuk core libraries" -KEYWORDS="" -IUSE="debug epub exif ffmpeg +migrator pdf taglib" - -DEPEND=" - >=dev-libs/shared-desktop-ontologies-0.11.0 - >=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso] - epub? ( app-text/ebook-tools ) - exif? ( media-gfx/exiv2:= ) - ffmpeg? ( virtual/ffmpeg ) - migrator? ( $(add_kdebase_dep baloo) ) - pdf? ( app-text/poppler[qt4] ) - taglib? ( media-libs/taglib ) -" -RDEPEND="${DEPEND} - !<kde-base/nepomuk-4.8.80:4 -" - -RESTRICT="test" -# bug 392989 - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package epub EPub) - $(cmake-utils_use_find_package exif Exiv2) - $(cmake-utils_use_find_package ffmpeg FFmpeg) - $(cmake-utils_use_find_package migrator Baloo) - $(cmake-utils_use_find_package pdf PopplerQt4) - $(cmake-utils_use_find_package taglib Taglib) - ) - - kde4-base_src_configure -} diff --git a/kde-base/nepomuk-widgets/metadata.xml b/kde-base/nepomuk-widgets/metadata.xml deleted file mode 100644 index a23f444b67d..00000000000 --- a/kde-base/nepomuk-widgets/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>kde</herd> -</pkgmetadata> diff --git a/kde-base/nepomuk-widgets/nepomuk-widgets-4.9999.ebuild b/kde-base/nepomuk-widgets/nepomuk-widgets-4.9999.ebuild deleted file mode 100644 index 3be0aac1b77..00000000000 --- a/kde-base/nepomuk-widgets/nepomuk-widgets-4.9999.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit kde4-base - -DESCRIPTION="Widget library for nepomuk" -KEYWORDS="" -IUSE="debug" - -DEPEND=" - $(add_kdebase_dep nepomuk-core) - >=dev-libs/soprano-2.9.0 -" -RDEPEND="${DEPEND} - !<kde-base/nepomuk-core-4.9.80:4 -" - -# tests hangs -RESTRICT="test" diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index defeb5ed7c7..c4338d3be47 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -4,7 +4,6 @@ <herd>kde</herd> <use> <flag name="display-manager">Pull in a graphical display manager</flag> - <flag name="modemmanager">Pull in ModemManager bindings for Qt</flag> <flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and KCM</flag> <flag name="wallpapers">Install the KDE wallpapers</flag> </use> diff --git a/sets/kdedeps-live b/sets/kdedeps-live index 2261d89e494..817173e1fef 100644 --- a/sets/kdedeps-live +++ b/sets/kdedeps-live @@ -1,15 +1,5 @@ -~dev-libs/shared-desktop-ontologies-9999 ~app-misc/strigi-9999 ~media-libs/phonon-9999 ~media-libs/phonon-gstreamer-9999 ~media-libs/phonon-vlc-9999 -~sys-auth/polkit-qt-9999 -~sys-auth/polkit-kde-agent-9999 -~media-libs/prison-4.9999 #~dev-libs/libqzeitgeist-9999 - -# Add these once kdelibs supports building with newer soprano using raptor2 -#>=dev-libs/redland-1.0.12 -#>=dev-libs/rasqal-0.9.20 -#~dev-libs/soprano-9999 -#media-libs/raptor:2 diff --git a/x11-misc/maliit-framework/maliit-framework-0.94.0.ebuild b/x11-misc/maliit-framework/maliit-framework-0.94.0.ebuild index b25dc678de7..783032652fe 100644 --- a/x11-misc/maliit-framework/maliit-framework-0.94.0.ebuild +++ b/x11-misc/maliit-framework/maliit-framework-0.94.0.ebuild @@ -7,7 +7,7 @@ EAPI=5 inherit qt4-r2 DESCRIPTION="A flexible and cross platform input method framework" HOMEPAGE="http://maliit.org" -SRC_URI="http://maliit.org/releases/${PN}/${PF}.tar.bz2" +SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${P}.tar.bz2/fb60280410be256d49e3f2228db5f055/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" @@ -15,9 +15,25 @@ KEYWORDS="~amd64 ~x86" IUSE="+dbus doc examples gtk test" DEPEND=" - dbus? ( sys-apps/dbus ) - gtk? ( x11-libs/gtk+ ) - dev-qt/qtdeclarative + dbus? ( + dev-libs/dbus-glib + dev-libs/glib:2 + dev-qt/qtdbus:4 + sys-apps/dbus + ) + gtk? ( + x11-libs/gtk+:2 + x11-libs/gtk+:3 + x11-libs/pango + ) + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtdeclarative:4 + virtual/libudev:= + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes " RDEPEND="${DEPEND}" |