[gentoo-commits] proj/kde:master commit in: profiles/package.mask/

2014-05-13 Thread Johannes Huber
commit: 13c6c6ed295ab5910e79ccb1ae3d6276a3ffce08
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 13 18:48:46 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 13 18:48:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=13c6c6ed

[profiles/package.mask] Remove calligra 2.8.2

* moved to the tree

---
 profiles/package.mask/calligra-2.8.2 | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/package.mask/calligra-2.8.2 
b/profiles/package.mask/calligra-2.8.2
deleted file mode 100644
index b6a633a..000
--- a/profiles/package.mask/calligra-2.8.2
+++ /dev/null
@@ -1,4 +0,0 @@
-# Johannes Huber  (13 May 2014)
-# DEPENDS on not released KDE SC 4.13.1, because of USE flag changes.
-~app-office/calligra-2.8.2
-~app-office/calligra-l10n-2.8.2



[gentoo-commits] proj/kde:master commit in: app-office/calligra-l10n/

2014-05-13 Thread Johannes Huber
commit: 0715b90346d3bad851f1c48e7b55a49f00787f75
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 13 18:50:23 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 13 18:50:23 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0715b903

[app-office/calligra-l10n] Moved to the tree

Package-Manager: portage-2.2.10

---
 .../calligra-l10n/calligra-l10n-2.8.0.ebuild   | 89 --
 .../calligra-l10n/calligra-l10n-2.8.2.ebuild   | 89 --
 app-office/calligra-l10n/metadata.xml  |  6 --
 3 files changed, 184 deletions(-)

diff --git a/app-office/calligra-l10n/calligra-l10n-2.8.0.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.8.0.ebuild
deleted file mode 100644
index 07aea8f..000
--- a/app-office/calligra-l10n/calligra-l10n-2.8.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/";
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="!app-office/koffice-l10n"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc"
-
-MY_LANGS="bs ca ca@valencia cs da de el es et fi fr gl hu it kk nb nds nl pl
-pt pt_BR ru sk sl sv uk zh_CN zh_TW"
-
-case ${PV} in
-   2.[456789].[789]?)
-   # beta or rc releases
-   URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/" ;;
-   2.[456789].?)
-   # stable releases
-   URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/" ;;
-   *)
-   SRC_URI="" ;;
-esac
-
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-   IUSE="${IUSE} linguas_${MY_LANG}"
-   SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( 
${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
-   local lng dir
-   if [[ -z ${A} ]]; then
-   elog
-   elog "You either have the LINGUAS variable unset, or it only"
-   elog "contains languages not supported by ${P}."
-   elog "You won't have any additional language support."
-   elog
-   elog "${P} supports these language codes:"
-   elog "${MY_LANGS}"
-   elog
-   fi
-
-   [[ -n ${A} ]] && unpack ${A}
-   cd "${S}"
-
-   # add all linguas to cmake
-   if [[ -n ${A} ]]; then
-   for lng in ${MY_LANGS}; do
-   dir="${PN}-${lng}-${PV}"
-   if [[ -d "${dir}" ]] ; then
-   echo "add_subdirectory( ${dir} )" >> 
"${S}"/CMakeLists.txt
-   fi
-   done
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-   $(cmake-utils_use_build doc)
-   )
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}

diff --git a/app-office/calligra-l10n/calligra-l10n-2.8.2.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.8.2.ebuild
deleted file mode 100644
index eb07df2..000
--- a/app-office/calligra-l10n/calligra-l10n-2.8.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/";
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="!app-office/koffice-l10n"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc"
-
-MY_LANGS="bs ca ca@valencia cs da de el es et eu fi fr gl hu it kk nb nds nl pl
-pt pt_BR ru sk sl sv uk zh_CN zh_TW"
-
-case ${PV} in
-   2.[456789].[789]?)
-   # beta or rc releases
-   URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/" ;;
-   2.[456789].?)
-   # stable releases
-   URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/" ;;
-   *)
-   SRC_URI="" ;;
-esac
-
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-   IUSE="${IUSE} linguas_${MY_LANG}"
- 

[gentoo-commits] proj/kde:master commit in: app-office/calligra/

2014-05-13 Thread Johannes Huber
commit: b397cf4706c1e8edd784467b7a8ffc707040b429
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 13 18:51:29 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 13 18:51:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b397cf47

[app-office/calligra] Moved to the tree

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.0.ebuild | 251 --
 app-office/calligra/calligra-2.8.2.ebuild | 249 -
 2 files changed, 500 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild 
b/app-office/calligra/calligra-2.8.0.ebuild
deleted file mode 100644
index 84d3cbf..000
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-CHECKREQS_DISK_BUILD="4G"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/";
-
-case ${PV} in
-   2.[456789].[789]?)
-   # beta or rc releases
-   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-   2.[456789].?)
-   # stable releases
-   SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-   2.[456789].)
-   # stable branch live ebuild
-   SRC_URI="" ;;
-   )
-   # master branch live ebuild
-   SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == * ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
-opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
-+threads +truetype vc xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-   IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-   calligra_features_author? ( calligra_features_words )
-   calligra_features_kexi? ( calligra_features_sheets )
-   calligra_features_words? ( calligra_features_sheets )
-   calligra_features_krita? ( eigen exif lcms )
-   calligra_features_plan? ( kdepim )
-   calligra_features_sheets? ( eigen )
-   kdepim? ( semantic-desktop )
-   vc? ( calligra_features_krita )
-   test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-   !app-office/karbon
-   !app-office/kexi
-   !app-office/koffice-data
-   !app-office/koffice-l10n
-   !app-office/koffice-libs
-   !app-office/koffice-meta
-   !app-office/kplato
-   !app-office/kpresenter
-   !app-office/krita
-   !app-office/kspread
-   !app-office/kword
-   $(add_kdebase_dep kdelibs 'semantic-desktop?')
-   dev-lang/perl
-   dev-libs/boost
-   dev-libs/libxml2
-   $(add_kdebase_dep knewstuff)
-   media-libs/libpng
-   sys-libs/zlib
-   >=dev-qt/qtgui-4.8.1-r1:4
-   virtual/libiconv
-   attica? ( dev-libs/libattica )
-   crypt? ( app-crypt/qca:2 )
-   eigen? ( dev-cpp/eigen:2 )
-   exif? ( media-gfx/exiv2:= )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   freetds? ( dev-db/freetds )
-   gif? ( media-libs/giflib )
-   glew? ( media-libs/glew )
-   glib? ( dev-libs/glib:2 )
-   gsf? ( gnome-extra/libgsf )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd
-   app-text/libwpg
-   app-text/libwps
-   media-libs/libvisio
-   )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:0 )
-   kdcraw? ( $(add_kdebase_dep libkdcraw) )
-   kde? ( $(add_kdebase_dep kactivities) )
-   kdepim? ( $(add_kdebase_dep kdepimlibs) )
-   lcms? ( media-libs/lcms:2 )
-   marble? ( $(add_kdebase_dep marble) )
-   mysql? ( virtual/mysql )
-   okular? ( $(add_kdebase_dep okular) )
-   opengl? ( virtual/glu )
-   opengtl? ( >=media-libs/opengtl-0.9.15 )
-   openexr? ( media-libs/openexr )
-   pdf? (
-   app-text/poppler:=
-   media-gfx/pstoedit
-   )
-   post

[gentoo-commits] proj/kde:master commit in: kde-misc/baloo-kcmadv/

2014-05-13 Thread Johannes Huber
commit: 18e9f8add864d4e8ccbab73803cdac469be27f5c
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 13 23:43:46 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 13 23:43:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=18e9f8ad

[kde-misc/baloo-kcmadv] Remove, already in tree

Package-Manager: portage-2.2.10

---
 .../baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild| 24 --
 1 file changed, 24 deletions(-)

diff --git a/kde-misc/baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild 
b/kde-misc/baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild
deleted file mode 100644
index 84de642..000
--- a/kde-misc/baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Alternative configuration module for the Baloo search framework"
-HOMEPAGE="https://gitorious.org/baloo-kcmadv";
-EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}"
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz";
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE=""
-
-DEPEND="
-   $(add_kdebase_dep kfilemetadata)
-   dev-libs/qjson
-   dev-libs/xapian
-"
-RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-misc/baloo-kcmadv/

2014-05-13 Thread Johannes Huber
commit: ab0f77c3c464f5db52a331ae6c041f7713994a36
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 13 23:57:36 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 13 23:57:36 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ab0f77c3

[kde-misc/baloo-kcmadv] Sync with tree

Package-Manager: portage-2.2.10

---
 kde-misc/baloo-kcmadv/baloo-kcmadv-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-misc/baloo-kcmadv/baloo-kcmadv-.ebuild 
b/kde-misc/baloo-kcmadv/baloo-kcmadv-.ebuild
index 75d424f..7ceab38 100644
--- a/kde-misc/baloo-kcmadv/baloo-kcmadv-.ebuild
+++ b/kde-misc/baloo-kcmadv/baloo-kcmadv-.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_MINIMAL=4.13.0
 inherit kde4-base
 
 DESCRIPTION="Alternative configuration module for the Baloo search framework"
@@ -16,6 +17,7 @@ SLOT="4"
 IUSE=""
 
 DEPEND="
+   $(add_kdebase_dep baloo)
$(add_kdebase_dep kfilemetadata)
dev-libs/qjson
dev-libs/xapian



[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/

2014-05-21 Thread Johannes Huber
commit: e4059af61bffcd97ba71c3c099e5670d096f4cec
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 21 11:55:37 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Wed May 21 11:55:37 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e4059af6

[app-text/kbibtex] Remove, newer version in tree

Package-Manager: portage-2.2.10

---
 app-text/kbibtex/kbibtex-0.5.0.95.ebuild | 32 
 1 file changed, 32 deletions(-)

diff --git a/app-text/kbibtex/kbibtex-0.5.0.95.ebuild 
b/app-text/kbibtex/kbibtex-0.5.0.95.ebuild
deleted file mode 100644
index b2b7de0..000
--- a/app-text/kbibtex/kbibtex-0.5.0.95.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit versionator kde4-base
-
-DESCRIPTION="BibTeX editor for KDE to edit bibliographies used with LaTeX"
-HOMEPAGE="http://home.gna.org/kbibtex/";
-if [[ ${PV} != ** ]]; then
-   SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 
1-2)/${P/_/-}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-else
-   EGIT_BRANCH="${PN}/$(get_version_component_range 1-2)"
-   KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-   app-text/poppler[qt4]
-   dev-libs/libxml2
-   dev-libs/libxslt
-   virtual/tex-base
-"
-RDEPEND="${DEPEND}
-   dev-tex/bibtex2html"
-
-S=${WORKDIR}/${P/_/-}



[gentoo-commits] proj/kde:master commit in: sets/

2014-05-22 Thread Johannes Huber
commit: 9c3fff64684c91622bc6b0016f6867af81c72979
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu May 22 10:16:44 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Thu May 22 10:16:44 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9c3fff64

[sets] Update kde-applications-live

---
 sets/kde-applications-live | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index d96366a..2a9e204 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -1,4 +1,5 @@
 # sort them later to the appropriate sets
+~kde-base/konsole-
 ~kde-misc/plasma-nm-
 ~kde-misc/milou-
 ~kde-misc/powerdevil-



[gentoo-commits] proj/kde:master commit in: eclass/

2014-05-23 Thread Johannes Huber
commit: d780a08f41c3027eca9051f2fa82b128ac3c8b5f
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 23 09:37:08 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 23 09:37:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d780a08f

[eclass] Raise required Qt version

---
 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e4d2340..fe447f8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -32,7 +32,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare 
src_configure src_compile src_
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.3.0_rc}
+: ${QT_MINIMAL:=5.3.0}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:



[gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/

2014-05-23 Thread Johannes Huber
commit: d2296ff9940b6a67986dcba4f343f9802693b500
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 23 12:01:13 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 23 12:01:13 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2296ff9

[x11-libs/libkscreen2] Block x11-libs/libkscreen

Fixes file collisions.

Package-Manager: portage-2.2.10

---
 x11-libs/libkscreen2/libkscreen2-1.71.ebuild | 4 +++-
 x11-libs/libkscreen2/libkscreen2-.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild 
b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
@@ -31,4 +31,6 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !x11-libs/libkscreen:5
+"

diff --git a/x11-libs/libkscreen2/libkscreen2-.ebuild 
b/x11-libs/libkscreen2/libkscreen2-.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-.ebuild
@@ -31,4 +31,6 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !x11-libs/libkscreen:5
+"



[gentoo-commits] proj/kde:master commit in: kde-base/milou/

2014-05-23 Thread Johannes Huber
commit: 7eb2b810dfc7512a3de222a5e8a829ea0c9f3457
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 23 12:11:04 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 23 12:11:04 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7eb2b810

[kde-base/milou] Block kde-misc/milou

Fixes file collisions.

Package-Manager: portage-2.2.10

---
 kde-base/milou/milou-4.96.0.ebuild | 1 +
 kde-base/milou/milou-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-base/milou/milou-4.96.0.ebuild 
b/kde-base/milou/milou-4.96.0.ebuild
index 5cab996..86b9959 100644
--- a/kde-base/milou/milou-4.96.0.ebuild
+++ b/kde-base/milou/milou-4.96.0.ebuild
@@ -21,4 +21,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
$(add_kdebase_dep baloo)
+   !kde-misc/milou
 "

diff --git a/kde-base/milou/milou-.ebuild b/kde-base/milou/milou-.ebuild
index 6e624b6..7c55ba3 100644
--- a/kde-base/milou/milou-.ebuild
+++ b/kde-base/milou/milou-.ebuild
@@ -21,4 +21,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
$(add_kdebase_dep baloo)
+   !kde-misc/milou
 "



[gentoo-commits] proj/kde:master commit in: app-office/calligra/

2014-05-24 Thread Johannes Huber
commit: 69f64a79742cf8e952af0731fa9fd3f1ecb569fe
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat May 24 11:30:55 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat May 24 11:30:55 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=69f64a79

[app-office/calligra] Enable USE kdepim by default, bug #510384

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-.ebuild 
b/app-office/calligra/calligra-.ebuild
index a2b231e..eb64b8c 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -41,7 +41,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
+gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
 +okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
 +truetype vc xbase +xml +xslt"
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/

2014-05-24 Thread Johannes Huber
commit: 8c2344928db26ad95241c1ade664570a5dee7ff6
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat May 24 22:43:18 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat May 24 22:48:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c234492

[kde-frameworks/kf-env] Version bump

* exports Qt5 bin path

Package-Manager: portage-2.2.10

---
 kde-frameworks/kf-env/{kf-env-1.ebuild => kf-env-2.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild 
b/kde-frameworks/kf-env/kf-env-2.ebuild
similarity index 83%
rename from kde-frameworks/kf-env/kf-env-1.ebuild
rename to kde-frameworks/kf-env/kf-env-2.ebuild
index 616c235..ebca79b 100644
--- a/kde-frameworks/kf-env/kf-env-1.ebuild
+++ b/kde-frameworks/kf-env/kf-env-2.ebuild
@@ -34,8 +34,11 @@ src_install() {
# higher number to be sure not to kill kde4 env
local envfile="${T}/78kf"
local libdir="${EPREFIX}/usr/$(get_libdir)"
+   local qt5bin="${libdir}/qt5/bin"
 
-   echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile}
+   echo "PATH=${qt5bin}" > ${envfile}
+   echo "ROOTPATH=${qt5bin}" >> ${envfile}
+   echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile}
echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile}
echo 
"QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> 
${envfile}
echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/

2014-05-24 Thread Johannes Huber
commit: b9eb662968ec77f73441c3f4fbc2e4da26ab265b
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat May 24 22:47:21 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat May 24 22:48:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b9eb6629

[kde-base/plasma-workspace] Drop obsolete patch, add missing RDEPEND

Package-Manager: portage-2.2.10

---
 .../plasma-workspace--missing-qttools.patch| 58 --
 .../plasma-workspace-4.96.0.ebuild |  6 +--
 .../plasma-workspace/plasma-workspace-.ebuild  |  4 +-
 3 files changed, 3 insertions(+), 65 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch 
b/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
deleted file mode 100644
index 3c80f21..000
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 14ce47a..58c3a7a 100644
 a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #
--#  DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ )
-+#  DEFAULT KDE STARTUP SCRIPT ( @PLASMAWORKSPACE_VERSION@ )
- #
- 
- if test "x$1" = x--failsafe; then
-@@ -17,17 +17,17 @@ trap 'echo GOT SIGHUP' HUP
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
- # in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`qtpaths --binaries-dir`
--  qdbus=$qbindir/qdbus
--  case $PATH in
--$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--*) PATH=$bindir:$PATH; export PATH;;
--  esac
--else
-+#bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-+#if [ -n "$bindir" ]; then
-+#  qbindir=`qtpaths --binaries-dir`
-+#  qdbus=$qbindir/qdbus
-+#  case $PATH in
-+#$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-+#*) PATH=$bindir:$PATH; export PATH;;
-+#  esac
-+#else
-   qdbus=qdbus
--fi
-+#fi
- 
- # Check if a KDE session already is running and whether it's possible to 
connect to X
- kcheckrunning
-@@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
- ksplash_pid=
- if test -z "$dl"; then
-   # languages as resolved by KLocale, for the splash screens use
--  # klocale_languages is assembled by kdostartupconfig4 calling KLocale
-+  # klocale_languages is assembled by kdostartupconfig5 calling KLocale
-   KLOCALE_LANGUAGES="$klocale_languages"
-   export KLOCALE_LANGUAGES
-   # the splashscreen and progress indicator
-@@ -200,7 +200,7 @@ for prefix in `echo "$libpath" | sed -n -e 
's,/lib[^/]*/,/env/,p'`; do
- done
- 
- # Set the path for Qt plugins provided by KDE
--QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
-+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kf5-config --qt-plugins`
- # TODO: Do we really need this?
- QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
- export QT_PLUGIN_PATH

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
index 66ab734..f5b10a7 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
@@ -72,7 +72,8 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
$(add_kdebase_dep milou)
-   dev-qt/qtquickcontrols:5
+   dev-qt/qdbus:5
+   dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4
!kde-base/libtaskmanager:4
@@ -90,9 +91,6 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
 "
 
-# Needed until bug 457024 is resolved
-PATCHES=( "${FILESDIR}/${PN}--missing-qttools.patch" )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index 0ed1cfa..b90ecee 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -72,6 +72,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
$(add_kdebase_dep milou)
+   dev-qt/qdbus:5
dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4
@@ -90,9 +91,6 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
 "
 
-# Needed until bug 457024 is resolved
-PATCHES=( "${FILESDIR}/${P}-missing-qttools.patch" )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/

2014-05-24 Thread Johannes Huber
commit: dca65bea1c055f717bccadf1d88b0e2a95dd0578
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat May 24 22:58:02 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat May 24 22:58:02 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dca65bea

[kde-base/plasma-workspace] Add missing RDEPEND on dev-qt/qtpaths

Package-Manager: portage-2.2.10

---
 kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild | 1 +
 kde-base/plasma-workspace/plasma-workspace-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
index f5b10a7..5cbaf23 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
@@ -73,6 +73,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
$(add_kdebase_dep milou)
dev-qt/qdbus:5
+   dev-qt/qtpaths:5
dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index b90ecee..db8b2ff 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -73,6 +73,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
$(add_kdebase_dep milou)
dev-qt/qdbus:5
+   dev-qt/qtpaths:5
dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4



[gentoo-commits] proj/kde:master commit in: kde-misc/yakuake/

2014-05-25 Thread Johannes Huber
commit: f1fa12a8af288df63180533dfad344d818dcd931
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 09:16:27 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 09:16:27 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f1fa12a8

[kde-misc/yakuake] KF5 version

Package-Manager: portage-2.2.10

---
 .../{yakuake-.ebuild => yakuake-4..ebuild} |  0
 kde-misc/yakuake/yakuake-.ebuild   | 38 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/kde-misc/yakuake/yakuake-.ebuild 
b/kde-misc/yakuake/yakuake-4..ebuild
similarity index 100%
copy from kde-misc/yakuake/yakuake-.ebuild
copy to kde-misc/yakuake/yakuake-4..ebuild

diff --git a/kde-misc/yakuake/yakuake-.ebuild 
b/kde-misc/yakuake/yakuake-.ebuild
index 50f0fe0..895effa 100644
--- a/kde-misc/yakuake/yakuake-.ebuild
+++ b/kde-misc/yakuake/yakuake-.ebuild
@@ -4,19 +4,39 @@
 
 EAPI=5
 
-KDE_LINGUAS="ca cs da de el en_GB es et fr ga gl hr it ja ko nb nds nl nn pl pt
-pt_BR ro ru sk sv th tr uk wa zh_CN"
-inherit kde4-base
+EGIT_BRANCH="frameworks"
+inherit kde5
 
-DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
+DESCRIPTION="Quake-style terminal emulator based on konsole"
 HOMEPAGE="http://yakuake.kde.org/";
-[[ ${PV} == * ]] || 
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
-SLOT="4"
-IUSE="debug"
+IUSE=""
 
-DEPEND="$(add_kdebase_dep konsole)
-   sys-devel/gettext"
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knewstuff)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_kdebase_dep konsole)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   x11-libs/libX11
+"
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: sets/

2014-05-25 Thread Johannes Huber
commit: 6c0919dcabf82ae10753442fa8a3aa29a32ef0a6
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 09:18:32 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 09:18:32 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6c0919dc

[sets] Update kde-applications-live

---
 sets/kde-applications-live | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index da1143a..a97e543 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -1,6 +1,7 @@
 # sort them later to the appropriate sets
 ~kde-base/konsole-
 ~kde-misc/plasma-nm-
+~kde-misc/yakuake-
 ~net-libs/libmm-qt-
 ~net-libs/libnm-qt-
 ~x11-libs/libkscreen2-



[gentoo-commits] proj/kde:master commit in: kde-base/kate/

2014-05-25 Thread Johannes Huber
commit: 8c8e1972afe498c658ffd999392b5776515eaf52
Author: Alexandr Akulich  gmail  com>
AuthorDate: Wed May 21 21:30:32 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 14:25:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c8e1972

[kde-base/kate] Added ebuild for frameworks based kate.

Changes with 4.x ebuilds:
- Added "addons" use-flag to provide a way to disable kate plugins.
Enabled by default, because it was silently builds in 4.x ebuild.
- Removed python use and dependency (pykde5 is not available)
- Changed description.

---
 kde-base/kate/kate-.ebuild | 62 ++
 kde-base/kate/metadata.xml |  3 ++
 2 files changed, 65 insertions(+)

diff --git a/kde-base/kate/kate-.ebuild b/kde-base/kate/kate-.ebuild
new file mode 100644
index 000..f02ee85
--- /dev/null
+++ b/kde-base/kate/kate-.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+EGIT_BRANCH="frameworks"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor."
+HOMEPAGE="http://www.kde.org/applications/utilities/kate 
http://kate-editor.org";
+KEYWORDS=""
+IUSE="+addons debug"
+
+DEPEND="
+   $(add_frameworks_dep kactivities)
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtscript:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+
+   dev-libs/libxml2
+   dev-libs/libxslt
+   dev-libs/qjson
+"
+RDEPEND="${DEPEND}
+   !kde-base/kate:4
+"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_build addons)
+   -DBUILD_kwrite=FALSE
+   )
+
+   kde5_src_configure
+}

diff --git a/kde-base/kate/metadata.xml b/kde-base/kate/metadata.xml
index a23f444..8f0a635 100644
--- a/kde-base/kate/metadata.xml
+++ b/kde-base/kate/metadata.xml
@@ -2,4 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
kde
+   
+   Build and install additional plugins
+   
 



[gentoo-commits] proj/kde:master commit in: kde-base/kwrite/

2014-05-25 Thread Johannes Huber
commit: 7a1528f13ab69b90a55b2e2daa4cc912e7bcb26d
Author: Alexandr Akulich  gmail  com>
AuthorDate: Wed May 21 21:29:46 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 14:25:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7a1528f1

[kde-base/kwrite] Added ebuild for frameworks based kwrite.

---
 kde-base/kwrite/kwrite-.ebuild | 50 ++
 1 file changed, 50 insertions(+)

diff --git a/kde-base/kwrite/kwrite-.ebuild 
b/kde-base/kwrite/kwrite-.ebuild
new file mode 100644
index 000..3fdffbe
--- /dev/null
+++ b/kde-base/kwrite/kwrite-.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KMNAME="kate"
+EGIT_BRANCH="frameworks"
+
+inherit kde5
+
+DESCRIPTION="KDE simple text editor."
+HOMEPAGE="http://www.kde.org/applications/utilities/kwrite";
+KEYWORDS=""
+
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+"
+
+RDEPEND="${DEPEND}
+   !kde-base/kwrite:4
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_addons=FALSE
+   -DBUILD_kate=FALSE
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] proj/kde:master commit in: sets/

2014-05-25 Thread Johannes Huber
commit: 0b1527fb23a27b58061b605386c4f79f6ecc1276
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 14:29:08 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 14:29:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0b1527fb

[sets] Update kde-applications-live

---
 sets/kde-applications-live | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index a97e543..72129e5 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -1,5 +1,7 @@
 # sort them later to the appropriate sets
+~kde-base/kate-
 ~kde-base/konsole-
+~kde-base/kwrite-
 ~kde-misc/plasma-nm-
 ~kde-misc/yakuake-
 ~net-libs/libmm-qt-



[gentoo-commits] proj/kde:master commit in: kde-misc/yakuake/

2014-05-25 Thread Johannes Huber
commit: 776c2e521b2cbf17a5f9b613f34abd5081a0911e
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 14:31:14 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 14:31:14 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=776c2e52

[kde-misc/yakuake] Block SLOT 4 to prevent file collisions

Package-Manager: portage-2.2.10

---
 kde-misc/yakuake/yakuake-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-misc/yakuake/yakuake-.ebuild 
b/kde-misc/yakuake/yakuake-.ebuild
index 895effa..ff31dfa 100644
--- a/kde-misc/yakuake/yakuake-.ebuild
+++ b/kde-misc/yakuake/yakuake-.ebuild
@@ -39,4 +39,6 @@ DEPEND="
dev-qt/qtx11extras:5
x11-libs/libX11
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !kde-misc/yakuake:4
+"



[gentoo-commits] proj/kde:master commit in: kde-base/kate/

2014-05-25 Thread Johannes Huber
commit: 6ce3fef71d5cce4cc038b272418ebd79e20acd87
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 14:35:24 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 14:35:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6ce3fef7

[kde-base/kate] DESCRIPTION, whitespace + sort

Package-Manager: portage-2.2.10

---
 kde-base/kate/kate-.ebuild | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kde-base/kate/kate-.ebuild b/kde-base/kate/kate-.ebuild
index f02ee85..61055e6 100644
--- a/kde-base/kate/kate-.ebuild
+++ b/kde-base/kate/kate-.ebuild
@@ -9,7 +9,7 @@ KMNAME="kate"
 EGIT_BRANCH="frameworks"
 inherit kde5
 
-DESCRIPTION="Kate is an advanced text editor."
+DESCRIPTION="Kate is an advanced text editor"
 HOMEPAGE="http://www.kde.org/applications/utilities/kate 
http://kate-editor.org";
 KEYWORDS=""
 IUSE="+addons debug"
@@ -36,6 +36,9 @@ DEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep sonnet)
+   dev-libs/libxml2
+   dev-libs/libxslt
+   dev-libs/qjson
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -43,10 +46,6 @@ DEPEND="
dev-qt/qtscript:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
-
-   dev-libs/libxml2
-   dev-libs/libxslt
-   dev-libs/qjson
 "
 RDEPEND="${DEPEND}
!kde-base/kate:4



[gentoo-commits] proj/kde:master commit in: kde-base/kwrite/

2014-05-25 Thread Johannes Huber
commit: 435507705d0c37766cf83e7f30f664ea055c9280
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 14:32:49 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 14:32:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=43550770

[kde-base/kwrite] Whitespace + DESCRIPTION

Package-Manager: portage-2.2.10

---
 kde-base/kwrite/kwrite-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kde-base/kwrite/kwrite-.ebuild 
b/kde-base/kwrite/kwrite-.ebuild
index 3fdffbe..1d189f9 100644
--- a/kde-base/kwrite/kwrite-.ebuild
+++ b/kde-base/kwrite/kwrite-.ebuild
@@ -6,10 +6,9 @@ EAPI=5
 
 KMNAME="kate"
 EGIT_BRANCH="frameworks"
-
 inherit kde5
 
-DESCRIPTION="KDE simple text editor."
+DESCRIPTION="KDE simple text editor"
 HOMEPAGE="http://www.kde.org/applications/utilities/kwrite";
 KEYWORDS=""
 



[gentoo-commits] proj/kde:master commit in: Documentation/

2014-05-25 Thread Johannes Huber
commit: 4dedfc99f3833262203b00c2ceb776730836aa55
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 14:41:01 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 14:41:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4dedfc99

[Documentation] Update CONTRIBUTORS

---
 Documentation/CONTRIBUTORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/CONTRIBUTORS b/Documentation/CONTRIBUTORS
index edbbe51..52fc5cf 100644
--- a/Documentation/CONTRIBUTORS
+++ b/Documentation/CONTRIBUTORS
@@ -1,6 +1,7 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 Alex Alexander 
 Alex Turbov 
+Alexandr Akulich 
 Alexey Shvetsov 
 Andreas K. Hüttel 
 Arfrever Frehtes Taifersar Arahesis 



[gentoo-commits] proj/kde:master commit in: kde-base/klipper/

2014-05-25 Thread Johannes Huber
commit: 4c44df2d04a9d84677df5d6d6f8561f61b77b899
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 15:19:40 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 15:19:40 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4c44df2d

[kde-base/klipper] Pin media-libs/prison to SLOT 4

Package-Manager: portage-2.2.10

---
 kde-base/klipper/klipper-4.11.49..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/klipper/klipper-4.11.49..ebuild 
b/kde-base/klipper/klipper-4.11.49..ebuild
index c7a1040..061810c 100644
--- a/kde-base/klipper/klipper-4.11.49..ebuild
+++ b/kde-base/klipper/klipper-4.11.49..ebuild
@@ -18,7 +18,7 @@ DEPEND="
$(add_kdebase_dep libtaskmanager)
sys-libs/zlib
x11-libs/libX11
-   prison? ( media-libs/prison )
+   prison? ( media-libs/prison:4 )
 "
 RDEPEND="${DEPEND}"
 



[gentoo-commits] proj/kde:master commit in: media-libs/prison/

2014-05-25 Thread Johannes Huber
commit: 0bbd1ed8deadc91bb26a25312b74f86b4544ed1a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 15:10:57 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 15:10:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0bbd1ed8

[media-libs/prison] Qt5 version

Package-Manager: portage-2.2.10

---
 .../prison/{prison-.ebuild => prison-4..ebuild} |  0
 media-libs/prison/prison-.ebuild| 17 +
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/media-libs/prison/prison-.ebuild 
b/media-libs/prison/prison-4..ebuild
similarity index 100%
copy from media-libs/prison/prison-.ebuild
copy to media-libs/prison/prison-4..ebuild

diff --git a/media-libs/prison/prison-.ebuild 
b/media-libs/prison/prison-.ebuild
index 967dedb..b678046 100644
--- a/media-libs/prison/prison-.ebuild
+++ b/media-libs/prison/prison-.ebuild
@@ -4,18 +4,27 @@
 
 EAPI=5
 
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/prison";
 
 LICENSE="GPL-2"
 KEYWORDS=""
-SLOT="4"
-IUSE="debug"
+IUSE=""
 
 DEPEND="
media-gfx/qrencode
media-libs/libdmtx
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !media-libs/prison:4
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DQT5_BUILD=TRUE
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] proj/kde:master commit in: kde-base/kdepimlibs/

2014-05-25 Thread Johannes Huber
commit: 5caf3920de0213bee83d737458928dc5a68cb6c3
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 15:18:22 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 15:18:22 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5caf3920

[kde-base/kdepimlibs] Pin media-libs/prison to SLOT 4

Package-Manager: portage-2.2.10

---
 kde-base/kdepimlibs/kdepimlibs-4.13.49..ebuild | 2 +-
 kde-base/kdepimlibs/kdepimlibs-4..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/kdepimlibs/kdepimlibs-4.13.49..ebuild 
b/kde-base/kdepimlibs/kdepimlibs-4.13.49..ebuild
index fdb60b4..e94f18a 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.13.49..ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.13.49..ebuild
@@ -27,7 +27,7 @@ DEPEND="
>=dev-libs/qjson-0.8.1
media-libs/phonon
x11-misc/shared-mime-info
-   prison? ( media-libs/prison )
+   prison? ( media-libs/prison:4 )
ldap? ( net-nds/openldap )
 "
 # boost is not linked to, but headers which include it are installed

diff --git a/kde-base/kdepimlibs/kdepimlibs-4..ebuild 
b/kde-base/kdepimlibs/kdepimlibs-4..ebuild
index fdb60b4..e94f18a 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4..ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4..ebuild
@@ -27,7 +27,7 @@ DEPEND="
>=dev-libs/qjson-0.8.1
media-libs/phonon
x11-misc/shared-mime-info
-   prison? ( media-libs/prison )
+   prison? ( media-libs/prison:4 )
ldap? ( net-nds/openldap )
 "
 # boost is not linked to, but headers which include it are installed



[gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, Documentation/package.accept_keywords/, ...

2014-05-25 Thread Johannes Huber
commit: 45204b51d93acfc7928c4942ed92ccdb9f6d2ff0
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 15:13:10 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 15:13:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=45204b51

[Documentation] Update KDE SC 4 live keywords

---
 Documentation/package.accept_keywords/.kde-live/kdedeps-live | 2 +-
 Documentation/package.accept_keywords/kde-live.keywords  | 2 +-
 Documentation/package.mask/kde-live  | 2 +-
 Documentation/package.unmask/kde-live| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/package.accept_keywords/.kde-live/kdedeps-live 
b/Documentation/package.accept_keywords/.kde-live/kdedeps-live
index cf3f576..b155354 100644
--- a/Documentation/package.accept_keywords/.kde-live/kdedeps-live
+++ b/Documentation/package.accept_keywords/.kde-live/kdedeps-live
@@ -7,7 +7,7 @@
 ~media-libs/phonon-vlc- **
 ~sys-auth/polkit-qt- **
 ~sys-auth/polkit-kde-agent- **
-~media-libs/prison- **
+~media-libs/prison-4. **
 #~dev-libs/libqzeitgeist-
 
 # Add these once kdelibs supports building with newer soprano using raptor2

diff --git a/Documentation/package.accept_keywords/kde-live.keywords 
b/Documentation/package.accept_keywords/kde-live.keywords
index 3a3987d..13c5c38 100644
--- a/Documentation/package.accept_keywords/kde-live.keywords
+++ b/Documentation/package.accept_keywords/kde-live.keywords
@@ -129,7 +129,7 @@
 ~media-libs/phonon-vlc- **
 ~sys-auth/polkit-qt- **
 ~sys-auth/polkit-kde-agent- **
-~media-libs/prison- **
+~media-libs/prison-4. **
 #~dev-libs/libqzeitgeist-
 
 # Add these once kdelibs supports building with newer soprano using raptor2

diff --git a/Documentation/package.mask/kde-live 
b/Documentation/package.mask/kde-live
index 85e80eb..989382c 100644
--- a/Documentation/package.mask/kde-live
+++ b/Documentation/package.mask/kde-live
@@ -129,7 +129,7 @@
 ~media-libs/phonon-vlc-
 ~sys-auth/polkit-qt-
 ~sys-auth/polkit-kde-agent-
-~media-libs/prison-
+~media-libs/prison-4.
 #~dev-libs/libqzeitgeist-
 
 # Add these once kdelibs supports building with newer soprano using raptor2

diff --git a/Documentation/package.unmask/kde-live 
b/Documentation/package.unmask/kde-live
index 85e80eb..989382c 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -129,7 +129,7 @@
 ~media-libs/phonon-vlc-
 ~sys-auth/polkit-qt-
 ~sys-auth/polkit-kde-agent-
-~media-libs/prison-
+~media-libs/prison-4.
 #~dev-libs/libqzeitgeist-
 
 # Add these once kdelibs supports building with newer soprano using raptor2



[gentoo-commits] proj/kde:master commit in: sets/

2014-05-25 Thread Johannes Huber
commit: 288ac673466e27855dca112cd569b35d78328966
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 15:12:38 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 15:12:38 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=288ac673

[sets] Update kdedeps-live

---
 sets/kdedeps-live | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sets/kdedeps-live b/sets/kdedeps-live
index f6e3d69..cb8563d 100644
--- a/sets/kdedeps-live
+++ b/sets/kdedeps-live
@@ -7,7 +7,7 @@
 ~media-libs/phonon-vlc-
 ~sys-auth/polkit-qt-
 ~sys-auth/polkit-kde-agent-
-~media-libs/prison-
+~media-libs/prison-4.
 #~dev-libs/libqzeitgeist-
 
 # Add these once kdelibs supports building with newer soprano using raptor2



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/

2014-05-25 Thread Johannes Huber
commit: 5d1ea4d2f22709cfc4da33c2b6dd790c5ba5d271
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 25 15:48:48 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun May 25 15:48:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d1ea4d2

[kde-base/plasma-workspace] Add prison support

Package-Manager: portage-2.2.10

---
 ...plasma-workspace--cmake-enable-prison.patch | 56 ++
 kde-base/plasma-workspace/metadata.xml |  3 +-
 .../plasma-workspace/plasma-workspace-.ebuild  |  6 ++-
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
new file mode 100644
index 000..dc18fd1
--- /dev/null
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
@@ -0,0 +1,56 @@
+From faf9e0a0af6a2842b9f4ebf4cd901062cc006e04 Mon Sep 17 00:00:00 2001
+From: Johannes Huber 
+Date: Sun, 25 May 2014 17:29:16 +0200
+Subject: [PATCH] [klipper] Re-enable prison
+
+---
+ klipper/CMakeLists.txt | 26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
+index 57425da..20d88ca 100644
+--- a/klipper/CMakeLists.txt
 b/klipper/CMakeLists.txt
+@@ -14,16 +14,16 @@ set(libklipper_common_SRCS
+ clipcommandprocess.cpp
+ )
+ 
+-# find_package(Prison QUIET CONFIG)
+-# set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
+-#URL "http://projects.kde.org/prison";
+-#TYPE OPTIONAL
+-#PURPOSE "Needed to create mobile barcodes from 
clipboard data"
+-#   )
+-# if (PRISON_FOUND)
+-# add_definitions(-DHAVE_PRISON)
+-# include_directories(${PRISON_INCLUDE_DIR})
+-# endif ()
++find_package(Prison QUIET CONFIG)
++set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
++   URL "http://projects.kde.org/prison";
++   TYPE OPTIONAL
++   PURPOSE "Needed to create mobile barcodes from 
clipboard data"
++  )
++if (PRISON_FOUND)
++ add_definitions(-DHAVE_PRISON)
++ include_directories(${PRISON_INCLUDE_DIR})
++endif ()
+ 
+ 
+ kde4_add_app_icon(libklipper_common_SRCS 
"${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png")
+@@ -40,9 +40,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras 
KF5::GlobalAccel KF5::Windo
+ if (X11_Xfixes_FOUND)
+   target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
+ endif ()
+-# if (PRISON_FOUND)
+-#   target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
+-# endif ()
++if (PRISON_FOUND)
++  target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
++endif ()
+ 
+ install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
+-- 
+1.9.3
+

diff --git a/kde-base/plasma-workspace/metadata.xml 
b/kde-base/plasma-workspace/metadata.xml
index efbee28..14094dc 100644
--- a/kde-base/plasma-workspace/metadata.xml
+++ b/kde-base/plasma-workspace/metadata.xml
@@ -3,9 +3,10 @@
 
kde

+   Enable JSON support via 
dev-libs/qjson
KDE PIM integration via 
kde-base/kdepimlibs
Enable Nepomuk based semantic desktop 
support (deprecated)
-   Enable JSON support via 
dev-libs/qjson
+   Enable support for barcodes/QRcodes
Enable Qalculate runner using 
sci-libs/libqalculate

 

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index db8b2ff..2bc9036 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="dbus X"
+IUSE="dbus prison X"
 
 COMMON_DEPEND="
$(add_kdebase_dep libksysguard)
@@ -59,6 +59,7 @@ COMMON_DEPEND="
sys-libs/zlib
x11-libs/libkscreen2:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+   prison? ( media-libs/prison:5 )
X? (
dev-qt/qtx11extras:5
x11-libs/libICE
@@ -92,9 +93,12 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake-enable-prison.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+   $(cmake-utils_use_find_package prison)
$(cmake-utils_use_find_package X X11)
)
 



[gentoo-commits] proj/kde:master commit in: kde-base/powerdevil/

2014-05-26 Thread Johannes Huber
commit: cab22e0a5afd34e630c855bcca432cc2233576a5
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 12:07:33 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 12:07:33 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cab22e0a

[kde-base/powerdevil:5] Re-work, bug #511496

Based on the user closed pull request https://github.com/gentoo/kde/pull/27.
Thanks to Elias Probst  eliasprobst.eu>.

Package-Manager: portage-2.2.10

---
 kde-base/powerdevil/metadata.xml |  1 +
 kde-base/powerdevil/powerdevil-4.96.0.ebuild | 48 
 kde-base/powerdevil/powerdevil-.ebuild   | 48 
 3 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/kde-base/powerdevil/metadata.xml b/kde-base/powerdevil/metadata.xml
index 4116ba0..2a5cde4 100644
--- a/kde-base/powerdevil/metadata.xml
+++ b/kde-base/powerdevil/metadata.xml
@@ -4,5 +4,6 @@
kde

Adds support for suspend/resume the 
system through sys-power/pm-utils
+   Adds support for the 
sys-power/upower backend

 

diff --git a/kde-base/powerdevil/powerdevil-4.96.0.ebuild 
b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
index 33bb718..b34db6e 100644
--- a/kde-base/powerdevil/powerdevil-4.96.0.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
@@ -6,18 +6,52 @@ EAPI=5
 
 inherit kde5
 
-DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
+DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil";
-
-LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+upower X"
 
 DEPEND="
-   $(add_frameworks_dep krunner)
-   dev-qt/qtdeclarative:5
+   $(add_frameworks_dep kauth)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kidletime)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep solid)
+   $(add_kdebase_dep plasma-workspace)
+   dev-qt/qtdbus:5
dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   upower? ( sys-power/upoweri:= )
+   X? (
+   dev-qt/qtx11extras:5
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libXrandr
+   )
 "
-RDEPEND="${DEPEND}
+
+RDEPEND="
+   ${DEPEND}
!kde-base/powerdevil:4
 "
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package upower UDev)
+   $(cmake-utils_use_find_package X X11)
+   )
+
+   kde5_src_configure
+}

diff --git a/kde-base/powerdevil/powerdevil-.ebuild 
b/kde-base/powerdevil/powerdevil-.ebuild
index 9fcdef6..5bf23ce 100644
--- a/kde-base/powerdevil/powerdevil-.ebuild
+++ b/kde-base/powerdevil/powerdevil-.ebuild
@@ -6,18 +6,52 @@ EAPI=5
 
 inherit kde5
 
-DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
+DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil";
-
-LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS=""
-IUSE=""
+IUSE="+upower X"
 
 DEPEND="
-   $(add_frameworks_dep krunner)
-   dev-qt/qtdeclarative:5
+   $(add_frameworks_dep kauth)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kidletime)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep solid)
+   $(add_kdebase_dep plasma-workspace)
+   dev-qt/qtdbus:5
dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   upower? ( sys-power/upoweri:= )
+   X? (
+   dev-qt/qtx11extras:5
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libXrandr
+   )
 "
-RDEPEND="${DEPEND}
+
+RDEPEND="
+   ${DEPEND}
 

[gentoo-commits] proj/kde:master commit in: kde-base/powerdevil/

2014-05-26 Thread Johannes Huber
commit: cf7d5add295a2699d48bc8eaa47e92de5f175315
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 12:12:33 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 12:12:33 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cf7d5add

[kde-base/powerdevil] Fix typo

Package-Manager: portage-2.2.10

---
 kde-base/powerdevil/powerdevil-4.96.0.ebuild | 2 +-
 kde-base/powerdevil/powerdevil-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/powerdevil/powerdevil-4.96.0.ebuild 
b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
index b34db6e..627f878 100644
--- a/kde-base/powerdevil/powerdevil-4.96.0.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
@@ -33,7 +33,7 @@ DEPEND="
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
-   upower? ( sys-power/upoweri:= )
+   upower? ( sys-power/upower:= )
X? (
dev-qt/qtx11extras:5
x11-libs/libX11

diff --git a/kde-base/powerdevil/powerdevil-.ebuild 
b/kde-base/powerdevil/powerdevil-.ebuild
index 5bf23ce..89fa95f 100644
--- a/kde-base/powerdevil/powerdevil-.ebuild
+++ b/kde-base/powerdevil/powerdevil-.ebuild
@@ -33,7 +33,7 @@ DEPEND="
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
-   upower? ( sys-power/upoweri:= )
+   upower? ( sys-power/upower:= )
X? (
dev-qt/qtx11extras:5
x11-libs/libX11



[gentoo-commits] proj/kde:master commit in: kde-frameworks/kactivities/

2014-05-26 Thread Johannes Huber
commit: ec4df6a74c199d12d8d9f9fe144a7e82ba67a953
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 12:34:31 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 12:34:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ec4df6a7

[kde-frameworks/kactivities] Enable backend build

Fixes activity support in Plasma Next

Package-Manager: portage-2.2.10

---
 kde-frameworks/kactivities/kactivities-4.99.0.ebuild | 14 --
 kde-frameworks/kactivities/kactivities-.ebuild   | 14 --
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/kde-frameworks/kactivities/kactivities-4.99.0.ebuild 
b/kde-frameworks/kactivities/kactivities-4.99.0.ebuild
index f858334..83f8081 100644
--- a/kde-frameworks/kactivities/kactivities-4.99.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-4.99.0.ebuild
@@ -11,16 +11,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="
+DEPEND="
$(add_frameworks_dep kdbusaddons)
dev-qt/qtdbus:5
 "
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   -DKACTIVITIES_LIBRARY_ONLY=true
-   )
-
-   kde5_src_configure
-}
+RDEPEND="${DEPEND}
+   !kde-base/kactivities:4
+"

diff --git a/kde-frameworks/kactivities/kactivities-.ebuild 
b/kde-frameworks/kactivities/kactivities-.ebuild
index 9ca6e1d..9ea9cb7 100644
--- a/kde-frameworks/kactivities/kactivities-.ebuild
+++ b/kde-frameworks/kactivities/kactivities-.ebuild
@@ -11,16 +11,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
$(add_frameworks_dep kdbusaddons)
dev-qt/qtdbus:5
 "
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   -DKACTIVITIES_LIBRARY_ONLY=true
-   )
-
-   kde5_src_configure
-}
+RDEPEND="${DEPEND}
+   !kde-base/kactivities:4
+"



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/

2014-05-26 Thread Johannes Huber
commit: 6d33f76174ece6dae7c54421df65e7f10bf29abe
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 17:42:11 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 17:43:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6d33f761

[kde-base/plasma-workspace] Update prison patch

Package-Manager: portage-2.2.10

---
 .../plasma-workspace--cmake-enable-prison.patch| 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
index dc18fd1..48924a4 100644
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
@@ -1,17 +1,17 @@
-From faf9e0a0af6a2842b9f4ebf4cd901062cc006e04 Mon Sep 17 00:00:00 2001
+From e6e1db527e636649634db97846abd09862861134 Mon Sep 17 00:00:00 2001
 From: Johannes Huber 
 Date: Sun, 25 May 2014 17:29:16 +0200
 Subject: [PATCH] [klipper] Re-enable prison
 
 ---
- klipper/CMakeLists.txt | 26 +-
- 1 file changed, 13 insertions(+), 13 deletions(-)
+ klipper/CMakeLists.txt | 24 
+ 1 file changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
-index 57425da..20d88ca 100644
+index c700f9e..7c66022 100644
 --- a/klipper/CMakeLists.txt
 +++ b/klipper/CMakeLists.txt
-@@ -14,16 +14,16 @@ set(libklipper_common_SRCS
+@@ -16,15 +16,15 @@ set(libklipper_common_SRCS
  clipcommandprocess.cpp
  )
  
@@ -22,7 +22,6 @@ index 57425da..20d88ca 100644
 -#PURPOSE "Needed to create mobile barcodes from 
clipboard data"
 -#   )
 -# if (PRISON_FOUND)
--# add_definitions(-DHAVE_PRISON)
 -# include_directories(${PRISON_INCLUDE_DIR})
 -# endif ()
 +find_package(Prison QUIET CONFIG)
@@ -32,13 +31,12 @@ index 57425da..20d88ca 100644
 +   PURPOSE "Needed to create mobile barcodes from 
clipboard data"
 +  )
 +if (PRISON_FOUND)
-+ add_definitions(-DHAVE_PRISON)
 + include_directories(${PRISON_INCLUDE_DIR})
 +endif ()
  
- 
- kde4_add_app_icon(libklipper_common_SRCS 
"${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png")
-@@ -40,9 +40,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras 
KF5::GlobalAccel KF5::Windo
+ set(HAVE_PRISON ${PRISON_FOUND})
+ configure_file(config-klipper.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h )
+@@ -43,9 +43,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras 
KF5::GlobalAccel KF5::Windo
  if (X11_Xfixes_FOUND)
target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
  endif ()



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-05-26 Thread Johannes Huber
commit: 022474e8a739fe1036a15d05c3f1413eb9e80f6a
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 18:28:20 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 18:28:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=022474e8

[kde-base/plasma-desktop] Enable fontconfig by default

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild | 2 +-
 kde-base/plasma-desktop/plasma-desktop-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
index b891bb5..b588775 100644
--- a/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-4.96.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fontconfig pulseaudio usb"
+IUSE="+fontconfig pulseaudio usb"
 
 RDEPEND="
$(add_kdebase_dep kwin)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 14500b9..55aa82d 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="fontconfig pulseaudio usb"
+IUSE="+fontconfig pulseaudio usb"
 
 RDEPEND="
$(add_kdebase_dep kwin)



[gentoo-commits] proj/kde:master commit in: kde-frameworks/kactivities/

2014-05-26 Thread Johannes Huber
commit: 601d36e857cbea3101e4eb6eb5cd9c59085149ea
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 21:09:53 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 21:09:53 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=601d36e8

[kde-frameworks/kactivities] Add missing dependencies

Package-Manager: portage-2.2.10

---
 kde-frameworks/kactivities/kactivities-4.99.0.ebuild | 11 ++-
 kde-frameworks/kactivities/kactivities-.ebuild   |  9 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/kactivities/kactivities-4.99.0.ebuild 
b/kde-frameworks/kactivities/kactivities-4.99.0.ebuild
index b3cc83d..71383b8 100644
--- a/kde-frameworks/kactivities/kactivities-4.99.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-4.99.0.ebuild
@@ -8,12 +8,21 @@ inherit kde5
 
 DESCRIPTION="Framework for working with KDE activities"
 LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwindowsystem)
dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}
!kde-base/kactivities:4[-minimal]

diff --git a/kde-frameworks/kactivities/kactivities-.ebuild 
b/kde-frameworks/kactivities/kactivities-.ebuild
index fc91849..6e4433c 100644
--- a/kde-frameworks/kactivities/kactivities-.ebuild
+++ b/kde-frameworks/kactivities/kactivities-.ebuild
@@ -12,8 +12,17 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwindowsystem)
dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}
!kde-base/kactivities:4[-minimal]



[gentoo-commits] proj/kde:master commit in: kde-base/libkomparediff2/

2014-05-26 Thread Johannes Huber
commit: 04f506e4c4a6649326681080a4f65e9596fb6a91
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 22:19:55 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 22:21:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=04f506e4

[kde-base/libkomparediff2] KF5 version

Package-Manager: portage-2.2.10

---
 .../libkomparediff2/libkomparediff2-.ebuild| 29 ++
 1 file changed, 29 insertions(+)

diff --git a/kde-base/libkomparediff2/libkomparediff2-.ebuild 
b/kde-base/libkomparediff2/libkomparediff2-.ebuild
new file mode 100644
index 000..92eef29
--- /dev/null
+++ b/kde-base/libkomparediff2/libkomparediff2-.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_TEST="true"
+EGIT_BRANCH="frameworks"
+inherit kde5
+
+DESCRIPTION="KDE library to compare files and strings"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kxmlgui)
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+   !<=kde-base/kompare-4.11.50
+   !kde-base/libkomparediff2:4
+"



[gentoo-commits] proj/kde:master commit in: sets/

2014-05-26 Thread Johannes Huber
commit: 67734f480637c5a66d4cb4a018da31170399195e
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 26 22:25:24 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon May 26 22:25:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=67734f48

[sets] Update kde-applications-live

---
 sets/kde-applications-live | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index 72129e5..2906950 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -2,6 +2,7 @@
 ~kde-base/kate-
 ~kde-base/konsole-
 ~kde-base/kwrite-
+~kde-base/libkomparediff2-
 ~kde-misc/plasma-nm-
 ~kde-misc/yakuake-
 ~net-libs/libmm-qt-



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-python/, dev-util/kdevelop-pg-qt/, dev-util/kdevelop/, ...

2014-05-27 Thread Johannes Huber
commit: 489b3843f421a42008e96231d21fd986f6698d64
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 27 16:44:42 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 27 16:44:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=489b3843

[kdevelop] Rename  to 4.

Preparation for frameworks based versions.

Package-Manager: portage-2.2.10

---
 dev-util/kdev-clang/{kdev-clang-.ebuild => kdev-clang-4..ebuild}  | 0
 .../{kdevelop-mercurial-.ebuild => kdevelop-mercurial-4..ebuild}  | 0
 .../{kdevelop-pg-qt-.ebuild => kdevelop-pg-qt-4..ebuild}  | 0
 .../{kdevelop-php-docs-.ebuild => kdevelop-php-docs-4..ebuild}| 0
 .../kdevelop-php/{kdevelop-php-.ebuild => kdevelop-php-4..ebuild} | 0
 .../{kdevelop-python-.ebuild => kdevelop-python-4..ebuild}| 0
 .../{kdevelop-qmake-.ebuild => kdevelop-qmake-4..ebuild}  | 0
 dev-util/kdevelop/{kdevelop-.ebuild => kdevelop-4..ebuild}| 0
 .../kdevplatform/{kdevplatform-.ebuild => kdevplatform-4..ebuild} | 0
 9 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-util/kdev-clang/kdev-clang-.ebuild 
b/dev-util/kdev-clang/kdev-clang-4..ebuild
similarity index 100%
rename from dev-util/kdev-clang/kdev-clang-.ebuild
rename to dev-util/kdev-clang/kdev-clang-4..ebuild

diff --git a/dev-util/kdevelop-mercurial/kdevelop-mercurial-.ebuild 
b/dev-util/kdevelop-mercurial/kdevelop-mercurial-4..ebuild
similarity index 100%
rename from dev-util/kdevelop-mercurial/kdevelop-mercurial-.ebuild
rename to dev-util/kdevelop-mercurial/kdevelop-mercurial-4..ebuild

diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-.ebuild 
b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-4..ebuild
similarity index 100%
rename from dev-util/kdevelop-pg-qt/kdevelop-pg-qt-.ebuild
rename to dev-util/kdevelop-pg-qt/kdevelop-pg-qt-4..ebuild

diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-.ebuild 
b/dev-util/kdevelop-php-docs/kdevelop-php-docs-4..ebuild
similarity index 100%
rename from dev-util/kdevelop-php-docs/kdevelop-php-docs-.ebuild
rename to dev-util/kdevelop-php-docs/kdevelop-php-docs-4..ebuild

diff --git a/dev-util/kdevelop-php/kdevelop-php-.ebuild 
b/dev-util/kdevelop-php/kdevelop-php-4..ebuild
similarity index 100%
rename from dev-util/kdevelop-php/kdevelop-php-.ebuild
rename to dev-util/kdevelop-php/kdevelop-php-4..ebuild

diff --git a/dev-util/kdevelop-python/kdevelop-python-.ebuild 
b/dev-util/kdevelop-python/kdevelop-python-4..ebuild
similarity index 100%
rename from dev-util/kdevelop-python/kdevelop-python-.ebuild
rename to dev-util/kdevelop-python/kdevelop-python-4..ebuild

diff --git a/dev-util/kdevelop-qmake/kdevelop-qmake-.ebuild 
b/dev-util/kdevelop-qmake/kdevelop-qmake-4..ebuild
similarity index 100%
rename from dev-util/kdevelop-qmake/kdevelop-qmake-.ebuild
rename to dev-util/kdevelop-qmake/kdevelop-qmake-4..ebuild

diff --git a/dev-util/kdevelop/kdevelop-.ebuild 
b/dev-util/kdevelop/kdevelop-4..ebuild
similarity index 100%
rename from dev-util/kdevelop/kdevelop-.ebuild
rename to dev-util/kdevelop/kdevelop-4..ebuild

diff --git a/dev-util/kdevplatform/kdevplatform-.ebuild 
b/dev-util/kdevplatform/kdevplatform-4..ebuild
similarity index 100%
rename from dev-util/kdevplatform/kdevplatform-.ebuild
rename to dev-util/kdevplatform/kdevplatform-4..ebuild



[gentoo-commits] proj/kde:master commit in: eclass/

2014-05-27 Thread Johannes Huber
commit: 48e2b09b14650fa0f4450ec8166d0ddf1e0a0c6b
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 27 16:48:09 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 27 16:48:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=48e2b09b

[eclass] Fix kdevelop versions

Needed because of version scheme change.

---
 eclass/kde4-base.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ffe5d05..33b5e3f 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -82,12 +82,12 @@ case ${KDEBASE} in
# @DESCRIPTION:
# Specifies KDevelop version. Default is 4.0.0 for 
tagged packages and  for live packages.
# Applies to KDEBASE=kdevelop only.
-   KDEVELOP_VERSION="${KDEVELOP_VERSION:-}"
+   KDEVELOP_VERSION="${KDEVELOP_VERSION:-4.}"
# @ECLASS-VARIABLE: KDEVPLATFORM_VERSION
# @DESCRIPTION:
# Specifies KDevplatform version. Default is 1.0.0 for 
tagged packages and  for live packages.
# Applies to KDEBASE=kdevelop only.
-   KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-}"
+   KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-4.}"
else
case ${PN} in
kdevelop|quanta)



[gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, Documentation/package.accept_keywords/

2014-05-27 Thread Johannes Huber
commit: 0a8ba253a05193bd06d74d0b235660ed60a11ffb
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 27 16:52:43 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 27 16:52:43 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0a8ba253

[Documentation] Update kdevelop keywords

---
 Documentation/package.accept_keywords/kde-extras-live.keywords | 10 +-
 Documentation/package.unmask/kde-extras-live   | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Documentation/package.accept_keywords/kde-extras-live.keywords 
b/Documentation/package.accept_keywords/kde-extras-live.keywords
index 1928fea..0576b90 100644
--- a/Documentation/package.accept_keywords/kde-extras-live.keywords
+++ b/Documentation/package.accept_keywords/kde-extras-live.keywords
@@ -8,11 +8,11 @@
 ~app-office/skrooge- **
 ~app-portage/kportagetray- **
 ~dev-cpp/eigen- **
-~dev-util/kdevelop- **
-~dev-util/kdevelop-extra-plugins- **
-~dev-util/kdevelop-php- **
-~dev-util/kdevelop-php-docs- **
-~dev-util/kdevplatform- **
+~dev-util/kdevelop-4. **
+~dev-util/kdevelop-extra-plugins-4. **
+~dev-util/kdevelop-php-4. **
+~dev-util/kdevelop-php-docs-4. **
+~dev-util/kdevplatform-4. **
 ~dev-util/krazy2- **
 ~dev-util/kxsldbg- **
 ~dev-vcs/kdesvn- **

diff --git a/Documentation/package.unmask/kde-extras-live 
b/Documentation/package.unmask/kde-extras-live
index 899cf9e..7645fb0 100644
--- a/Documentation/package.unmask/kde-extras-live
+++ b/Documentation/package.unmask/kde-extras-live
@@ -7,11 +7,11 @@
 ~app-office/skrooge-
 ~app-portage/kportagetray-
 ~dev-cpp/eigen-
-~dev-util/kdevelop-
-~dev-util/kdevelop-extra-plugins-
-~dev-util/kdevelop-php-
-~dev-util/kdevelop-php-docs-
-~dev-util/kdevplatform-
+~dev-util/kdevelop-4.
+~dev-util/kdevelop-extra-plugins-4.
+~dev-util/kdevelop-php-4.
+~dev-util/kdevelop-php-docs-4.
+~dev-util/kdevplatform-4.
 ~dev-util/krazy2-
 ~dev-util/kxsldbg-
 ~dev-vcs/kdesvn-



[gentoo-commits] proj/kde:master commit in: eclass/

2014-05-27 Thread Johannes Huber
commit: 0f6f519d667897baff7a2560b4f028c09beca151
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 27 17:34:15 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 27 17:34:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0f6f519d

[eclass] Handle HOMEPAGE for kdevelop

---
 eclass/kde5.eclass | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c0a1dea..f070ea4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -91,7 +91,12 @@ else
: ${KDE_TEST:=false}
 fi
 
-HOMEPAGE="http://www.kde.org/";
+if [[ ${KDEBASE} = kdevelop ]]; then
+   HOMEPAGE="http://www.kdevelop.org/";
+else
+   HOMEPAGE="http://www.kde.org/";
+fi
+
 LICENSE="GPL-2"
 
 if [[ ${CATEGORY} = kde-frameworks ]]; then



[gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/

2014-05-27 Thread Johannes Huber
commit: f27fe122ef52b6a7cc1bcefa8d55838bb6d413dc
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 27 18:24:46 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 27 18:24:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f27fe122

[dev-util/kdevplatform] KF5 version

Package-Manager: portage-2.2.10

---
 dev-util/kdevplatform/kdevplatform-.ebuild | 78 ++
 1 file changed, 78 insertions(+)

diff --git a/dev-util/kdevplatform/kdevplatform-.ebuild 
b/dev-util/kdevplatform/kdevplatform-.ebuild
new file mode 100644
index 000..7f80fcb
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+# TODO tests hang + fail
+# KDE_TEST="true"
+# VIRTUALDBUS_TEST="true"
+# VIRTUALX_REQUIRED="test"
+RESTRICT="test"
+KMNAME="kdevelop"
+EGIT_REPONAME="${PN}"
+EGIT_BRANCH="frameworks"
+inherit kde5
+
+DESCRIPTION="KDE development support libraries and apps"
+IUSE="cvs reviewboard"
+KEYWORDS=""
+
+# TODO features disabled by upstream, maybe more
+# Templates: dev-libs/grantlee
+# Konsole support: $(add_kdebase_dep konsole)
+# Subversion integration: subversion? (dev-libs/apr dev-libs/apr-util 
dev-vcs/subversion )
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knewstuff)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_frameworks_dep threadweaver)
+   $(add_kdebase_dep libkomparediff2)
+   dev-libs/boost:=
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtquick1:5
+   dev-qt/qttest:5
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+   cvs? ( dev-vcs/cvs )
+   !dev-util/kdevelop:4
+   !dev-util/kdevplatform:4
+"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_build cvs)
+   $(cmake-utils_use_build reviewboard)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] proj/kde:master commit in: eclass/

2014-05-27 Thread Johannes Huber
commit: 79efc416ad655ae05ae717455a297007f05189c2
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 27 17:27:42 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue May 27 17:27:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=79efc416

[eclass] Fix git repo src uri calculation

Allow to overwrite KMNAME with EGIT_REPONAME.

---
 eclass/kde5.eclass | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fe447f8..c0a1dea 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -217,7 +217,14 @@ _calculate_live_repo() {
# (anongit) with anything else you might want to use.
EGIT_MIRROR=${EGIT_MIRROR:=git://anongit.kde.org}
 
-   if [[ -n ${KMNAME} ]]; then
+   # @ECLASS-VARIABLE: EGIT_REPONAME
+   # @DESCRIPTION:
+   # This variable allows overriding of default repository
+   # name. Specify only if this differ from PN and KMNAME.
+   if [[ -n ${EGIT_REPONAME} ]]; then
+   # the repository and kmname different
+   _kmname=${EGIT_REPONAME}
+   elif [[ -n ${KMNAME} ]]; then
_kmname=${KMNAME}
else
_kmname=${PN}



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/

2014-05-28 Thread Johannes Huber
commit: c956632e0b0b798755fb4a331bf1232540c627c0
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 28 14:42:16 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Wed May 28 14:42:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c956632e

[kde-base/plasma-workspace] Enable startup/shutdown script support

Package-Manager: portage-2.2.10

---
 kde-base/plasma-workspace/files/agent-shutdown.sh  | 13 +++
 kde-base/plasma-workspace/files/agent-startup.sh   | 29 
 .../files/plasma-workspace-startkde-script.patch   | 40 ++
 .../plasma-workspace/plasma-workspace-.ebuild  | 26 --
 4 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/kde-base/plasma-workspace/files/agent-shutdown.sh 
b/kde-base/plasma-workspace/files/agent-shutdown.sh
new file mode 100644
index 000..fff8056
--- /dev/null
+++ b/kde-base/plasma-workspace/files/agent-shutdown.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This file is executed at plasma shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+#if [ -n "${GPG_AGENT_INFO}" ]; then
+#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+#fi
+
+#if [ -n "${SSH_AGENT_PID}" ]; then
+#  eval "$(ssh-agent -s -k)"
+#fi

diff --git a/kde-base/plasma-workspace/files/agent-startup.sh 
b/kde-base/plasma-workspace/files/agent-startup.sh
new file mode 100644
index 000..03e017a
--- /dev/null
+++ b/kde-base/plasma-workspace/files/agent-startup.sh
@@ -0,0 +1,29 @@
+# Agents startup file
+#
+# This file is sourced at plasma startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at plasma startup.
+# If you do so, do not forget to uncomment the respective
+# lines in PLASMADIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
+#if [ -x /usr/bin/gpg-agent ]; then
+#  eval "$(/usr/bin/gpg-agent --daemon)"
+#fi 
+
+#if [ -x /usr/bin/ssh-agent ]; then
+#  eval "$(/usr/bin/ssh-agent -s)"
+#fi
+
+# Uncomment the following lines to start rxvt-unicode which has the ability to
+# run multiple terminals in one single process, thus starting up faster and 
+# saving resources.
+# The --opendisplay ensures that the daemon quits when the X server terminates,
+# therefore we don't need matching lines in agent-shutdown.sh.
+
+#if [ -x /usr/bin/urxvtd ]; then
+#  /usr/bin/urxvtd --opendisplay --fork --quiet
+#fi

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch 
b/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch
new file mode 100644
index 000..8fb3756
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch
@@ -0,0 +1,40 @@
+From 6c3f73efc0619020a0c17219b1f7e1e3cd49478f Mon Sep 17 00:00:00 2001
+From: Johannes Huber 
+Date: Wed, 28 May 2014 16:00:41 +0200
+Subject: [PATCH] [startkde] Gentoo FHS script support
+
+---
+ startkde/startkde.cmake | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index f073b93..1c41364 100644
+--- a/startkde/startkde.cmake
 b/startkde/startkde.cmake
+@@ -206,6 +206,11 @@ for prefix in `echo "$libpath" | sed -n -e 
's,/lib[^/]*/,/env/,p'`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ # Set the path for Qt plugins provided by KDE
+ QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+ # TODO: Do we really need this?
+@@ -411,6 +416,11 @@ for prefix in `echo "$libpath" | sed -n -e 
's,/lib[^/]*/,/shutdown/,p'`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-- 
+1.9.3
+

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index 2bc9036..9aa7ed8 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -93,7 +93,10 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
 "
 
-PATCHES=( "${FILESDIR}/${P}-cmake-enable-prison.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-startkde-script.patch"
+   "${FILESDIR}/${P}-cmake-enable-prison.patch"
+)
 
 src_configure() {
local mycmakeargs=(
@@ -108,8 +111,25 @@ src_configure() {
 src_insta

[gentoo-commits] proj/kde:master commit in: net-libs/libbluedevil/

2014-05-28 Thread Johannes Huber
commit: 164856e1b23d43b6c3d0611efff242aa501d3d38
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 28 18:16:40 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Wed May 28 18:16:40 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=164856e1

[net-libs/libbluedevil] Qt5 version

Package-Manager: portage-2.2.10

---
 ...libbluedevil-.ebuild => libbluedevil-4..ebuild} |  0
 net-libs/libbluedevil/libbluedevil-.ebuild | 14 --
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-libs/libbluedevil/libbluedevil-.ebuild 
b/net-libs/libbluedevil/libbluedevil-4..ebuild
similarity index 100%
copy from net-libs/libbluedevil/libbluedevil-.ebuild
copy to net-libs/libbluedevil/libbluedevil-4..ebuild

diff --git a/net-libs/libbluedevil/libbluedevil-.ebuild 
b/net-libs/libbluedevil/libbluedevil-.ebuild
index b42aca8..16511f8 100644
--- a/net-libs/libbluedevil/libbluedevil-.ebuild
+++ b/net-libs/libbluedevil/libbluedevil-.ebuild
@@ -4,16 +4,18 @@
 
 EAPI=5
 
-inherit kde4-base
+EGIT_BRANCH="frameworks"
+inherit kde5
 
 DESCRIPTION="Qt wrapper for bluez used in the KDE bluetooth stack"
 HOMEPAGE="http://projects.kde.org/projects/playground/libs/libbluedevil";
-
-LICENSE="GPL-2"
 KEYWORDS=""
-SLOT="4"
-IUSE="debug"
+IUSE=""
 
-RDEPEND="
+DEPEND="
+   dev-qt/qtdbus:5
+"
+RDEPEND="${DEPEND}
>=net-wireless/bluez-5
+   !net-libs/libbluedevil:4
 "



[gentoo-commits] proj/kde:master commit in: net-wireless/bluedevil/files/, net-wireless/bluedevil/

2014-05-28 Thread Johannes Huber
commit: c759cddbf3d8b23a0c62e8486c376748b671fa78
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 28 18:36:54 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Wed May 28 18:36:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c759cddb

[net-wireless/bluedevil] KF5 version

Package-Manager: portage-2.2.10

---
 ...uedevil-.ebuild => bluedevil-4..ebuild} |  0
 net-wireless/bluedevil/bluedevil-.ebuild   | 31 +++---
 .../bluedevil/files/bluedevil--ecm-cmake.patch | 13 +
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/net-wireless/bluedevil/bluedevil-.ebuild 
b/net-wireless/bluedevil/bluedevil-4..ebuild
similarity index 100%
copy from net-wireless/bluedevil/bluedevil-.ebuild
copy to net-wireless/bluedevil/bluedevil-4..ebuild

diff --git a/net-wireless/bluedevil/bluedevil-.ebuild 
b/net-wireless/bluedevil/bluedevil-.ebuild
index 95b1c40..c1378c3 100644
--- a/net-wireless/bluedevil/bluedevil-.ebuild
+++ b/net-wireless/bluedevil/bluedevil-.ebuild
@@ -4,25 +4,38 @@
 
 EAPI=5
 
-KDE_LINGUAS="ar bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-hu it ja kk km ko lt mai mr ms nb nds nl 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"
-inherit kde4-base
+EGIT_BRANCH="frameworks"
+inherit kde5
 
 DESCRIPTION="Bluetooth stack for KDE"
 HOMEPAGE="http://projects.kde.org/projects/extragear/base/bluedevil";
-
-LICENSE="GPL-2+"
 KEYWORDS=""
-SLOT="4"
-IUSE="debug"
+IUSE=""
 
 DEPEND="
-   >=net-libs/libbluedevil-2
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   net-libs/libbluedevil:5
x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
!app-mobilephone/obexd
!app-mobilephone/obex-data-server
+   !net-wireless/bluedevil:4
!net-wireless/kbluetooth
 "
+
+PATCHES=( "${FILESDIR}/${P}-ecm-cmake.patch" )

diff --git a/net-wireless/bluedevil/files/bluedevil--ecm-cmake.patch 
b/net-wireless/bluedevil/files/bluedevil--ecm-cmake.patch
new file mode 100644
index 000..29284c5
--- /dev/null
+++ b/net-wireless/bluedevil/files/bluedevil--ecm-cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cdfcd06..edfffa6 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -17,7 +17,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Widgets
+ DBus)
+ 
+-find_package(KF5 CONFIG REQUIRED COMPONENTS
++find_package(KF5 REQUIRED COMPONENTS
+ CoreAddons
+ WidgetsAddons
+ DBusAddons



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/

2014-05-28 Thread Johannes Huber
commit: f65d9475ea526c2ea3ad8a8071a247c1d3c54bc8
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 28 21:20:04 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Wed May 28 21:20:04 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f65d9475

[kde-base/plasma-workspace] Update prison patch

https://git.reviewboard.kde.org/r/118381/

Package-Manager: portage-2.2.10

---
 ...plasma-workspace--cmake-enable-prison.patch | 51 +++---
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
index 48924a4..23d6e6f 100644
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
@@ -1,14 +1,5 @@
-From e6e1db527e636649634db97846abd09862861134 Mon Sep 17 00:00:00 2001
-From: Johannes Huber 
-Date: Sun, 25 May 2014 17:29:16 +0200
-Subject: [PATCH] [klipper] Re-enable prison
-

- klipper/CMakeLists.txt | 24 
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
 diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
-index c700f9e..7c66022 100644
+index 
7a57b30b8b59a77c3d0702095dd72bb275d22e57..a46ac2def2faed4b0452c99cca6323da0adba348
 100644
 --- a/klipper/CMakeLists.txt
 +++ b/klipper/CMakeLists.txt
 @@ -16,15 +16,15 @@ set(libklipper_common_SRCS
@@ -24,19 +15,19 @@ index c700f9e..7c66022 100644
 -# if (PRISON_FOUND)
 -# include_directories(${PRISON_INCLUDE_DIR})
 -# endif ()
-+find_package(Prison QUIET CONFIG)
++find_package(Prison "1.2.0" QUIET CONFIG)
 +set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
 +   URL "http://projects.kde.org/prison";
 +   TYPE OPTIONAL
 +   PURPOSE "Needed to create mobile barcodes from 
clipboard data"
 +  )
 +if (PRISON_FOUND)
-+ include_directories(${PRISON_INCLUDE_DIR})
++include_directories(${PRISON_INCLUDE_DIR})
 +endif ()
  
  set(HAVE_PRISON ${PRISON_FOUND})
  configure_file(config-klipper.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h )
-@@ -43,9 +43,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras 
KF5::GlobalAccel KF5::Windo
+@@ -52,9 +52,9 @@ target_link_libraries(kdeinit_klipper
  if (X11_Xfixes_FOUND)
target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
  endif ()
@@ -49,6 +40,34 @@ index c700f9e..7c66022 100644
  
  install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
  install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
--- 
-1.9.3
-
+diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
+index 
1ce578afb078b3b4e791e780975802082559bdf4..8847af324ff0c0c8e07d7e69ca473945cf001772
 100644
+--- a/klipper/klipper.cpp
 b/klipper/klipper.cpp
+@@ -887,10 +887,12 @@ void Klipper::slotShowBarcode()
+ using namespace prison;
+ const HistoryStringItem* item = dynamic_cast(m_history->first());
+ 
+-KDialog dlg;
++QDialog dlg;
+ dlg.setModal( true );
+-dlg.setCaption( i18n("Mobile Barcode") );
+-dlg.setButtons( KDialog::Ok );
++dlg.setWindowTitle( i18n("Mobile Barcode") );
++QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok, 
&dlg);
++buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | 
Qt::Key_Return);
++connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+ 
+ QWidget* mw = new QWidget(&dlg);
+ QHBoxLayout* layout = new QHBoxLayout(mw);
+@@ -907,7 +909,9 @@ void Klipper::slotShowBarcode()
+ layout->addWidget(datamatrix);
+ 
+ mw->setFocus();
+-dlg.setMainWidget( mw );
++QVBoxLayout *vBox = new QVBoxLayout(&dlg);
++vBox->addWidget(mw);
++vBox->addWidget(buttons);
+ dlg.adjustSize();
+ 
+ dlg.exec();



[gentoo-commits] proj/kde:master commit in: net-libs/telepathy-qt/

2014-05-28 Thread Johannes Huber
commit: 0b2975df8447d2c35a2771c8aeff6d6b60c160a2
Author: Alexandr Akulich  gmail  com>
AuthorDate: Wed May 28 21:18:42 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Wed May 28 21:34:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0b2975df

[net-libs/telepathy-qt] Add USE flag experimental

---
 net-libs/telepathy-qt/metadata.xml | 1 +
 net-libs/telepathy-qt/telepathy-qt-.ebuild | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-libs/telepathy-qt/metadata.xml 
b/net-libs/telepathy-qt/metadata.xml
index 5309391..4b181c1 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -4,5 +4,6 @@
qt

Enable support for audio/video calls via 
farstream
+   Enable compilation of experimental 
and unstable service side bindings

 

diff --git a/net-libs/telepathy-qt/telepathy-qt-.ebuild 
b/net-libs/telepathy-qt/telepathy-qt-.ebuild
index 113c765..08a17f7 100644
--- a/net-libs/telepathy-qt/telepathy-qt-.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://telepathy.freedesktop.org/";
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug farstream +qt4 qt5 test"
+IUSE="debug experimental farstream +qt4 qt5 test"
 
 RDEPEND="
farstream? (
@@ -63,8 +63,9 @@ pkg_setup() {
 src_configure() {
myconfigure() {
local mycmakeargs=(
-   $(cmake-utils_use_enable farstream)
$(cmake-utils_use_enable debug DEBUG_OUTPUT)
+   $(cmake-utils_use_enable experimental 
EXPERIMENTAL_SERVICE_SUPPORT)
+   $(cmake-utils_use_enable farstream)
$(cmake-utils_use_enable test TESTS)
-DENABLE_EXAMPLES=OFF
)



[gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/

2014-05-28 Thread Johannes Huber
commit: 904a9c02390318916211a6dbefb9aebeab4d52f7
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 28 21:39:46 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Wed May 28 21:39:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=904a9c02

[net-libs/telepathy-qt] Sync with kde overlay

https://github.com/gentoo/kde/pull/34

Package-Manager: portage-2.2.10

---
 net-libs/telepathy-qt/metadata.xml | 1 +
 net-libs/telepathy-qt/telepathy-qt-.ebuild | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-libs/telepathy-qt/metadata.xml 
b/net-libs/telepathy-qt/metadata.xml
index 5309391..4b181c1 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -4,5 +4,6 @@
qt

Enable support for audio/video calls via 
farstream
+   Enable compilation of experimental 
and unstable service side bindings

 

diff --git a/net-libs/telepathy-qt/telepathy-qt-.ebuild 
b/net-libs/telepathy-qt/telepathy-qt-.ebuild
index 113c765..08a17f7 100644
--- a/net-libs/telepathy-qt/telepathy-qt-.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://telepathy.freedesktop.org/";
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug farstream +qt4 qt5 test"
+IUSE="debug experimental farstream +qt4 qt5 test"
 
 RDEPEND="
farstream? (
@@ -63,8 +63,9 @@ pkg_setup() {
 src_configure() {
myconfigure() {
local mycmakeargs=(
-   $(cmake-utils_use_enable farstream)
$(cmake-utils_use_enable debug DEBUG_OUTPUT)
+   $(cmake-utils_use_enable experimental 
EXPERIMENTAL_SERVICE_SUPPORT)
+   $(cmake-utils_use_enable farstream)
$(cmake-utils_use_enable test TESTS)
-DENABLE_EXAMPLES=OFF
)



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

2014-05-29 Thread Johannes Huber
commit: 82ab823b9c3b5eb52689c2d0e0cd2be3f945349e
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu May 29 13:42:51 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Thu May 29 13:42:51 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=82ab823b

[kde-base/plasma-desktop] Restore bluetooth, networkamanger USE flags

Feature parity with kde-base/solid-runtime from KDE SC 4.

Package-Manager: portage-2.2.10

---
 kde-base/plasma-desktop/plasma-desktop-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-base/plasma-desktop/plasma-desktop-.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-.ebuild
index 55aa82d..810d22d 100644
--- a/kde-base/plasma-desktop/plasma-desktop-.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="+fontconfig pulseaudio usb"
+IUSE="bluetooth +fontconfig networkmanager pulseaudio usb"
 
 RDEPEND="
$(add_kdebase_dep kwin)
@@ -64,12 +64,14 @@ RDEPEND="
x11-libs/libXi
x11-libs/libxkbfile
x11-libs/libXtst
+   bluetooth? ( net-wireless/bluedevil:5 )
fontconfig? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
x11-libs/xcb-util-image
)
+   networkmanager? ( kde-misc/plasma-nm:5 )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra



[gentoo-commits] proj/kde:master commit in: sets/

2014-05-29 Thread Johannes Huber
commit: 67a2f4b6eca0d5668f5e6330627b7177f5497791
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 05:30:11 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 05:30:11 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=67a2f4b6

[sets] Update kde-applications-live

Drop kde-misc/plasma-nm and friends, handled via use flag now.

---
 sets/kde-applications-live | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index 2906950..781803c 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -3,8 +3,5 @@
 ~kde-base/konsole-
 ~kde-base/kwrite-
 ~kde-base/libkomparediff2-
-~kde-misc/plasma-nm-
 ~kde-misc/yakuake-
-~net-libs/libmm-qt-
-~net-libs/libnm-qt-
 ~x11-libs/libkscreen2-



[gentoo-commits] proj/kde:master commit in: profiles/updates/

2014-05-29 Thread Johannes Huber
commit: 4b79185b8bceb7c127ed671fccb0254866a295e8
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 05:51:57 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 05:51:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4b79185b

[profiles/updates] dev-util/kdev-clang -> dev-util/kdevelop-clang

---
 profiles/updates/2Q-2014 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/updates/2Q-2014 b/profiles/updates/2Q-2014
index 8851f43..06005e5 100644
--- a/profiles/updates/2Q-2014
+++ b/profiles/updates/2Q-2014
@@ -1,2 +1,3 @@
 move kde-frameworks/kde4support kde-frameworks/kdelibs4support
 move kde-misc/powerdevil kde-base/powerdevil
+move dev-util/kdev-clang dev-util/kdevelop-clang



[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/

2014-05-29 Thread Johannes Huber
commit: 4989f2d3f7bfd59914ba8ef24f605e60cefe2d63
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 06:09:55 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 06:09:55 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4989f2d3

[kde-base/plasma-workspace] Drop patch, applied upstream

Package-Manager: portage-2.2.10

---
 ...plasma-workspace--cmake-enable-prison.patch | 73 --
 .../plasma-workspace/plasma-workspace-.ebuild  |  5 +-
 2 files changed, 1 insertion(+), 77 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
deleted file mode 100644
index 23d6e6f..000
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
-index 
7a57b30b8b59a77c3d0702095dd72bb275d22e57..a46ac2def2faed4b0452c99cca6323da0adba348
 100644
 a/klipper/CMakeLists.txt
-+++ b/klipper/CMakeLists.txt
-@@ -16,15 +16,15 @@ set(libklipper_common_SRCS
- clipcommandprocess.cpp
- )
- 
--# find_package(Prison QUIET CONFIG)
--# set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
--#URL "http://projects.kde.org/prison";
--#TYPE OPTIONAL
--#PURPOSE "Needed to create mobile barcodes from 
clipboard data"
--#   )
--# if (PRISON_FOUND)
--# include_directories(${PRISON_INCLUDE_DIR})
--# endif ()
-+find_package(Prison "1.2.0" QUIET CONFIG)
-+set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
-+   URL "http://projects.kde.org/prison";
-+   TYPE OPTIONAL
-+   PURPOSE "Needed to create mobile barcodes from 
clipboard data"
-+  )
-+if (PRISON_FOUND)
-+include_directories(${PRISON_INCLUDE_DIR})
-+endif ()
- 
- set(HAVE_PRISON ${PRISON_FOUND})
- configure_file(config-klipper.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h )
-@@ -52,9 +52,9 @@ target_link_libraries(kdeinit_klipper
- if (X11_Xfixes_FOUND)
-   target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
- endif ()
--# if (PRISON_FOUND)
--#   target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
--# endif ()
-+if (PRISON_FOUND)
-+  target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
-+endif ()
- 
- install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
-index 
1ce578afb078b3b4e791e780975802082559bdf4..8847af324ff0c0c8e07d7e69ca473945cf001772
 100644
 a/klipper/klipper.cpp
-+++ b/klipper/klipper.cpp
-@@ -887,10 +887,12 @@ void Klipper::slotShowBarcode()
- using namespace prison;
- const HistoryStringItem* item = dynamic_cast(m_history->first());
- 
--KDialog dlg;
-+QDialog dlg;
- dlg.setModal( true );
--dlg.setCaption( i18n("Mobile Barcode") );
--dlg.setButtons( KDialog::Ok );
-+dlg.setWindowTitle( i18n("Mobile Barcode") );
-+QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok, 
&dlg);
-+buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | 
Qt::Key_Return);
-+connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
- 
- QWidget* mw = new QWidget(&dlg);
- QHBoxLayout* layout = new QHBoxLayout(mw);
-@@ -907,7 +909,9 @@ void Klipper::slotShowBarcode()
- layout->addWidget(datamatrix);
- 
- mw->setFocus();
--dlg.setMainWidget( mw );
-+QVBoxLayout *vBox = new QVBoxLayout(&dlg);
-+vBox->addWidget(mw);
-+vBox->addWidget(buttons);
- dlg.adjustSize();
- 
- dlg.exec();

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index 9aa7ed8..cdd940c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -93,10 +93,7 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
 "
 
-PATCHES=(
-   "${FILESDIR}/${PN}-startkde-script.patch"
-   "${FILESDIR}/${P}-cmake-enable-prison.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
 
 src_configure() {
local mycmakeargs=(



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-clang/, dev-util/kdev-clang/

2014-05-29 Thread Johannes Huber
commit: dab662c0ed0a37b8fc76b911073f0ce3445eeb75
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 05:50:32 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 05:50:32 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dab662c0

[dev-util] dev-util/kdev-clang -> dev-util/kdevelop-clang

Package-Manager: portage-2.2.10

---
 .../kdevelop-clang-4..ebuild} | 0
 dev-util/{kdev-clang => kdevelop-clang}/metadata.xml  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-util/kdev-clang/kdev-clang-4..ebuild 
b/dev-util/kdevelop-clang/kdevelop-clang-4..ebuild
similarity index 100%
rename from dev-util/kdev-clang/kdev-clang-4..ebuild
rename to dev-util/kdevelop-clang/kdevelop-clang-4..ebuild

diff --git a/dev-util/kdev-clang/metadata.xml 
b/dev-util/kdevelop-clang/metadata.xml
similarity index 100%
rename from dev-util/kdev-clang/metadata.xml
rename to dev-util/kdevelop-clang/metadata.xml



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-clang/

2014-05-29 Thread Johannes Huber
commit: 740486c3c67fb3f2de45b9a8a7995b41cd311888
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 06:18:25 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 06:18:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=740486c3

[dev-util/kdevelop-clang] QA issues

* use kde4-base eclass, reduces duplicated code
* remove SLOT, moves to 4
* shorten DESCRIPTION
* add debug USE flag
* fix dependencies: sort + require at least llvm-3.4

Package-Manager: portage-2.2.10

---
 dev-util/kdevelop-clang/kdevelop-clang-4..ebuild | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/dev-util/kdevelop-clang/kdevelop-clang-4..ebuild 
b/dev-util/kdevelop-clang/kdevelop-clang-4..ebuild
index d857cd3..3de79b5 100644
--- a/dev-util/kdevelop-clang/kdevelop-clang-4..ebuild
+++ b/dev-util/kdevelop-clang/kdevelop-clang-4..ebuild
@@ -4,22 +4,19 @@
 
 EAPI=5
 
-inherit cmake-utils git-r3
-
-DESCRIPTION="Integrates Clang into KDevelop for C/C++/Objective-C language 
support."
-HOMEPAGE="https://projects.kde.org/projects/playground/devtools/plugins/kdev-clang";
-EGIT_REPO_URI="git://anongit.kde.org/kdev-clang"
-SRC_URI=""
+KDEBASE="kdevelop"
+KMNAME="kdev-clang"
+inherit kde4-base
 
+DESCRIPTION="Clang plugin for KDevelop 4"
 LICENSE="GPL-2 LGPL-2"
-SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="debug"
 
 DEPEND="
-   sys-devel/llvm[clang]
-   >=dev-util/kdevelop-4.6.90[-cxx]
-   "
+   dev-util/kdevelop:4[-cxx]
+   >=sys-devel/llvm-3.4[clang]
+"
 RDEPEND="${DEPEND}"
 
 pkg_postinst() {



[gentoo-commits] proj/kde:master commit in: profiles/updates/

2014-05-29 Thread Johannes Huber
commit: e3c350e58b59c88646d654c88b0a16af9b08ca80
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 06:22:00 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 06:22:00 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e3c350e5

[profiles/updates] dev-util/kdevelop-clang slotmove 0 -> 4

---
 profiles/updates/2Q-2014 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/updates/2Q-2014 b/profiles/updates/2Q-2014
index 06005e5..86a12d5 100644
--- a/profiles/updates/2Q-2014
+++ b/profiles/updates/2Q-2014
@@ -1,3 +1,4 @@
 move kde-frameworks/kde4support kde-frameworks/kdelibs4support
 move kde-misc/powerdevil kde-base/powerdevil
 move dev-util/kdev-clang dev-util/kdevelop-clang
+slotmove dev-util/kdevelop-clang 0 4



[gentoo-commits] proj/kde:master commit in: eclass/

2014-05-29 Thread Johannes Huber
commit: 591578bca09f5da6eecee3aae5b77ae92a87ea80
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 06:25:51 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 06:25:51 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=591578bc

[eclass] Pin to SLOT 4 on dev-util/kdevplatform

---
 eclass/kde4-base.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 33b5e3f..dcad442 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -90,7 +90,7 @@ case ${KDEBASE} in
KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-4.}"
else
case ${PN} in
-   kdevelop|quanta)
+   kdevelop)
KDEVELOP_VERSION=${PV}

KDEVPLATFORM_VERSION="$(($(get_major_version)-3)).$(get_after_major_version)"
;;
@@ -309,7 +309,7 @@ if [[ ${PN} != kdelibs ]]; then
case ${KDEVPLATFORM_REQUIRED} in
always)
kdecommondepend+="
-   
>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
+   
>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4
"
;;
*) ;;



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-python/

2014-05-29 Thread Johannes Huber
commit: e36347c45012ac99f4d428c397a29901d548d59d
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 06:52:37 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 06:52:37 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e36347c4

[dev-util/kdevelop-python] Drop vars handled by eclass

Package-Manager: portage-2.2.10

---
 dev-util/kdevelop-python/kdevelop-python-4..ebuild | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-util/kdevelop-python/kdevelop-python-4..ebuild 
b/dev-util/kdevelop-python/kdevelop-python-4..ebuild
index dc7be9c..e86ec63 100644
--- a/dev-util/kdevelop-python/kdevelop-python-4..ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-4..ebuild
@@ -18,22 +18,15 @@ if [[ $PV != ** ]]; then
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
 else
-   EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git"
KEYWORDS=""
 fi
 
 DESCRIPTION="Python plugin for KDevelop 4"
-HOMEPAGE="http://www.kdevelop.org";
-
-LICENSE="GPL-2"
 IUSE="debug"
 
-DEPEND="
-   >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
-"
 RDEPEND="
${DEPEND}
-   dev-util/kdevelop
+   dev-util/kdevelop:4
 "
 
 RESTRICT="test"



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/

2014-05-30 Thread Johannes Huber
commit: f3047dc485fe2fbee8013adb5b5a7b61a5ea9e87
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 07:00:45 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 07:00:45 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f3047dc4

[dev-util/kdevelop] Drop dev-util/kdevplatform from DEPEND

Handled by eclass.

Package-Manager: portage-2.2.10

---
 dev-util/kdevelop/kdevelop-4..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/kdevelop/kdevelop-4..ebuild 
b/dev-util/kdevelop/kdevelop-4..ebuild
index 0ae1c83..fc16557 100644
--- a/dev-util/kdevelop/kdevelop-4..ebuild
+++ b/dev-util/kdevelop/kdevelop-4..ebuild
@@ -7,9 +7,10 @@ EAPI=5
 KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
 pl pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
 VIRTUALX_REQUIRED=test
+KDEBASE="${PN}"
 inherit kde4-base
 
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, 
C/C++ and many other languages."
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, 
C/C++ and many other languages"
 LICENSE="GPL-2 LGPL-2"
 IUSE="+cmake +cxx debug okteta qthelp"
 
@@ -21,7 +22,6 @@ fi
 
 DEPEND="
dev-libs/qjson
-   >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
$(add_kdebase_dep ksysguard)
$(add_kdebase_dep libkworkspace)
okteta? ( $(add_kdebase_dep okteta) )



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-pg-qt/

2014-05-30 Thread Johannes Huber
commit: 13bf03be547aabbe96c533f28f53f8464d368f24
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 07:04:20 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 07:04:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=13bf03be

[dev-util/kdevelop-pg-qt] Drop HOMEPAGE

Handled by eclass.

Package-Manager: portage-2.2.10

---
 dev-util/kdevelop-pg-qt/kdevelop-pg-qt-4..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-4..ebuild 
b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-4..ebuild
index a3ef5c8..58f68a1 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-4..ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-4..ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDEBASE="kdevelop"
 inherit kde4-base
 
 if [[ $PV == ** ]]; then
@@ -14,7 +15,6 @@ else
 fi
 
 DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="http://www.kdevelop.org";
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug"



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-qmake/

2014-05-30 Thread Johannes Huber
commit: 2e2a50802dd8df8ebfc5fd3e1258b5c37a6fde42
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 07:19:08 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 07:19:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2e2a5080

[dev-util/kdevelop-qmake] Drop duplicated code

Handled by eclass.

Package-Manager: portage-2.2.10

---
 dev-util/kdevelop-qmake/kdevelop-qmake-4..ebuild | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/dev-util/kdevelop-qmake/kdevelop-qmake-4..ebuild 
b/dev-util/kdevelop-qmake/kdevelop-qmake-4..ebuild
index f5128d2..2813c7a 100644
--- a/dev-util/kdevelop-qmake/kdevelop-qmake-4..ebuild
+++ b/dev-util/kdevelop-qmake/kdevelop-qmake-4..ebuild
@@ -4,30 +4,26 @@
 
 EAPI=5
 
+KDEBASE="kdevelop"
 KMNAME="kdev-qmake"
 inherit kde4-base
 
-DESCRIPTION="Adds suppport for qmake projects to kdevelop."
-HOMEPAGE="http://www.kdevelop.org";
-
+DESCRIPTION="qmake plugin for KDevelop 4"
 LICENSE="LGPL-2"
-SLOT="4"
 KEYWORDS=""
-IUSE="tools"
+IUSE="debug tools"
 
-RESTRICT="test" #Tests fail, and we usually don't want to run tests on live
-   #versions anyway
 DEPEND="
-   dev-util/kdevelop
-   >=dev-util/kdevplatform-1.3.60
+   dev-util/kdevelop:4
dev-util/kdevelop-pg-qt
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
-   mycmakeargs=(
+   local mycmakeargs=(
$(cmake-utils_use_build tools qmake_parser)
)
+
kde4-base_src_configure
 }
 



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-mercurial/

2014-05-30 Thread Johannes Huber
commit: 835836bf3572e39f5734f64b0161eac31eff092b
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 07:26:37 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 07:26:37 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=835836bf

[dev-util/kdevelop-mercurial] Drop vars handled by eclass

Package-Manager: portage-2.2.10

---
 dev-util/kdevelop-mercurial/kdevelop-mercurial-4..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-util/kdevelop-mercurial/kdevelop-mercurial-4..ebuild 
b/dev-util/kdevelop-mercurial/kdevelop-mercurial-4..ebuild
index 2b5f29c..daaa1bf 100644
--- a/dev-util/kdevelop-mercurial/kdevelop-mercurial-4..ebuild
+++ b/dev-util/kdevelop-mercurial/kdevelop-mercurial-4..ebuild
@@ -6,14 +6,9 @@ EAPI=5
 
 KDEBASE="kdevelop"
 KMNAME="kdev-mercurial"
-KDEVPLATFORM_VERSION="1.0.2"
 inherit kde4-base
 
 DESCRIPTION="Mercurial plugin for KDevelop 4"
-HOMEPAGE="http://websvn.kde.org/trunk/playground/devtools/kdevelop4-extra-plugins/mercurial/";
-EGIT_REPO_URI="git://anongit.kde.org/kdev-mercurial"
-#svn://anonsvn.kde.org/home/kde/trunk/playground/devtools/kdevelop4-extra-plugins/mercurial/"
-
 LICENSE="GPL-3"
 KEYWORDS=""
 IUSE="debug"



[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-php/

2014-05-30 Thread Johannes Huber
commit: 4f3c0e7fdfcbe3a0d405aa0d445da030690c04f8
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 30 07:28:35 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri May 30 07:28:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4f3c0e7f

[dev-util/kdevelop-php] Pin dev-util/kdevelop to SLOT 4

Package-Manager: portage-2.2.10

---
 dev-util/kdevelop-php/kdevelop-php-4..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/kdevelop-php/kdevelop-php-4..ebuild 
b/dev-util/kdevelop-php/kdevelop-php-4..ebuild
index fa9de77..0f8c5aa 100644
--- a/dev-util/kdevelop-php/kdevelop-php-4..ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-4..ebuild
@@ -26,7 +26,7 @@ DEPEND="
>=dev-util/kdevelop-pg-qt-1.0.0
 "
 RDEPEND="
-   dev-util/kdevelop
+   dev-util/kdevelop:4
doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
 "
 PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )



[gentoo-commits] proj/kde:master commit in: media-video/kmplayer/, media-video/kmplayer/files/

2014-04-04 Thread Johannes Huber
commit: 80164e51ff960729b5bcd86c2f9edb6b4bb46a12
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  4 11:29:26 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri Apr  4 11:29:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=80164e51

[media-video/kmplayer] Sync with tree

Package-Manager: portage-2.2.10

---
 media-video/kmplayer/files/kmplayer-flash.patch | 12 +
 media-video/kmplayer/kmplayer-.ebuild   | 34 +
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/media-video/kmplayer/files/kmplayer-flash.patch 
b/media-video/kmplayer/files/kmplayer-flash.patch
new file mode 100644
index 000..0a6a72b
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-flash.patch
@@ -0,0 +1,12 @@
+diff -urN kmplayer-0.11.3d.old/src/kmplayer_part.desktop 
kmplayer-0.11.3d/src/kmplayer_part.desktop
+--- kmplayer-0.11.3d.old/src/kmplayer_part.desktop 2012-06-10 
14:35:46.0 +0200
 kmplayer-0.11.3d/src/kmplayer_part.desktop 2012-09-11 14:42:04.160426844 
+0200
+@@ -93,7 +93,7 @@
+ Comment[zh_TW]=影像播放器外掛程式(與 QuickTime,XMovie,Windows Media 與 RealPlayer 相容)
+ X-KDE-Library=libkmplayerpart
+ # Keep in sync with the audio types in kmplayer.desktop
+-MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu;
++MimeType=application/x-shockwave-flash;application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu;
+ Type=Service
+ Icon=kmplayer
+ X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player

diff --git a/media-video/kmplayer/kmplayer-.ebuild 
b/media-video/kmplayer/kmplayer-.ebuild
index 8d532bd..fdeaa64 100644
--- a/media-video/kmplayer/kmplayer-.ebuild
+++ b/media-video/kmplayer/kmplayer-.ebuild
@@ -4,17 +4,23 @@
 
 EAPI=5
 
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hr hu it
+ja km ku lt lv mai nb nds nl nn pl pt pt_BR ro ru sk sr sr@latin sv th tr ug uk
+zh_CN zh_TW"
+KDE_HANDBOOK="optional"
 inherit kde4-base
 
-DESCRIPTION="Video player plugin for Konqueror and basic 
MPlayer/Xine/ffmpeg/ffserver/VDR frontend."
+DESCRIPTION="Video player plugin for Konqueror and basic 
MPlayer/Xine/ffmpeg/ffserver/VDR frontend"
 HOMEPAGE="http://kmplayer.kde.org/";
 
-LICENSE="GPL-2"
-KEYWORDS=""
+LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
 SLOT="4"
+KEYWORDS=""
 IUSE="cairo debug expat npp"
 
 DEPEND="
+   media-libs/phonon
+   x11-libs/libX11
expat? ( >=dev-libs/expat-2.0.1 )
cairo? (
x11-libs/cairo
@@ -22,29 +28,37 @@ DEPEND="
)
npp? (
dev-libs/dbus-glib
+   $(add_kdebase_dep kreadconfig)
>=x11-libs/gtk+-2.10.14:2
+   www-plugins/adobe-flash
)
 "
 RDEPEND="${DEPEND}
-   !media-video/kmplayer:4.1
media-video/mplayer
 "
 
 src_prepare() {
-   # fixup icon install
-   sed -i \
-   -e "s:add_subdirectory(icons):#add_subdirectory(icons):g"\
-   CMakeLists.txt || die "removing icons failed"
+   use npp && epatch "${FILESDIR}/${PN}-flash.patch"
+   sed -e '/add_subdirectory(icons)/d' \
+   -i CMakeLists.txt || die
 
kde4-base_src_prepare
 }
 
 src_configure() {
-   mycm

[gentoo-commits] proj/kde:master commit in: sets/

2014-04-04 Thread Johannes Huber
commit: 100c01849610a26497359779c5536bff69df5471
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr  3 20:58:47 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Thu Apr  3 20:59:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=100c0184

[sets] Update kde-workspaces-live

---
 sets/kde-workspaces-live | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sets/kde-workspaces-live b/sets/kde-workspaces-live
index e6e6a3d..555679f 100644
--- a/sets/kde-workspaces-live
+++ b/sets/kde-workspaces-live
@@ -1,2 +1,3 @@
 ~kde-base/ksysguard-
+~kde-base/kwrited-
 ~kde-base/libksysguard-



[gentoo-commits] proj/kde:master commit in: kde-base/kwrited/

2014-04-04 Thread Johannes Huber
commit: d6ae4d828d2c1e6b40dab95c427efb41beac889e
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr  3 20:56:08 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Thu Apr  3 20:59:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d6ae4d82

[kde-base/kwrited] Version bump, KF5 based version

Package-Manager: portage-2.2.10

---
 kde-base/kwrited/kwrited-.ebuild | 21 +
 1 file changed, 21 insertions(+)

diff --git a/kde-base/kwrited/kwrited-.ebuild 
b/kde-base/kwrited/kwrited-.ebuild
new file mode 100644
index 000..95540cf
--- /dev/null
+++ b/kde-base/kwrited/kwrited-.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE daemon listening for wall and write messages"
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kde4support)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kpty)
+"
+RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: eclass/

2014-04-04 Thread Johannes Huber
commit: e8abc75bee23ccd9a4822761ba1bb8c5abf87848
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  4 14:47:08 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri Apr  4 14:51:39 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e8abc75b

[eclass] Remove add_frameworks_dep from kde4-functions eclass

Was moved to kde5-functions eclass.

---
 eclass/kde4-functions.eclass | 41 -
 1 file changed, 41 deletions(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 08d1ec6..b3284d9 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -39,9 +39,6 @@ esac
 if [[ ${CATEGORY} = kde-base ]]; then
debug-print "${ECLASS}: KDEBASE ebuild recognized"
KDEBASE=kde-base
-elif [[ ${CATEGORY} = kde-frameworks ]]; then
-   debug-print "${ECLASS}: KDEFRAMEWORKS ebuild recognized"
-   KDEBASE=kde-frameworks
 elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
debug-print "${ECLASS}: KDEVELOP ebuild recognized"
KDEBASE=kdevelop
@@ -376,44 +373,6 @@ add_kdebase_dep() {
echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
 }
 
-# @FUNCTION: add_frameworks_dep
-# @DESCRIPTION:
-# Create proper dependency for kde-frameworks/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-add_frameworks_dep() {
-   debug-print-function ${FUNCNAME} "$@"
-
-   local ver
-
-   if [[ -n ${3} ]]; then
-   ver=${3}
-   elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
-   ver=${KDE_OVERRIDE_MINIMAL}
-   elif [[ ${KDEBASE} != kde-frameworks && ${KDEBASE} != kde-base ]]; then
-   ver=${KDE_MINIMAL}
-   # if building stable-live version depend just on the raw KDE version
-   # to allow merging packages against more stable basic stuff
-   elif [[ ${PV} == *. ]]; then
-   ver=$(get_kde_version)
-   else
-   ver=${PV}
-   fi
-
-   [[ -z ${1} ]] && die "Missing parameter"
-
-   local usedep=
-   if [[ -n ${2} ]] ; then
-   usedep="[${2}]"
-   fi
-
-   echo " >=kde-frameworks/${1}-${ver}:5${usedep}"
-}
-
 # local function to enable specified translations for specified directory
 # used from kde4-functions_enable_selected_linguas function
 _enable_selected_linguas_dir() {



[gentoo-commits] proj/kde:master commit in: sets/

2014-04-04 Thread Johannes Huber
commit: 8a03ea8ac2bfa4c5e75ebc627d31dab8345e28bb
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  4 19:51:17 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri Apr  4 19:51:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8a03ea8a

[sets] Update kde-workspaces-live

---
 sets/kde-workspaces-live | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sets/kde-workspaces-live b/sets/kde-workspaces-live
index 679392a..06b4b19 100644
--- a/sets/kde-workspaces-live
+++ b/sets/kde-workspaces-live
@@ -2,4 +2,5 @@
 ~kde-base/kwin-
 ~kde-base/kwrited-
 ~kde-base/libksysguard-
+~kde-base/oxygen-
 ~kde-base/systemsettings-



[gentoo-commits] proj/kde:master commit in: kde-base/oxygen/

2014-04-04 Thread Johannes Huber
commit: 7b346aae518a75a1fdea6c567c848b82eba46d99
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  4 19:49:51 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri Apr  4 19:51:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7b346aae

[kde-base/oxygen] New package

Will be needed for plasma next.

Package-Manager: portage-2.2.10

---
 kde-base/oxygen/metadata.xml   |  5 
 kde-base/oxygen/oxygen-.ebuild | 47 ++
 2 files changed, 52 insertions(+)

diff --git a/kde-base/oxygen/metadata.xml b/kde-base/oxygen/metadata.xml
new file mode 100644
index 000..a23f444
--- /dev/null
+++ b/kde-base/oxygen/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   kde
+

diff --git a/kde-base/oxygen/oxygen-.ebuild 
b/kde-base/oxygen/oxygen-.ebuild
new file mode 100644
index 000..eeb93a5
--- /dev/null
+++ b/kde-base/oxygen/oxygen-.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE window manager theme"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen";
+
+KEYWORDS=""
+IUSE="X"
+
+DEPEND="
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   $(add_kdebase_dep kwin)
+   $(add_frameworks_dep frameworkintegration)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   X? (
+   dev-qt/qtx11extras:5
+   x11-libs/libxcb
+   )
+"
+RDEPEND="${DEPEND}
+   !kde-base/kdebase-cursors:4
+   !kde-base/knotify:4
+   !kde-base/kstyles:4
+   !kde-base/liboxygenstyle:4
+"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] proj/kde:master commit in: x11-themes/oxygen-transparent/

2014-04-04 Thread Johannes Huber
commit: 3fb6632d77e9c2a99dcf6669095c82a451bbfffd
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  4 22:30:39 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Fri Apr  4 22:30:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3fb6632d

[x11-themes/oxygen-transparent] Drop KDE_MINIMAL

Package-Manager: portage-2.2.10

---
 x11-themes/oxygen-transparent/oxygen-transparent-4.11..ebuild | 8 +---
 x11-themes/oxygen-transparent/oxygen-transparent-.ebuild  | 7 ---
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/x11-themes/oxygen-transparent/oxygen-transparent-4.11..ebuild 
b/x11-themes/oxygen-transparent/oxygen-transparent-4.11..ebuild
index 1463e2e..1a3e9cc 100644
--- a/x11-themes/oxygen-transparent/oxygen-transparent-4.11..ebuild
+++ b/x11-themes/oxygen-transparent/oxygen-transparent-4.11..ebuild
@@ -4,13 +4,7 @@
 
 EAPI=5
 
-if [[ $PV ==  ]]; then
-   KDE_MINIMAL=
-else
-   KDE_MINIMAL=${PV/\./}
-   EGIT_BRANCH="KDE/${KDE_MINIMAL}"
-fi
-
+EGIT_BRANCH="KDE/4.11"
 inherit kde4-base
 
 DESCRIPTION="Oxygen style and decoration with support for transparency"

diff --git a/x11-themes/oxygen-transparent/oxygen-transparent-.ebuild 
b/x11-themes/oxygen-transparent/oxygen-transparent-.ebuild
index 1463e2e..bddc34d 100644
--- a/x11-themes/oxygen-transparent/oxygen-transparent-.ebuild
+++ b/x11-themes/oxygen-transparent/oxygen-transparent-.ebuild
@@ -4,13 +4,6 @@
 
 EAPI=5
 
-if [[ $PV ==  ]]; then
-   KDE_MINIMAL=
-else
-   KDE_MINIMAL=${PV/\./}
-   EGIT_BRANCH="KDE/${KDE_MINIMAL}"
-fi
-
 inherit kde4-base
 
 DESCRIPTION="Oxygen style and decoration with support for transparency"



[gentoo-commits] proj/kde:master commit in: Documentation/package.mask/

2014-04-05 Thread Johannes Huber
commit: c0c7380001ab04508001f7112da0937589d58b37
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 11:34:35 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 11:34:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c0c73800

[Documentation/package.mask] Import kdepim-4.7 from cvs.

---
 Documentation/package.mask/kdepim-4.7 | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/Documentation/package.mask/kdepim-4.7 
b/Documentation/package.mask/kdepim-4.7
new file mode 100644
index 000..42bd20f
--- /dev/null
+++ b/Documentation/package.mask/kdepim-4.7
@@ -0,0 +1,23 @@
+>=kde-base/akonadiconsole-4.5.50
+>=kde-base/akregator-4.5.50
+>=kde-base/blogilo-4.5.50
+>=kde-base/kabcclient-4.5.50
+>=kde-base/kaddressbook-4.5.50
+>=kde-base/kalarm-4.5.50
+>=kde-base/kdepim-common-libs-4.5.50
+>=kde-base/kdepim-icons-4.5.50
+>=kde-base/kdepim-l10n-4.5.50
+>=kde-base/kdepim-kresources-4.5.50
+>=kde-base/kdepim-meta-4.5.50
+>=kde-base/kdepim-strigi-analyzer-4.5.50
+>=kde-base/kdepim-runtime-4.5.50
+>=kde-base/kdepim-wizards-4.5.50
+>=kde-base/kjots-4.5.50
+>=kde-base/kleopatra-4.5.50
+>=kde-base/kmail-4.5.50
+>=kde-base/knode-4.5.50
+>=kde-base/knotes-4.5.50
+>=kde-base/konsolekalendar-4.5.50
+>=kde-base/kontact-4.5.50
+>=kde-base/korganizer-4.5.50
+>=kde-base/ktimetracker-4.5.50



[gentoo-commits] proj/kde:master commit in: app-office/calligra/

2014-04-05 Thread Johannes Huber
commit: 3032aa23b27e78b302fb839d4556794772dd72be
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 12:15:12 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 12:15:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3032aa23

[app-office/calligra] Import live ebuild for easier maintenance

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-.ebuild | 239 +++
 1 file changed, 239 insertions(+)

diff --git a/app-office/calligra/calligra-.ebuild 
b/app-office/calligra/calligra-.ebuild
new file mode 100644
index 000..c43cda6
--- /dev/null
+++ b/app-office/calligra/calligra-.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/";
+
+case ${PV} in
+   2.[456789].[789]?)
+   # beta or rc releases
+   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+   2.[456789].?)
+   # stable releases
+   SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+   2.[456789].)
+   # stable branch live ebuild
+   SRC_URI="" ;;
+   )
+   # master branch live ebuild
+   SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == * ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
++pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
++truetype vc word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+   IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+   calligra_features_author? ( calligra_features_words )
+   calligra_features_kexi? ( calligra_features_sheets )
+   calligra_features_words? ( calligra_features_sheets )
+   calligra_features_krita? ( eigen exif lcms )
+   calligra_features_plan? ( kdepim )
+   calligra_features_sheets? ( eigen )
+   kdepim? ( semantic-desktop )
+   vc? ( calligra_features_krita )
+   test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+   !app-office/karbon
+   !app-office/kexi
+   !app-office/koffice-data
+   !app-office/koffice-l10n
+   !app-office/koffice-libs
+   !app-office/koffice-meta
+   !app-office/kplato
+   !app-office/kpresenter
+   !app-office/krita
+   !app-office/kspread
+   !app-office/kword
+   $(add_kdebase_dep kdelibs 'semantic-desktop?')
+   dev-lang/perl
+   dev-libs/boost
+   dev-libs/libxml2
+   $(add_kdebase_dep knewstuff)
+   media-libs/libpng
+   sys-libs/zlib
+   >=dev-qt/qtgui-4.8.1-r1:4
+   virtual/libiconv
+   attica? ( dev-libs/libattica )
+   crypt? ( app-crypt/qca:2 )
+   eigen? ( dev-cpp/eigen:2 )
+   exif? ( media-gfx/exiv2:= )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   freetds? ( dev-db/freetds )
+   gif? ( media-libs/giflib )
+   glew? ( media-libs/glew )
+   glib? ( dev-libs/glib:2 )
+   gsf? ( gnome-extra/libgsf )
+   gsl? ( sci-libs/gsl )
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   kdcraw? ( $(add_kdebase_dep libkdcraw) )
+   kde? ( $(add_kdebase_dep kactivities) )
+   kdepim? ( $(add_kdebase_dep kdepimlibs) )
+   lcms? ( media-libs/lcms:2 )
+   marble? ( $(add_kdebase_dep marble) )
+   mysql? ( virtual/mysql )
+   okular? ( $(add_kdebase_dep okular) )
+   opengl? ( virtual/glu )
+   opengtl? ( >=media-libs/opengtl-0.9.15 )
+   openexr? ( media-libs/openexr )
+   pdf? (
+   app-text/poppler:=
+   media-gfx/pstoedit
+   )
+   postgres? (
+   dev-db/postgresql-base
+   dev-libs/libpqxx
+   )
+   semantic-desktop? (
+   dev-libs/soprano
+   )
+   spacenav? ( dev-libs/libspnav  )
+   ssl? ( dev-libs/openssl )
+   sybase? ( dev-db/freetds )
+   tiff? ( media-libs

[gentoo-commits] proj/kde:master commit in: app-office/calligra/

2014-04-05 Thread Johannes Huber
commit: 0aa1c6d7f5b73caac12191194654a5e2f00ace45
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 12:18:49 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 12:18:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0aa1c6d7

[app-office/calligra] Remove ancient MINIMAL declarations

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.0.ebuild | 4 
 app-office/calligra/calligra-.ebuild  | 4 
 2 files changed, 8 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild 
b/app-office/calligra/calligra-2.8.0.ebuild
index c43cda6..a2a5c2f 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.0.ebuild
@@ -8,12 +8,8 @@
 
 EAPI=5
 
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
 OPENGL_REQUIRED=optional
-
 KDE_HANDBOOK=optional
-
 KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base versionator
 

diff --git a/app-office/calligra/calligra-.ebuild 
b/app-office/calligra/calligra-.ebuild
index c43cda6..a2a5c2f 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -8,12 +8,8 @@
 
 EAPI=5
 
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
 OPENGL_REQUIRED=optional
-
 KDE_HANDBOOK=optional
-
 KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base versionator
 



[gentoo-commits] proj/kde:master commit in: app-office/calligra/

2014-04-05 Thread Johannes Huber
commit: 246a12c9d088ceaf3d89d18752023a816cbe2e5a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 12:52:38 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 12:52:38 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=246a12c9

[app-office/calligra] Check required disk space for build, bug #505374

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.0.ebuild | 12 +++-
 app-office/calligra/calligra-.ebuild  | 12 +++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild 
b/app-office/calligra/calligra-2.8.0.ebuild
index a2a5c2f..c6f36c9 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.0.ebuild
@@ -11,7 +11,8 @@ EAPI=5
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
+CHECKREQS_DISK_BUILD="4G"
+inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra.org/";
@@ -144,6 +145,15 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 RESTRICT=test
 # bug 394273
 
+pkg_pretend() {
+   check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+   kde4-base_pkg_setup
+   check-reqs_pkg_setup
+}
+
 src_configure() {
local cal_ft
 

diff --git a/app-office/calligra/calligra-.ebuild 
b/app-office/calligra/calligra-.ebuild
index a2a5c2f..c6f36c9 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -11,7 +11,8 @@ EAPI=5
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
+CHECKREQS_DISK_BUILD="4G"
+inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra.org/";
@@ -144,6 +145,15 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 RESTRICT=test
 # bug 394273
 
+pkg_pretend() {
+   check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+   kde4-base_pkg_setup
+   check-reqs_pkg_setup
+}
+
 src_configure() {
local cal_ft
 



[gentoo-commits] proj/kde:master commit in: eclass/

2014-04-05 Thread Johannes Huber
commit: 723fb7f9ecc09f9d0f76d019beeac16ae51d7a13
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 20:09:58 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 20:09:58 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=723fb7f9

[eclass] Remove unused function add_blocker

---
 eclass/kde4-functions.eclass | 62 
 1 file changed, 62 deletions(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index b3284d9..ee2e2e9 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -278,68 +278,6 @@ load_library_dependencies() {
eend $?
 }
 
-# @FUNCTION: add_blocker
-# @DESCRIPTION:
-# Create correct RDEPEND value for blocking correct package.
-# Useful for file-collision blocks.
-# Parameters are package and version(s) to block.
-# add_blocker kdelibs 4.2.4
-# If no version is specified, then all versions will be blocked.
-# If the version is 0, then no versions will be blocked.
-# If a second version ending in ":3.5" is passed, then the version listed for
-# that slot will be blocked as well.
-#
-# Examples:
-## Block all versions of kdelibs
-#add_blocker kdelibs
-#
-## Block all versions of kdelibs older than 4.3.50
-#add_blocker kdelibs 4.3.50
-#
-## Block kdelibs 3.5.10 and older, but not any version of
-## kdelibs from KDE 4
-#add_blocker kdelibs 0 3.5.10:3.5
-add_blocker() {
-   debug-print-function ${FUNCNAME} "$@"
-
-   [[ -z ${1} ]] && die "Missing parameter"
-   local pkg=kde-base/$1 atom old_ver="unset" use
-   if [[ $pkg == *\[*\] ]]; then
-   use=${pkg/#*\[/[}
-   pkg=${pkg%\[*\]}
-   fi
-
-   [[ "$3" == *:3.5 ]] && old_ver=${3%:3.5}
-
-   # If the version passed is "0", do nothing
-   if [[ ${2} != 0 ]]; then
-   # If no version was passed, block all versions in this slot
-   if [[ -z ${2} ]]; then
-   atom=${pkg}
-   # If the version passed begins with a "<", then use "<" instead 
of "<="
-   elif [[ ${2::1} == "<" ]]; then
-   # this also removes the first character of the version, 
which is a "<"
-   atom="<${pkg}-${2:1}"
-   else
-   atom="<=${pkg}-${2}"
-   fi
-   RDEPEND+=" !${atom}:4${use}"
-   fi
-
-   # Do the same thing as above for :3.5, except that we don't want any
-   # output if no parameter was passed.
-   if [[ ${old_ver} != "unset" ]]; then
-   if [[ -z ${old_ver} ]]; then
-   atom=${pkg}
-   elif [[ ${old_ver::1} == "<" ]]; then
-   atom="<${pkg}-${old_ver:1}"
-   else
-   atom="<=${pkg}-${old_ver}"
-   fi
-   RDEPEND+=" !${atom}:3.5${use}"
-   fi
-}
-
 # @FUNCTION: add_kdebase_dep
 # @DESCRIPTION:
 # Create proper dependency for kde-base/ dependencies.



[gentoo-commits] proj/kde:master commit in: profiles/

2014-04-05 Thread Johannes Huber
commit: 1fa16fade365bfda4bea5c84488150855122e818
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 21:11:14 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 21:11:14 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1fa16fad

[profiles] Increase to EAPI 5

---
 profiles/eapi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/eapi b/profiles/eapi
index d00491f..7ed6ff8 100644
--- a/profiles/eapi
+++ b/profiles/eapi
@@ -1 +1 @@
-1
+5



[gentoo-commits] proj/kde:master commit in: kde-base/kde-cli-tools/

2014-04-05 Thread Johannes Huber
commit: e84b622a2f18206b90b2add26a594291ac5b284a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 21:57:04 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 21:57:04 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e84b622a

[kde-base/kde-cli-tools] New package

Will be needed for plasma next.

Package-Manager: portage-2.2.10

---
 kde-base/kde-cli-tools/kde-cli-tools-.ebuild | 40 
 kde-base/kde-cli-tools/metadata.xml  |  5 +++
 2 files changed, 45 insertions(+)

diff --git a/kde-base/kde-cli-tools/kde-cli-tools-.ebuild 
b/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
new file mode 100644
index 000..52a1195
--- /dev/null
+++ b/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the 
system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools";
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kde4support)
+   $(add_frameworks_dep kdesu)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+   !kde-base/kdebase-data:4
+   !kde-base/keditfiletype:4
+   !kde-base/kioclient:4
+   !kde-base/kmimetypefinder:4
+   !kde-base/ktraderclient:4
+"

diff --git a/kde-base/kde-cli-tools/metadata.xml 
b/kde-base/kde-cli-tools/metadata.xml
new file mode 100644
index 000..a23f444
--- /dev/null
+++ b/kde-base/kde-cli-tools/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   kde
+



[gentoo-commits] proj/kde:master commit in: sets/

2014-04-05 Thread Johannes Huber
commit: a2b2dd187a639edd075f2a86ccb3c4483ecb0275
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 22:11:12 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 22:11:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a2b2dd18

[sets] Update kde-workspaces-live

---
 sets/kde-workspaces-live | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sets/kde-workspaces-live b/sets/kde-workspaces-live
index 06b4b19..b517117 100644
--- a/sets/kde-workspaces-live
+++ b/sets/kde-workspaces-live
@@ -1,3 +1,4 @@
+~kde-cli-tools-
 ~kde-base/ksysguard-
 ~kde-base/kwin-
 ~kde-base/kwrited-



[gentoo-commits] proj/kde:master commit in: sets/

2014-04-05 Thread Johannes Huber
commit: d3264145c954ae1a214009dd4372beb45fb9df9f
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  5 22:21:59 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sat Apr  5 22:21:59 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d3264145

[sets] Add missing category for kde-cli-tools

I am tired, sorry.

---
 sets/kde-workspaces-live | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sets/kde-workspaces-live b/sets/kde-workspaces-live
index b517117..2bb6d0f 100644
--- a/sets/kde-workspaces-live
+++ b/sets/kde-workspaces-live
@@ -1,4 +1,4 @@
-~kde-cli-tools-
+~kde-base/kde-cli-tools-
 ~kde-base/ksysguard-
 ~kde-base/kwin-
 ~kde-base/kwrited-



[gentoo-commits] proj/kde:master commit in: dev-libs/libattica/

2014-04-06 Thread Johannes Huber
commit: ca0dc53e28009e94b68aa46d88ba3a5ecdbd54ee
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 10:30:52 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 10:30:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ca0dc53e

[dev-libs/libattica] Restrict tests, fails to build when enabled

Package-Manager: portage-2.2.10

---
 dev-libs/libattica/libattica-.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/libattica/libattica-.ebuild 
b/dev-libs/libattica/libattica-.ebuild
index 02e5676..9e63fd2 100644
--- a/dev-libs/libattica/libattica-.ebuild
+++ b/dev-libs/libattica/libattica-.ebuild
@@ -40,6 +40,9 @@ DOCS=( AUTHORS ChangeLog README )
 
 [[ ${PV} != * ]] && S=${WORKDIR}/${MY_P}
 
+# Fails to build with test enabled
+RESTRICT="test"
+
 src_configure() {
local mycmakeargs=(
-DQT4_BUILD=true



[gentoo-commits] proj/kde:master commit in: app-office/calligra-l10n/

2014-04-06 Thread Johannes Huber
commit: 159f96a3f9d14434fa7bdd9a69df82f9eaa10f2a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 11:36:29 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 11:36:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=159f96a3

[app-office/calligra-l10n] Version bump, remove old, bug #503544

Package-Manager: portage-2.2.10

---
 .../{calligra-l10n-2.8.0.ebuild => calligra-l10n-2.8.1.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra-l10n/calligra-l10n-2.8.0.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.8.1.ebuild
similarity index 95%
rename from app-office/calligra-l10n/calligra-l10n-2.8.0.ebuild
rename to app-office/calligra-l10n/calligra-l10n-2.8.1.ebuild
index 07aea8f..eb07df2 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.8.0.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.8.1.ebuild
@@ -16,7 +16,7 @@ RDEPEND="!app-office/koffice-l10n"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc"
 
-MY_LANGS="bs ca ca@valencia cs da de el es et fi fr gl hu it kk nb nds nl pl
+MY_LANGS="bs ca ca@valencia cs da de el es et eu fi fr gl hu it kk nb nds nl pl
 pt pt_BR ru sk sl sv uk zh_CN zh_TW"
 
 case ${PV} in



[gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, profiles/

2014-04-06 Thread Johannes Huber
commit: 3cbead8dee6fadc7d0bf1cddd30bf8b5b1f52340
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 11:41:23 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 11:41:23 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3cbead8d

[profiles/package.mask] Add calligra 2.8.1

---
 profiles/package.mask  | 6 ++
 profiles/package.mask.d/calligra-2.8.1 | 5 +
 2 files changed, 11 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 5bbbc5b..ba3226e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,12 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
+# Johannes Huber  (06 Apr 2014)
+# Upstream release is broken. Fails to build.
+# Needs further investigation.
+~app-office/calligra-2.8.1
+~app-office/calligra-l10n-2.8.1
+
 # Johannes Huber  (28 March 2014)
 # KDE SC 4.12.97 rc 1 mask. 
 # Unstable release. Masked for testing

diff --git a/profiles/package.mask.d/calligra-2.8.1 
b/profiles/package.mask.d/calligra-2.8.1
new file mode 100644
index 000..b75aba6
--- /dev/null
+++ b/profiles/package.mask.d/calligra-2.8.1
@@ -0,0 +1,5 @@
+# Johannes Huber  (06 Apr 2014)
+# Upstream release is broken. Fails to build.
+# Needs further investigation.
+~app-office/calligra-2.8.1
+~app-office/calligra-l10n-2.8.1



[gentoo-commits] proj/kde:master commit in: app-office/calligra/

2014-04-06 Thread Johannes Huber
commit: 38058ab8d6ece54df529fc71dc6ff2e2ee33c279
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 11:16:48 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 11:16:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38058ab8

[app-office/calligra] Version bump, remove old, bug #503544

Package-Manager: portage-2.2.10

---
 ...calligra-2.8.0.ebuild => calligra-2.8.1.ebuild} | 28 +-
 app-office/calligra/calligra-.ebuild   | 28 +-
 app-office/calligra/metadata.xml   |  2 +-
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild 
b/app-office/calligra/calligra-2.8.1.ebuild
similarity index 92%
rename from app-office/calligra/calligra-2.8.0.ebuild
rename to app-office/calligra/calligra-2.8.1.ebuild
index c6f36c9..84d3cbf 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.1.ebuild
@@ -40,9 +40,9 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
-+truetype vc word-perfect xbase +xml +xslt"
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
++threads +truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -96,6 +96,14 @@ RDEPEND="
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
gsl? ( sci-libs/gsl )
+   import-filter? (
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd
+   app-text/libwpg
+   app-text/libwps
+   media-libs/libvisio
+   )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -125,11 +133,6 @@ RDEPEND="
tiff? ( media-libs/tiff )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
-   word-perfect? (
-   app-text/libwpd
-   app-text/libwps
-   app-text/libwpg
-   )
xbase? ( dev-db/xbase )
xslt? ( dev-libs/libxslt )
calligra_features_kexi? (
@@ -199,6 +202,12 @@ src_configure() {
$(cmake-utils_use_with glib GObject)
$(cmake-utils_use_with gsf LIBGSF)
$(cmake-utils_use_with gsl GSL)
+   $(cmake-utils_use_with import-filter LibEtonyek)
+   $(cmake-utils_use_with import-filter LibOdfGen)
+   $(cmake-utils_use_with import-filter LibVisio)
+   $(cmake-utils_use_with import-filter LibWpd)
+   $(cmake-utils_use_with import-filter LibWpg)
+   $(cmake-utils_use_with import-filter LibWps)
$(cmake-utils_use_with jpeg JPEG)
$(cmake-utils_use_with jpeg2k OpenJPEG)
$(cmake-utils_use_with kdcraw Kdcraw)
@@ -216,7 +225,6 @@ src_configure() {
$(cmake-utils_use_with pdf Pstoedit)
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_build postgres pqxx)
-   $(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
@@ -226,8 +234,6 @@ src_configure() {
$(cmake-utils_use_with threads Threads)
$(cmake-utils_use_with truetype Freetype)
$(cmake-utils_use_with vc Vc)
-   $(cmake-utils_use_with word-perfect WPD)
-   $(cmake-utils_use_with word-perfect WPG)
$(cmake-utils_use_with xbase XBase)
$(cmake-utils_use_build xbase xbase)
$(cmake-utils_use_with xslt LibXslt)

diff --git a/app-office/calligra/calligra-.ebuild 
b/app-office/calligra/calligra-.ebuild
index c6f36c9..84d3cbf 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -40,9 +40,9 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
-+truetype vc word-perfect xbase +xml +xslt"
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase 

[gentoo-commits] proj/kde:master commit in: kde-base/kwin/

2014-04-06 Thread Johannes Huber
commit: 36fef954e6a16a93ff06b301326b0217fd976b44
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 13:47:47 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 13:47:47 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=36fef954

[kde-base/kwin] Add RDEPEND on kde-base/oxygen by eliasp

Package-Manager: portage-2.2.10

---
 kde-base/kwin/kwin-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-base/kwin/kwin-.ebuild b/kde-base/kwin/kwin-.ebuild
index 2f672dd..c4f461e 100644
--- a/kde-base/kwin/kwin-.ebuild
+++ b/kde-base/kwin/kwin-.ebuild
@@ -60,6 +60,7 @@ COMMON_DEPEND="
)
 "
 RDEPEND="${COMMON_DEPEND}
+   $(add_kdebase_dep oxygen)
!kde-base/kwin:4
!kde-base/systemsettings:4
 "



[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/

2014-04-06 Thread Johannes Huber
commit: dd4a536dcdac0692789efd0370b33ac393d9e672
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 20:11:37 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 20:12:55 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dd4a536d

[kde-frameworks/kf-env] New package

Installs environment file for all kf based applications/window manager/desktop
environments. The environment file is named 78kf and installed to /etc/env.d/.
It has a higher number than KDE SC 4 based env file from kde-base/kde-env. This
should guarantee that old QT_PLUGIN_PATH is not overridden. This needs to be
tested.

Package-Manager: portage-2.2.10

---
 kde-frameworks/kf-env/kf-env-1.ebuild | 45 +++
 kde-frameworks/kf-env/metadata.xml|  5 
 2 files changed, 50 insertions(+)

diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild 
b/kde-frameworks/kf-env/kf-env-1.ebuild
new file mode 100644
index 000..616c235
--- /dev/null
+++ b/kde-frameworks/kf-env/kf-env-1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Environment setting required for all KDE Frameworks apps to run"
+HOMEPAGE="http://community.kde.org/Frameworks";
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+   x11-misc/xdg-utils
+"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_prepare() { :; }
+
+pkg_preinst() { :; }
+
+src_install() {
+   einfo "Installing environment file..."
+
+   # higher number to be sure not to kill kde4 env
+   local envfile="${T}/78kf"
+   local libdir="${EPREFIX}/usr/$(get_libdir)"
+
+   echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile}
+   echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile}
+   echo 
"QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> 
${envfile}
+   echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}
+   doenvd ${envfile}
+}
+
+src_test() { :; }

diff --git a/kde-frameworks/kf-env/metadata.xml 
b/kde-frameworks/kf-env/metadata.xml
new file mode 100644
index 000..a23f444
--- /dev/null
+++ b/kde-frameworks/kf-env/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   kde
+



[gentoo-commits] proj/kde:master commit in: eclass/

2014-04-06 Thread Johannes Huber
commit: d5850b0d8710010e77fbad9333e609e43d08014a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 20:11:56 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 20:12:55 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d5850b0d

[eclass] Add kde-frameworks/kf-env to RDEPEND

---
 eclass/kde5.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6fc0a43..3e8c99f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -89,6 +89,7 @@ case ${KDE_AUTODEPS} in
false)  ;;
*)
DEPEND+=" >=dev-libs/extra-cmake-modules-0.0.12"
+   RDEPEND+=" kde-frameworks/kf-env"
COMMONDEPEND+=" >=dev-qt/qtcore-${QT_MINIMAL}:5"
;;
 esac



[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/

2014-04-06 Thread Johannes Huber
commit: e897b169ffd07b2dc2f4496160f309c58d31bcbf
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr  6 21:50:35 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Sun Apr  6 21:50:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e897b169

[app-text/kbibtex] Version bump

Package-Manager: portage-2.2.10

---
 app-text/kbibtex/{kbibtex-0.5..ebuild => kbibtex-0.5.0.95.ebuild} | 1 -
 app-text/kbibtex/kbibtex-0.5..ebuild  | 1 -
 app-text/kbibtex/kbibtex-.ebuild  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app-text/kbibtex/kbibtex-0.5..ebuild 
b/app-text/kbibtex/kbibtex-0.5.0.95.ebuild
similarity index 97%
copy from app-text/kbibtex/kbibtex-0.5..ebuild
copy to app-text/kbibtex/kbibtex-0.5.0.95.ebuild
index 85d55f4..b2b7de0 100644
--- a/app-text/kbibtex/kbibtex-0.5..ebuild
+++ b/app-text/kbibtex/kbibtex-0.5.0.95.ebuild
@@ -25,7 +25,6 @@ DEPEND="
dev-libs/libxml2
dev-libs/libxslt
virtual/tex-base
-   x11-libs/libqxt
 "
 RDEPEND="${DEPEND}
dev-tex/bibtex2html"

diff --git a/app-text/kbibtex/kbibtex-0.5..ebuild 
b/app-text/kbibtex/kbibtex-0.5..ebuild
index 85d55f4..b2b7de0 100644
--- a/app-text/kbibtex/kbibtex-0.5..ebuild
+++ b/app-text/kbibtex/kbibtex-0.5..ebuild
@@ -25,7 +25,6 @@ DEPEND="
dev-libs/libxml2
dev-libs/libxslt
virtual/tex-base
-   x11-libs/libqxt
 "
 RDEPEND="${DEPEND}
dev-tex/bibtex2html"

diff --git a/app-text/kbibtex/kbibtex-.ebuild 
b/app-text/kbibtex/kbibtex-.ebuild
index de67d9e..0a518d2 100644
--- a/app-text/kbibtex/kbibtex-.ebuild
+++ b/app-text/kbibtex/kbibtex-.ebuild
@@ -25,7 +25,6 @@ DEPEND="
dev-libs/libxml2
dev-libs/libxslt
virtual/tex-base
-   x11-libs/libqxt
 "
 RDEPEND="${DEPEND}
dev-tex/bibtex2html"



[gentoo-commits] proj/kde:master commit in: Documentation/package.accept_keywords/.kde-frameworks-live/, sets/, ...

2014-04-07 Thread Johannes Huber
commit: a4bb3b79d6dcc432d26c4e38745be3a800383866
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr  7 13:22:31 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon Apr  7 13:22:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a4bb3b79

[Documentation] KDE Frameworks keyword files gen

---
 Documentation/maintainers/regenerate-files | 44 ++-
 .../.kde-frameworks-5.0/_HEADER_   |  2 +
 .../.kde-frameworks-5.0/kde-frameworks-5.0 |  1 +
 .../.kde-frameworks-5.0/more-deps  |  1 +
 .../.kde-frameworks-live.base/_HEADER_ |  2 +
 .../.kde-frameworks-live.base/kde-frameworks-live  |  1 +
 .../.kde-frameworks-live.base/more-deps|  1 +
 .../.kde-frameworks-live/_HEADER_  |  2 +
 .../.kde-frameworks-live/kde-frameworks-live   | 61 
 .../.kde-frameworks-live/more-deps |  1 +
 .../kde-frameworks-5.0.keywords| 65 ++
 .../kde-frameworks-live.keywords   | 65 ++
 Documentation/package.mask/kde-frameworks-5.0  | 64 +
 Documentation/package.mask/kde-frameworks-live | 64 +
 .../package.unmask/.kde-frameworks-5.0/_HEADER_|  2 +
 .../.kde-frameworks-5.0/kde-frameworks-5.0 |  1 +
 .../package.unmask/.kde-frameworks-live/_HEADER_   |  2 +
 .../.kde-frameworks-live/kde-frameworks-live   |  1 +
 Documentation/package.unmask/kde-frameworks-5.0| 64 +
 Documentation/package.unmask/kde-frameworks-live   | 64 +
 sets/kde-frameworks|  1 +
 sets/kde-frameworks-5.0| 61 
 22 files changed, 569 insertions(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files 
b/Documentation/maintainers/regenerate-files
index 1be1180..9df308c 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -12,6 +12,9 @@ HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 KDE_RELEASES="4.11 4.12 4.13"
 RELEASE=${RELEASE:-4.11}
 
+KF_RELEASES="5.0"
+KF_RELEASE=${KF_RELEASE:-5.0}
+
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
 for release in $KDE_RELEASES; do
@@ -21,6 +24,13 @@ for release in $KDE_RELEASES; do
fi
 done
 
+for release in $KF_RELEASES; do
+   echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
+   if [[ -d ".kde-frameworks-${release}" ]]; then
+   cat ".kde-frameworks-${release}/"* | sed '/^~.*[.-]$/s/$/ 
**/' >> "kde-frameworks-${release}.keywords"
+   fi
+done
+
 # ... and for completely unkeyworded packages, add "**"
 for release in $KDE_RELEASES; do
if [[ -d ".kde-${release}" ]]; then
@@ -30,7 +40,7 @@ for release in $KDE_RELEASES; do
for file in ".kde-${release}"/*; do
newfile=".kde-${release}.49."/$(basename "${file}")
sed 
"/^ "${newfile}"
-   echo "${newfile}"
+   # echo "${newfile}"
done
cat ".kde-${release}.49."/* >> 
"kde-${release}.49..keywords"
fi
@@ -47,6 +57,17 @@ if [[ -d .kde-live.base ]]; then
cat .kde-live/* >> kde-live.keywords
 fi
 
+if [[ -d .kde-frameworks-live.base ]]; then
+   rm -rf .kde-frameworks-live
+   mkdir -p .kde-frameworks-live
+   echo -e "${HEADER}" > kde-frameworks-live.keywords
+   for file in .kde-frameworks-live.base/*; do
+   newfile=.kde-frameworks-live/$(basename "${file}")
+   sed '/^~.*[.-]$/s/$/ **/' "${file}" > "${newfile}"
+   done
+   cat .kde-frameworks-live/* >> kde-frameworks-live.keywords
+fi
+
 # keywords for miscleanous packages from package.unmask/
 for misc in kde-extras-live; do
if [[ -f "../package.unmask/${misc}" ]]; then
@@ -64,6 +85,13 @@ for release in $KDE_RELEASES live; do
cat ".kde-${release}/"* >> "kde-${release}"
fi
 done
+
+for release in $KF_RELEASES live; do
+   echo -e "${HEADER}" > "kde-frameworks-${release}"
+   if [[ -d ".kde-frameworks-${release}" ]]; then
+   cat ".kde-frameworks-${release}/"* >> 
"kde-frameworks-${release}"
+   fi
+done
 popd > /dev/null
 
 # regenerate mask entries (base for package mask)
@@ -75,6 +103,14 @@ for release in $KDE_RELEASES live; do
sed -i "kde-${release}" -e 

[gentoo-commits] proj/kde:master commit in: Documentation/package.accept_keywords/.kde-frameworks-live.base/, ...

2014-04-07 Thread Johannes Huber
commit: 82ffaaba8dc76f61485d97f3c4b51643be6d1e62
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr  7 14:21:30 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon Apr  7 14:21:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=82ffaaba

[Documentation] Add Qt5 deps to KF keywords

---
 .../.kde-frameworks-5.0/more-deps  | 18 ++
 .../.kde-frameworks-live.base/more-deps| 18 ++
 .../.kde-frameworks-live/more-deps | 18 ++
 .../kde-frameworks-5.0.keywords| 18 ++
 .../kde-frameworks-live.keywords   | 18 ++
 5 files changed, 90 insertions(+)

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps 
b/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps
index d8a8e5e..14ef9a0 100644
--- a/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps
+++ b/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps
@@ -1 +1,19 @@
 >=dev-libs/extra-cmake-modules-0.0.12
+>=dev-qt/designer-5.2.1:5
+>=dev-qt/qtconcurrent-5.2.1:5
+>=dev-qt/qtcore-5.2.1:5
+>=dev-qt/qtdbus-5.2.1:5
+>=dev-qt/qtdeclarative-5.2.1:5
+>=dev-qt/qtgui-5.2.1:5
+>=dev-qt/qtnetwork-5.2.1:5
+>=dev-qt/qtprintsupport-5.2.1:5
+>=dev-qt/qtquick1-5.2.1:5
+>=dev-qt/qtquickcontrols-5.2.1:5
+>=dev-qt/qtscript-5.2.1:5
+>=dev-qt/qtsql-5.2.1:5
+>=dev-qt/qtsvg-5.2.1:5
+>=dev-qt/qttest-5.2.1:5
+>=dev-qt/qtwebkit-5.2.1:5
+>=dev-qt/qtwidgets-5.2.1:5
+>=dev-qt/qtxml-5.2.1:5
+>=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps 
b/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps
index affb9a5..4214999 100644
--- a/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps
+++ b/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps
@@ -1 +1,19 @@
 ~dev-libs/extra-cmake-modules- **
+>=dev-qt/designer-5.2.1:5
+>=dev-qt/qtconcurrent-5.2.1:5
+>=dev-qt/qtcore-5.2.1:5
+>=dev-qt/qtdbus-5.2.1:5
+>=dev-qt/qtdeclarative-5.2.1:5
+>=dev-qt/qtgui-5.2.1:5
+>=dev-qt/qtnetwork-5.2.1:5
+>=dev-qt/qtprintsupport-5.2.1:5
+>=dev-qt/qtquick1-5.2.1:5
+>=dev-qt/qtquickcontrols-5.2.1:5
+>=dev-qt/qtscript-5.2.1:5
+>=dev-qt/qtsql-5.2.1:5
+>=dev-qt/qtsvg-5.2.1:5
+>=dev-qt/qttest-5.2.1:5
+>=dev-qt/qtwebkit-5.2.1:5
+>=dev-qt/qtwidgets-5.2.1:5
+>=dev-qt/qtxml-5.2.1:5
+>=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps 
b/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps
index affb9a5..4214999 100644
--- a/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps
+++ b/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps
@@ -1 +1,19 @@
 ~dev-libs/extra-cmake-modules- **
+>=dev-qt/designer-5.2.1:5
+>=dev-qt/qtconcurrent-5.2.1:5
+>=dev-qt/qtcore-5.2.1:5
+>=dev-qt/qtdbus-5.2.1:5
+>=dev-qt/qtdeclarative-5.2.1:5
+>=dev-qt/qtgui-5.2.1:5
+>=dev-qt/qtnetwork-5.2.1:5
+>=dev-qt/qtprintsupport-5.2.1:5
+>=dev-qt/qtquick1-5.2.1:5
+>=dev-qt/qtquickcontrols-5.2.1:5
+>=dev-qt/qtscript-5.2.1:5
+>=dev-qt/qtsql-5.2.1:5
+>=dev-qt/qtsvg-5.2.1:5
+>=dev-qt/qttest-5.2.1:5
+>=dev-qt/qtwebkit-5.2.1:5
+>=dev-qt/qtwidgets-5.2.1:5
+>=dev-qt/qtxml-5.2.1:5
+>=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file

diff --git a/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords 
b/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
index 70552ec..caa77ef 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
@@ -63,3 +63,21 @@
 =dev-libs/extra-cmake-modules-0.0.12
+>=dev-qt/designer-5.2.1:5
+>=dev-qt/qtconcurrent-5.2.1:5
+>=dev-qt/qtcore-5.2.1:5
+>=dev-qt/qtdbus-5.2.1:5
+>=dev-qt/qtdeclarative-5.2.1:5
+>=dev-qt/qtgui-5.2.1:5
+>=dev-qt/qtnetwork-5.2.1:5
+>=dev-qt/qtprintsupport-5.2.1:5
+>=dev-qt/qtquick1-5.2.1:5
+>=dev-qt/qtquickcontrols-5.2.1:5
+>=dev-qt/qtscript-5.2.1:5
+>=dev-qt/qtsql-5.2.1:5
+>=dev-qt/qtsvg-5.2.1:5
+>=dev-qt/qttest-5.2.1:5
+>=dev-qt/qtwebkit-5.2.1:5
+>=dev-qt/qtwidgets-5.2.1:5
+>=dev-qt/qtxml-5.2.1:5
+>=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file

diff --git a/Documentation/package.accept_keywords/kde-frameworks-live.keywords 
b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
index 841258c..711c2d6 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-live.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-live.keyw

[gentoo-commits] proj/kde:master commit in: Documentation/package.accept_keywords/.kde-frameworks-live.base/, ...

2014-04-07 Thread Johannes Huber
commit: bce24509956aeea5e9a346a79c6b71915f00bd0f
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr  7 14:48:17 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Mon Apr  7 14:48:17 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bce24509

[Documentation] Add kf-env to KF keywords

---
 Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps| 3 ++-
 .../package.accept_keywords/.kde-frameworks-live.base/more-deps| 3 ++-
 Documentation/package.accept_keywords/.kde-frameworks-live/more-deps   | 3 ++-
 Documentation/package.accept_keywords/kde-frameworks-5.0.keywords  | 3 ++-
 Documentation/package.accept_keywords/kde-frameworks-live.keywords | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps 
b/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps
index 14ef9a0..e1ceafe 100644
--- a/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps
+++ b/Documentation/package.accept_keywords/.kde-frameworks-5.0/more-deps
@@ -1,4 +1,5 @@
 >=dev-libs/extra-cmake-modules-0.0.12
+>=kde-frameworks/kf-env-1
 >=dev-qt/designer-5.2.1:5
 >=dev-qt/qtconcurrent-5.2.1:5
 >=dev-qt/qtcore-5.2.1:5
@@ -16,4 +17,4 @@
 >=dev-qt/qtwebkit-5.2.1:5
 >=dev-qt/qtwidgets-5.2.1:5
 >=dev-qt/qtxml-5.2.1:5
->=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file
+>=dev-qt/qtx11extras-5.2.1:5

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps 
b/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps
index 4214999..6909cf1 100644
--- a/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps
+++ b/Documentation/package.accept_keywords/.kde-frameworks-live.base/more-deps
@@ -1,4 +1,5 @@
 ~dev-libs/extra-cmake-modules- **
+>=kde-frameworks/kf-env-1
 >=dev-qt/designer-5.2.1:5
 >=dev-qt/qtconcurrent-5.2.1:5
 >=dev-qt/qtcore-5.2.1:5
@@ -16,4 +17,4 @@
 >=dev-qt/qtwebkit-5.2.1:5
 >=dev-qt/qtwidgets-5.2.1:5
 >=dev-qt/qtxml-5.2.1:5
->=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file
+>=dev-qt/qtx11extras-5.2.1:5

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps 
b/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps
index 4214999..6909cf1 100644
--- a/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps
+++ b/Documentation/package.accept_keywords/.kde-frameworks-live/more-deps
@@ -1,4 +1,5 @@
 ~dev-libs/extra-cmake-modules- **
+>=kde-frameworks/kf-env-1
 >=dev-qt/designer-5.2.1:5
 >=dev-qt/qtconcurrent-5.2.1:5
 >=dev-qt/qtcore-5.2.1:5
@@ -16,4 +17,4 @@
 >=dev-qt/qtwebkit-5.2.1:5
 >=dev-qt/qtwidgets-5.2.1:5
 >=dev-qt/qtxml-5.2.1:5
->=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file
+>=dev-qt/qtx11extras-5.2.1:5

diff --git a/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords 
b/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
index caa77ef..3e93ae8 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
@@ -63,6 +63,7 @@
 =dev-libs/extra-cmake-modules-0.0.12
+>=kde-frameworks/kf-env-1
 >=dev-qt/designer-5.2.1:5
 >=dev-qt/qtconcurrent-5.2.1:5
 >=dev-qt/qtcore-5.2.1:5
@@ -80,4 +81,4 @@
 >=dev-qt/qtwebkit-5.2.1:5
 >=dev-qt/qtwidgets-5.2.1:5
 >=dev-qt/qtxml-5.2.1:5
->=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file
+>=dev-qt/qtx11extras-5.2.1:5

diff --git a/Documentation/package.accept_keywords/kde-frameworks-live.keywords 
b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
index 711c2d6..5fd7939 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-live.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
@@ -63,6 +63,7 @@
 ~kde-frameworks/sonnet- **
 ~kde-frameworks/threadweaver- **
 ~dev-libs/extra-cmake-modules- **
+>=kde-frameworks/kf-env-1
 >=dev-qt/designer-5.2.1:5
 >=dev-qt/qtconcurrent-5.2.1:5
 >=dev-qt/qtcore-5.2.1:5
@@ -80,4 +81,4 @@
 >=dev-qt/qtwebkit-5.2.1:5
 >=dev-qt/qtwidgets-5.2.1:5
 >=dev-qt/qtxml-5.2.1:5
->=dev-qt/qtx11extras-5.2.1:5
\ No newline at end of file
+>=dev-qt/qtx11extras-5.2.1:5



[gentoo-commits] proj/kde:master commit in: kde-base/kde-cli-tools/

2014-04-08 Thread Johannes Huber
commit: f30c91917d78feb2b3e8f86563aaf49fec32cb51
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 08:45:18 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 08:45:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f30c9191

[kde-base/kde-cli-tools] Block kde-base/kstart:4

Package-Manager: portage-2.2.10

---
 kde-base/kde-cli-tools/kde-cli-tools-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-base/kde-cli-tools/kde-cli-tools-.ebuild 
b/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
index 52a1195..22913e2 100644
--- a/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
+++ b/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
@@ -36,5 +36,6 @@ RDEPEND="${DEPEND}
!kde-base/keditfiletype:4
!kde-base/kioclient:4
!kde-base/kmimetypefinder:4
+   !kde-base/kstart:4
!kde-base/ktraderclient:4
 "



[gentoo-commits] proj/kde:master commit in: kde-frameworks/kde4support/, kde-frameworks/kdelibs4support/

2014-04-08 Thread Johannes Huber
commit: 821e75d8453f9bdf07f6d58698b5d919e52bd0c5
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:25:05 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:25:05 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=821e75d8

[kde-frameworks] pkg move kde4support -> kdelibs4support by upstream

Package-Manager: portage-2.2.10

---
 .../kdelibs4support-4.98.0.ebuild}   | 1 +
 .../kdelibs4support-.ebuild} | 0
 kde-frameworks/{kde4support => kdelibs4support}/metadata.xml | 0
 3 files changed, 1 insertion(+)

diff --git a/kde-frameworks/kde4support/kde4support-4.98.0.ebuild 
b/kde-frameworks/kdelibs4support/kdelibs4support-4.98.0.ebuild
similarity index 98%
rename from kde-frameworks/kde4support/kde4support-4.98.0.ebuild
rename to kde-frameworks/kdelibs4support/kdelibs4support-4.98.0.ebuild
index f4ecf84..1d864b1 100644
--- a/kde-frameworks/kde4support/kde4support-4.98.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-4.98.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 VIRTUALX_REQUIRED="test"
+KMNAME="kde4support"
 inherit kde5
 
 DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"

diff --git a/kde-frameworks/kde4support/kde4support-.ebuild 
b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
similarity index 100%
rename from kde-frameworks/kde4support/kde4support-.ebuild
rename to kde-frameworks/kdelibs4support/kdelibs4support-.ebuild

diff --git a/kde-frameworks/kde4support/metadata.xml 
b/kde-frameworks/kdelibs4support/metadata.xml
similarity index 100%
rename from kde-frameworks/kde4support/metadata.xml
rename to kde-frameworks/kdelibs4support/metadata.xml



[gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, Documentation/package.accept_keywords/, ...

2014-04-08 Thread Johannes Huber
commit: 4fb5c2412834be6fe56886f4c7e9f7a85eb6dc19
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:27:31 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:27:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4fb5c241

[Documentation] Move kde4support -> kdelibs4support by upstream

---
 .../package.accept_keywords/.kde-frameworks-live/kde-frameworks-live| 2 +-
 Documentation/package.accept_keywords/kde-frameworks-5.0.keywords   | 2 +-
 Documentation/package.accept_keywords/kde-frameworks-live.keywords  | 2 +-
 Documentation/package.mask/kde-frameworks-5.0   | 2 +-
 Documentation/package.mask/kde-frameworks-live  | 2 +-
 Documentation/package.unmask/kde-frameworks-5.0 | 2 +-
 Documentation/package.unmask/kde-frameworks-live| 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
 
b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
index 8b4184b..8bd6a6e 100644
--- 
a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
+++ 
b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
@@ -13,9 +13,9 @@
 ~kde-frameworks/kcoreaddons- **
 ~kde-frameworks/kcrash- **
 ~kde-frameworks/kdbusaddons- **
-~kde-frameworks/kde4support- **
 ~kde-frameworks/kdeclarative- **
 ~kde-frameworks/kded- **
+~kde-frameworks/kdelibs4support- **
 ~kde-frameworks/kdesignerplugin- **
 ~kde-frameworks/kdesu- **
 ~kde-frameworks/kdewebkit- **

diff --git a/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords 
b/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
index 3e93ae8..2c2cc1f 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-5.0.keywords
@@ -16,9 +16,9 @@
 

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/

2014-04-08 Thread Johannes Huber
commit: 0ecff10a6c8931e5d10729d8f901b3ac98aa7239
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:29:56 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:29:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0ecff10a

[kde-base/systemsettings] Fix DEPEND

Package-Manager: portage-2.2.10

---
 kde-base/systemsettings/systemsettings-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/systemsettings/systemsettings-.ebuild 
b/kde-base/systemsettings/systemsettings-.ebuild
index da115dd..a6330be 100644
--- a/kde-base/systemsettings/systemsettings-.ebuild
+++ b/kde-base/systemsettings/systemsettings-.ebuild
@@ -20,7 +20,7 @@ DEPEND="
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kde4support)
+   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep khtml)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)



[gentoo-commits] proj/kde:master commit in: kde-base/ksysguard/

2014-04-08 Thread Johannes Huber
commit: 2f7de2f99821515fb3b3bd073fa4019c39f0fd9e
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:28:47 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:28:47 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2f7de2f9

[kde-base/ksysguard] Fix DEPEND

Package-Manager: portage-2.2.10

---
 kde-base/ksysguard/ksysguard-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/ksysguard/ksysguard-.ebuild 
b/kde-base/ksysguard/ksysguard-.ebuild
index 0062f80..711f512 100644
--- a/kde-base/ksysguard/ksysguard-.ebuild
+++ b/kde-base/ksysguard/ksysguard-.ebuild
@@ -18,7 +18,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kde4support)
+   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)



[gentoo-commits] proj/kde:master commit in: kde-base/kwrited/

2014-04-08 Thread Johannes Huber
commit: c15049d86412e841928be4966d294767358299d0
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:29:10 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:29:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c15049d8

[kde-base/kwrited] Fix DEPEND

Package-Manager: portage-2.2.10

---
 kde-base/kwrited/kwrited-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/kwrited/kwrited-.ebuild 
b/kde-base/kwrited/kwrited-.ebuild
index 04219a8..5a00b05 100644
--- a/kde-base/kwrited/kwrited-.ebuild
+++ b/kde-base/kwrited/kwrited-.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 
 DEPEND="
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kde4support)
+   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kpty)



[gentoo-commits] proj/kde:master commit in: sets/

2014-04-08 Thread Johannes Huber
commit: 0178b549157741de0328083e648ed2190a0caa13
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:26:46 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:26:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0178b549

[sets] Update kde-framework*

---
 sets/kde-frameworks  | 2 +-
 sets/kde-frameworks-5.0  | 2 +-
 sets/kde-frameworks-live | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sets/kde-frameworks b/sets/kde-frameworks
index 68f8a9f..7698bb3 100644
--- a/sets/kde-frameworks
+++ b/sets/kde-frameworks
@@ -14,9 +14,9 @@ kde-frameworks/kconfigwidgets:5
 kde-frameworks/kcoreaddons:5
 kde-frameworks/kcrash:5
 kde-frameworks/kdbusaddons:5
-kde-frameworks/kde4support:5
 kde-frameworks/kdeclarative:5
 kde-frameworks/kded:5
+kde-frameworks/kdelibs4support:5
 kde-frameworks/kdesignerplugin:5
 kde-frameworks/kdesu:5
 kde-frameworks/kdewebkit:5

diff --git a/sets/kde-frameworks-5.0 b/sets/kde-frameworks-5.0
index 60892bb..9c628db 100644
--- a/sets/kde-frameworks-5.0
+++ b/sets/kde-frameworks-5.0
@@ -13,9 +13,9 @@
 

[gentoo-commits] proj/kde:master commit in: kde-base/libksysguard/

2014-04-08 Thread Johannes Huber
commit: d2977e79b1cc81f248c32e7bd46d2bb8d586401a
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:29:38 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:29:38 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2977e79

[kde-base/libksysguard] Fix DEPEND

Package-Manager: portage-2.2.10

---
 kde-base/libksysguard/libksysguard-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/libksysguard/libksysguard-.ebuild 
b/kde-base/libksysguard/libksysguard-.ebuild
index e357391..ce97652 100644
--- a/kde-base/libksysguard/libksysguard-.ebuild
+++ b/kde-base/libksysguard/libksysguard-.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kde4support)
+   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)



[gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, profiles/, profiles/updates/

2014-04-08 Thread Johannes Huber
commit: 608aeb84350d5b37f0e61efa5aaab47a4106b61b
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:25:44 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:25:44 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=608aeb84

[profiles] Move kde4support -> kdelibs4support by upstream

---
 profiles/package.mask  | 2 +-
 profiles/package.mask.d/kf5-beta-1 | 2 +-
 profiles/updates/2Q-2014   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index ba3226e..a04f1e3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -325,8 +325,8 @@
 ~kde-frameworks/kcrash-4.98.0
 ~kde-frameworks/kdbusaddons-4.98.0
 ~kde-frameworks/kdeclarative-4.98.0
-~kde-frameworks/kde4support-4.98.0
 ~kde-frameworks/kded-4.98.0
+~kde-frameworks/kdelibs4support-4.98.0
 ~kde-frameworks/kdesignerplugin-4.98.0
 ~kde-frameworks/kdesu-4.98.0
 ~kde-frameworks/kdewebkit-4.98.0

diff --git a/profiles/package.mask.d/kf5-beta-1 
b/profiles/package.mask.d/kf5-beta-1
index db2c76d..412c1ec 100644
--- a/profiles/package.mask.d/kf5-beta-1
+++ b/profiles/package.mask.d/kf5-beta-1
@@ -15,8 +15,8 @@
 ~kde-frameworks/kcrash-4.98.0
 ~kde-frameworks/kdbusaddons-4.98.0
 ~kde-frameworks/kdeclarative-4.98.0
-~kde-frameworks/kde4support-4.98.0
 ~kde-frameworks/kded-4.98.0
+~kde-frameworks/kdelibs4support-4.98.0
 ~kde-frameworks/kdesignerplugin-4.98.0
 ~kde-frameworks/kdesu-4.98.0
 ~kde-frameworks/kdewebkit-4.98.0

diff --git a/profiles/updates/2Q-2014 b/profiles/updates/2Q-2014
new file mode 100644
index 000..7db99a8
--- /dev/null
+++ b/profiles/updates/2Q-2014
@@ -0,0 +1 @@
+move kde-frameworks/kde4support kde-frameworks/kdelibs4support



[gentoo-commits] proj/kde:master commit in: kde-base/kde-cli-tools/

2014-04-08 Thread Johannes Huber
commit: 1f74d8f17cb3e1211b26095c99b1c4b466cea36e
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr  8 12:28:25 2014 +
Commit:     Johannes Huber  gentoo  org>
CommitDate: Tue Apr  8 12:28:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1f74d8f1

[kde-base/kde-cli-tools] Fix DEPEND

Package-Manager: portage-2.2.10

---
 kde-base/kde-cli-tools/kde-cli-tools-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/kde-cli-tools/kde-cli-tools-.ebuild 
b/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
index 22913e2..472f132 100644
--- a/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
+++ b/kde-base/kde-cli-tools/kde-cli-tools-.ebuild
@@ -17,7 +17,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kde4support)
+   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdesu)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)



  1   2   3   4   5   6   7   8   9   10   >