[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2016-11-15 Thread Johannes Huber 
commit: b87c4f94920ecbb7b55ee6114c89177854c125b7
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Nov 15 20:16:39 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Nov 15 20:16:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87c4f94

kde-base/kdelibs: Remove 4.14.25

Package-Manager: portage-2.3.2

 kde-base/kdelibs/Manifest  |   1 -
 kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch |  51 
 kde-base/kdelibs/kdelibs-4.14.25.ebuild| 301 -
 3 files changed, 353 deletions(-)

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 30dff79..16384f0 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,2 @@
 DIST kdelibs-4.14.24.tar.xz 11635840 SHA256 
45e663e8739f131115eda69e5af95e895cce8161228d075d74a9a8cd390346ef SHA512 
187737e30d05f324977cfc14aa375b49e15c322abb2b8f482382f9e6061bf7d18b97b957a7fcc1fb9184fa68cd3e1753d9633e14f32d799e3e5a78f283ff0894
 WHIRLPOOL 
2a4a67f792a2d88f2a4cfd49cafe2c611e79ba974a55d6d77e9688acf89be56817adfa6489017162afc42d7c30949df277b8974a2aaf59b2357a3b279a83b0a2
-DIST kdelibs-4.14.25.tar.xz 11633512 SHA256 
ba5d3e893f492368e9ded2fe51cf419c5329524291a523b1974f9c86e3c02d02 SHA512 
d95ee914003b1b4c8d791696f7ace2310da86afadaef9d21a275a3fa87b651f20739c866a2fab39608f2c73cb7f3bc8a29797b88fafe6f9be0dba407c25fe175
 WHIRLPOOL 
30e7ca81e3ede64c52f3fcd8a0d105195f28749a8b68e3c0a057d5a65dd4d8031ae11d35a8cd4f5ee5125dc875fdfbbd4d2e371dae4f73cda67aca1bc2541764
 DIST kdelibs-4.14.26.tar.xz 11634296 SHA256 
391d37eceb30d4fbdb4be1acb202a42aa8a202ef10ea6b67904383118bd26a10 SHA512 
d9abfb98c0e50ea85892429522febc9fdaa51070ab62eb4b01781b543dfc446d508ff0360be2bce68d0f5e446100b2aa3bc2253a323f16fcfb3a26362fd65d0b
 WHIRLPOOL 
2ddd1efc3eb660c19a18d3acdbc646a251c15a662b9f23c675623633d860b44f4a2d2d6138aa9568b641e1d94af304805b4db609eac77c855fd3df09f6d5171a

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch
deleted file mode 100644
index 5bec017..
--- a/kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Albert Astals Cid 
-Date: Wed, 19 Oct 2016 12:44:03 +
-Subject: Fix HAVE_TRUNC cmake check
-X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=0c642ae95dacf894e50630ffcc1961ad1e4e0322

-Fix HAVE_TRUNC cmake check
-
-On newer distros the check fails because trunc is ambiguous, so tell sizeof 
exactly which trunc we're speaking about.
-
-REVIEW: 129119

-
-
 a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -244,7 +244,7 @@
- check_prototype_exists(usleep unistd.h  HAVE_USLEEP_PROTO)
- check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" 
HAVE_INITGROUPS_PROTO)
- check_prototype_exists(setreuid unistd.hHAVE_SETREUID_PROTO)
--check_prototype_exists(trunc math.h HAVE_TRUNC)
-+check_prototype_exists(trunc math.h HAVE_TRUNC "(double 
(*)(double))")
- 
- # check for existing datatypes
- 
-
 a/cmake/modules/CheckPrototypeExists.cmake
-+++ b/cmake/modules/CheckPrototypeExists.cmake
-@@ -21,6 +21,13 @@
- INCLUDE(CheckCXXSourceCompiles)
- 
- MACRO (CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
-+   SET(extra_macro_args ${ARGN})
-+   LIST(LENGTH extra_macro_args num_extra_args)
-+   SET(_PROTOTYPE "")
-+   IF (${num_extra_args} EQUAL 1)
-+  LIST(GET extra_macro_args 0 _PROTOTYPE)
-+   ENDIF ()
-+
-SET(_INCLUDE_FILES)
-FOREACH (it ${_HEADER})
-   SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
-@@ -31,7 +38,7 @@
- int main()
- {
- #ifndef ${_SYMBOL}
--   int i = sizeof(&${_SYMBOL});
-+   int i = sizeof(${_PROTOTYPE}&${_SYMBOL});
- #endif
-   return 0;
- }
-

diff --git a/kde-base/kdelibs/kdelibs-4.14.25.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.25.ebuild
deleted file mode 100644
index efeb029..
--- a/kde-base/kdelibs/kdelibs-4.14.25.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CMAKE_MIN_VERSION="3.3.1-r1"
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-APPS_VERSION="16.08.2" # Don't forget to bump this
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-[[ ${KDE_BUILD_TYPE} != live ]] && \
-SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
-cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
-   udisks

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2016-08-18 Thread Michael Palimaka 
commit: efa363f501450b10d55a932a46432a1fbd2287cf
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Aug 18 08:04:27 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 18 14:32:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa363f5

kde-base/kdelibs: Backport fix for shared libs bug with gcc-6

Package-Manager: portage-2.2.28

 .../files/kdelibs-4.14.22-gcc6-visibility.patch| 26 ++
 kde-base/kdelibs/kdelibs-4.14.22.ebuild|  1 +
 2 files changed, 27 insertions(+)

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.22-gcc6-visibility.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.22-gcc6-visibility.patch
new file mode 100644
index 000..5a98d9c
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.22-gcc6-visibility.patch
@@ -0,0 +1,26 @@
+From: David Faure 
+Date: Tue, 16 Aug 2016 13:50:57 +
+Subject: Fix wrong value of __KDE_HAVE_GCC_VISIBILITY on systems with gcc 6.
+X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=e9b25c7c040d8526fe8675b97d1067c8ffa7249f
+---
+Fix wrong value of __KDE_HAVE_GCC_VISIBILITY on systems with gcc 6.
+
+Clearly the author of this regexp, in 2006, thought gcc would never
+hit version 6 :-)
+
+REVIEW: 128697
+---
+
+
+--- a/cmake/modules/FindKDE4Internal.cmake
 b/cmake/modules/FindKDE4Internal.cmake
+@@ -1221,7 +1221,7 @@
+# get the gcc version
+exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version 
OUTPUT_VARIABLE _gcc_version_info)
+ 
+-   string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version 
"${_gcc_version_info}")
++   string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version 
"${_gcc_version_info}")
+# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch 
level, handle this here:
+if (NOT _gcc_version)
+   string (REGEX MATCH ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" 
_gcc_version "${gcc_on_macos}")
+

diff --git a/kde-base/kdelibs/kdelibs-4.14.22.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.22.ebuild
index f41ad2d..b31ebd6 100644
--- a/kde-base/kdelibs/kdelibs-4.14.22.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.22.ebuild
@@ -135,6 +135,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.14.20-FindQt4.patch"
"${FILESDIR}/${PN}-4.14.20-strigi-optional.patch"
"${FILESDIR}/${PN}-4.14.22-webkit.patch"
+   "${FILESDIR}/${PN}-4.14.22-gcc6-visibility.patch"
 )
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2016-07-27 Thread Michael Palimaka 
commit: bac2b5875708523b5317bb1588d8edb437d92832
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Jul 21 19:57:51 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul 27 15:55:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac2b587

kde-base/kdelibs: Patch to use WEBKIT_REQUIRED=optional

Add WEBKIT_REQUIRED="always" to <4.14.22 - these were not patched.

Package-Manager: portage-2.2.28

 .../kdelibs/files/kdelibs-4.14.22-webkit.patch | 85 ++
 kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild |  3 +-
 kde-base/kdelibs/kdelibs-4.14.21.ebuild|  3 +-
 kde-base/kdelibs/kdelibs-4.14.22.ebuild|  5 +-
 4 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch
new file mode 100644
index 000..dcbb565
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch
@@ -0,0 +1,85 @@
+--- a/CMakeLists.txt   2016-07-06 12:18:35.0 +0200
 b/CMakeLists.txt   2016-07-21 21:40:26.080328514 +0200
+@@ -45,6 +45,9 @@
+ ### Give the user the option to build the deprecated WMI solid 
backend instead of the new win backend ###
+ option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows")
+ 
++### Give the user the option to build without qtwebkit dependency 
 ###
++option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and 
kdewebkit-widgets" "ON")
++
+ ### Load the CTest options ###
+ # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
+ # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
+@@ -363,7 +366,9 @@
+ add_subdirectory( plasma )
+ endif(NOT WINCE)
+ add_subdirectory( kunitconversion )
++if(WITH_KDEWEBKIT)
+ add_subdirectory( kdewebkit )
++endif(WITH_KDEWEBKIT)
+ add_subdirectory( includes )
+ 
+ add_subdirectory( experimental )
+--- a/kdewidgets/CMakeLists.txt2016-07-06 12:18:35.0 +0200
 b/kdewidgets/CMakeLists.txt2016-07-21 21:39:54.031052674 +0200
+@@ -90,6 +90,7 @@
+ 
+ 
+   # kdewebkit widgets
++  if(WITH_KDEWEBKIT)
+   include_directories(
+ ${CMAKE_SOURCE_DIR}/kdewebkit
+   )
+@@ -121,7 +122,7 @@
+   endif(NOT WIN32)
+ 
+   install(TARGETS kdewebkitwidgets  DESTINATION 
${PLUGIN_INSTALL_DIR}/plugins/designer )
+-
++  endif(WITH_KDEWEBKIT)
+ 
+   if (QT_QT3SUPPORT_FOUND)
+ 
+--- a/plasma/CMakeLists.txt2016-07-22 01:26:52.992198945 +0200
 b/plasma/CMakeLists.txt2016-07-22 01:28:10.487904045 +0200
+@@ -10,6 +10,10 @@
+ set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
+ endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+ 
++if(NOT WITH_KDEWEBKIT)
++set(PLASMA_NO_KDEWEBKIT TRUE)
++endif(NOT WITH_KDEWEBKIT)
++
+ set(PLASMA_NO_PACKAGEKIT TRUE)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+@@ -121,7 +125,6 @@
+ framesvg.cpp
+ plasma.cpp
+ popupapplet.cpp
+-private/animablegraphicswebview.cpp
+ private/applethandle.cpp
+ private/associatedapplicationmanager.cpp
+ private/componentinstaller.cpp
+@@ -211,7 +214,6 @@
+ widgets/textbrowser.cpp
+ widgets/treeview.cpp
+ widgets/textedit.cpp
+-widgets/webview.cpp
+ 
+ #Temporary QtJolie branch
+ private/qtjolie-branch/qtjolie/abstractadaptor.cpp
+@@ -245,6 +247,14 @@
+ )
+ endif(NOT KDE_NO_DEPRECATED)
+ 
++if(NOT PLASMA_NO_KDEWEBKIT)
++set(plasma_LIB_SRCS
++${plasma_LIB_SRCS}
++private/animablegraphicswebview.cpp
++widgets/webview.cpp
++)
++endif(NOT PLASMA_NO_KDEWEBKIT)
++
+ kde4_add_kcfg_files(plasma_LIB_SRCS 
data/kconfigxt/libplasma-theme-global.kcfgc)
+ 
+ kde4_add_ui_files(plasma_LIB_SRCS

diff --git a/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild
index 6692c97..3b2df45 100644
--- a/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild
@@ -7,8 +7,9 @@ EAPI=6
 CMAKE_MIN_VERSION="3.3.1-r1"
 CPPUNIT_REQUIRED="optional"
 DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
 KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
 
 EGIT_BRANCH="KDE/4.14"

diff --git a/kde-base/kdelibs/kdelibs-4.14.21.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.21.ebuild
index c3273ba..92f0b61 100644
--- a/kde-base/kdelibs/kdelibs-4.14.21.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.21.ebuild
@@ -7,8 +7,9 @@ EAPI=6
 CMAKE_MIN_VERSION="3.3.1-r1"
 CPPUNIT_REQUIRED="optional"
 DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
 KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
 
 EGIT_BRANCH="KDE/4.14"

diff --git a/kde-base/kdelibs/kdelibs-4.14.22.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.22.ebuild
index c47f63c..c2c1f1c 100644
--- a/kde-ba

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2016-06-15 Thread Michael Palimaka 
commit: c9ce8de117e532afb3f2a550041d2fe698270350
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 18:27:14 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 18:27:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ce8de1

kde-base/kdelibs: remove old

Package-Manager: portage-2.3.0_rc1

 kde-base/kdelibs/Manifest  |   1 -
 .../kdelibs/files/kdelibs-4.14.13-FindQt4.patch|  38 ---
 kde-base/kdelibs/kdelibs-4.14.16.ebuild| 300 -
 3 files changed, 339 deletions(-)

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 22f77c8..66c5529 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,2 @@
-DIST kdelibs-4.14.16.tar.xz 11633476 SHA256 
7bf6b930c49952dceb1a090c20bf567f4385a2bbc0069a4393608b2a79e6b3aa SHA512 
882df4ce0a2f77fdc2fddbeae401c961c639b12ee2f198c2afd458eb7bcb41268924033b348fc1ef187f273783b92ae05a87422def3751d4003836bda9b153bd
 WHIRLPOOL 
96e45ac474e4c79bf031047fdb6fe74066ae95cfaf13484498632cfcfd18409ffe46e13b3e72403d2d53fc24e78008f55061c146fbdb5631a80b4ae759e6bebf
 DIST kdelibs-4.14.20.tar.xz 11632384 SHA256 
b77e9b3c5063563db00e2fd816794f438148609aee22c2f2ddb2588b9e8c3cb4 SHA512 
bcc52c959497ac229d21665113236428ac71e34cf5ac853b2d0200fd067f71db432aa29e1709ffcc2762764d1e973638e805a377ca4a254c0b3ded7f03228fbb
 WHIRLPOOL 
76058923f6dc50ebdbc0dd1bfebc12048ebfa2ed431dc78e34017707e90553c0eb5e25825c0f13cc892eb1cd601d702aee4f62235be0f449974af402c3eeb650
 DIST kdelibs-4.14.21.tar.xz 11634568 SHA256 
487f757168a4e57f004b2c68853a183447843425a0c310fdc2b18f3f7acb2242 SHA512 
fd1000d04520a9c382158e526f3bc9d8dd53b093317d9a394ea0afcaa9671202e44c446d034431a8705a3fc9550112bb392e30c3b5c1f56e08ecfbc613213d02
 WHIRLPOOL 
83118942d74f85406412a2214c3fc65eb63b12f9f8da15ce292ab5ec26706f32123272b3911eb05608f226a6b56b75679d867b56b724efb0dc5e6c08f399a394

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
deleted file mode 100644
index dcd27a5..000
--- a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to 
qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
-Gentoo-bug: 562746
-
 a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version 
"[HKEY_CURRENT_USER\\Software\\trollte
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
-+if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+  find_program(QT_QMAKE_EXECUTABLE NAMES qmake
-+PATHS
-+  /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
-+  /usr/bin
-+  NO_DEFAULT_PATH
-+DOC "The qmake executable for the Qt installation to use"
-+  )
-+else()
- FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-   
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 
qmake-qt4 qmake-mac PATHS
-   $ENV{QTDIR}/bin
-   DOC "The qmake executable for the Qt installation to use"
- )
-+endif()
- 
- IF (QT_QMAKE_EXECUTABLE)
- 

diff --git a/kde-base/kdelibs/kdelibs-4.14.16.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
deleted file mode 100644
index eb6fc3c..000
--- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MIN_VERSION="3.3.1-r1"
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-APPS_VERSION="15.12.1" # Don't forget to bump this
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
-cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
-   udisks? ( udev )
-   upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-   >=app-misc/strigi-0.7.7
-   app-text/docbook-xml-dtd:4.2
-   app-text

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2016-05-26 Thread Johannes Huber 
commit: b1bbf3f33cd335121071c733fc8195dfd158ba87
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu May 26 14:55:03 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu May 26 14:56:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1bbf3f3

kde-base/kdelibs: Remove DEPEND on app-misc/strigi

Revision bump from upstream which moves hard requirement on app-misc/strigi to
optional.

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

Gentoo-bug: 583716

Package-Manager: portage-2.3.0_rc1

 .../files/kdelibs-4.14.20-strigi-optional.patch|  24 ++
 kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild | 301 +
 2 files changed, 325 insertions(+)

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
new file mode 100644
index 000..c9e9655
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e7b2bea..87147b5 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -82,17 +82,10 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION 
"Support for gzip compressed
+   )
+ 
+ find_package(Strigi 0.6.3)
+-if (WIN32)
+-set (STRIGI_TYPE "OPTIONAL")
+-set (STRIGI_EXTRA_TEXT "")
+-else (WIN32)
+-set (STRIGI_TYPE "REQUIRED")
+-set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves")
+-endif (WIN32)
+ set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and 
search support"
+URL "http://strigi.sourceforge.net";
+-   TYPE ${STRIGI_TYPE}
+-   PURPOSE ${STRIGI_EXTRA_TEXT}
++   TYPE OPTIONAL
++   PURPOSE "Required by some kioslaves for metadata 
support"
+   )
+ 
+ find_package(LibAttica 0.4.2)

diff --git a/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild
new file mode 100644
index 000..cdbb5a8
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.3.1-r1"
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+EGIT_BRANCH="KDE/4.14"
+APPS_VERSION="16.04.1" # Don't forget to bump this
+
+DESCRIPTION="KDE libraries needed by all KDE programs"
+[[ ${KDE_BUILD_TYPE} != live ]] && \
+SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+   udisks? ( udev )
+   upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xsl-stylesheets
+   >=dev-libs/libattica-0.4.2
+   >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
+   dev-libs/libpcre[unicode]
+   dev-libs/libxml2
+   dev-libs/libxslt
+   media-libs/fontconfig
+   media-libs/freetype:2
+   media-libs/giflib:=
+   media-libs/libpng:0=
+   media-libs/phonon[qt4]
+   sys-libs/zlib
+   virtual/jpeg:0
+   >=x11-misc/shared-mime-info-0.60
+   acl? ( virtual/acl )
+   !aqua? (
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXau
+   x11-libs/libXcursor
+   x11-libs/libXdmcp
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXft
+   x11-libs/libXpm
+   x11-libs/libXrender
+   x11-libs/libXScrnSaver
+   x11-libs/libXtst
+   !kernel_SunOS? (
+   || (
+   sys-libs/libutempter
+   >=sys-freebsd/freebsd-lib-9.0
+   )
+   )
+   )
+   bzip2? ( app-arch/bzip2 )
+   crypt? ( app-crypt/qca:2[qt4(+)] )
+   fam? ( virtual/fam )
+   jpeg2k? ( media-libs/jasper )
+   kerberos? ( virtual/krb5 )
+   openexr? (
+   media-libs/openexr:=
+   media-libs/ilmbase:=
+   )
+   policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
+   spell? ( app-text/enchant )
+   ssl? (
+   libressl? ( dev-libs/libressl )
+   !libressl? ( dev-libs/openssl:0 )
+   )
+   udev? ( virtual/udev )
+   zeroconf? ( net-dns/avahi[mdnsrespo

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2016-05-21 Thread Michael Palimaka 
commit: 940f9abe893ef064fb6617a6242c62305ad75f87
Author: gtkgfxp  gmx  com>
AuthorDate: Sat May 21 18:25:35 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat May 21 18:27:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940f9abe

kde-base/kdelibs: fix build on prefix

Gentoo-bug: 583506

Package-Manager: portage-2.2.28

 .../kdelibs/files/kdelibs-4.14.20-FindQt4.patch|  39 +++
 kde-base/kdelibs/kdelibs-4.14.20-r1.ebuild | 300 +
 2 files changed, 339 insertions(+)

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
new file mode 100644
index 000..2325fb1
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
@@ -0,0 +1,39 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to 
qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 562746
+Gentoo-bug: 583506
+
+--- a/cmake/modules/FindQt4.cmake
 b/cmake/modules/FindQt4.cmake
+@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version 
"[HKEY_CURRENT_USER\\Software\\trollte
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
++if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  find_program(QT_QMAKE_EXECUTABLE NAMES qmake
++PATHS
++  $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++  $ENV{EPREFIX}/usr/bin
++  NO_DEFAULT_PATH
++DOC "The qmake executable for the Qt installation to use"
++  )
++else()
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+   
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 
qmake-qt4 qmake-mac PATHS
+   $ENV{QTDIR}/bin
+   DOC "The qmake executable for the Qt installation to use"
+ )
++endif()
+ 
+ IF (QT_QMAKE_EXECUTABLE)
+ 

diff --git a/kde-base/kdelibs/kdelibs-4.14.20-r1.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.20-r1.ebuild
new file mode 100644
index 000..7efa698
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.14.20-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.3.1-r1"
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+EGIT_BRANCH="KDE/4.14"
+APPS_VERSION="16.04.1" # Don't forget to bump this
+
+DESCRIPTION="KDE libraries needed by all KDE programs"
+[[ ${KDE_BUILD_TYPE} != live ]] && \
+SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+   udisks? ( udev )
+   upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+   >=app-misc/strigi-0.7.7
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xsl-stylesheets
+   >=dev-libs/libattica-0.4.2
+   >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
+   dev-libs/libpcre[unicode]
+   dev-libs/libxml2
+   dev-libs/libxslt
+   media-libs/fontconfig
+   media-libs/freetype:2
+   media-libs/giflib:=
+   media-libs/libpng:0=
+   media-libs/phonon[qt4]
+   sys-libs/zlib
+   virtual/jpeg:0
+   >=x11-misc/shared-mime-info-0.60
+   acl? ( virtual/acl )
+   !aqua? (
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXau
+   x11-libs/libXcursor
+   x11-libs/libXdmcp
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXft
+   x11-libs/libXpm
+   x11-libs/libXrender
+   x11-libs/libXScrnSaver
+   x11-libs/libXtst
+   !kernel_SunOS? (
+   || (
+   sys-libs/libutempter
+   >=sys-freebsd/freebsd-lib-9.0
+   )
+   )
+   )
+   bzip2? ( app-arch/bzip2 )
+   crypt? ( app-crypt/qca:2[qt4(+)] )
+   fam? ( virtual/fam )
+   jpeg2k? ( media-libs/jasper )
+   kerberos? ( virt

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/, kde-base/kdelibs/files/dist/

2016-04-21 Thread Johannes Huber 
commit: 054841cf9ef028eb1609b7d6f1acdc2955a65838
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr 21 10:09:18 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Apr 21 10:10:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=054841cf

kde-base/kdelibs: Version bump 4.14.19

Package-Manager: portage-2.2.28

 kde-base/kdelibs/Manifest  |   1 +
 .../dist/01_gentoo_set_xdg_menu_prefix-1.patch |   4 +-
 .../dist/02_gentoo_append_xdg_config_dirs-1.patch  |   4 +-
 kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch |   8 +-
 .../kdelibs/files/kdelibs-4.14.13-FindQt4.patch|   4 +-
 .../files/kdelibs-4.14.5-fatalwarnings.patch   |   4 +-
 .../kdelibs/files/kdelibs-4.14.5-mimetypes.patch   |   4 +-
 .../kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch |   4 +-
 kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch  |   4 +-
 kde-base/kdelibs/kdelibs-4.14.19.ebuild| 300 +
 10 files changed, 319 insertions(+), 18 deletions(-)

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index e8c5a68..1bf439c 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,4 @@
 DIST kdelibs-4.14.16.tar.xz 11633476 SHA256 
7bf6b930c49952dceb1a090c20bf567f4385a2bbc0069a4393608b2a79e6b3aa SHA512 
882df4ce0a2f77fdc2fddbeae401c961c639b12ee2f198c2afd458eb7bcb41268924033b348fc1ef187f273783b92ae05a87422def3751d4003836bda9b153bd
 WHIRLPOOL 
96e45ac474e4c79bf031047fdb6fe74066ae95cfaf13484498632cfcfd18409ffe46e13b3e72403d2d53fc24e78008f55061c146fbdb5631a80b4ae759e6bebf
 DIST kdelibs-4.14.18.tar.xz 11634568 SHA256 
778e86392f2c61e36d1cf335e763d06a18487121b3cd5e583a75933f22d3ce63 SHA512 
3e40cec5008dedba7d74aa2dd34f71c6ca8eb6b0c492187541029e0185ced58ba4a73b4bb0d1820933bbcc97b43949b84de2414b4eddd8d89e91fe6845c5e694
 WHIRLPOOL 
d45ea329bcff5e4e9f0bc9c21bd11339f06f1f9d5c2831cca6bdebc77366474117d93f62fefa0ad0f7bc48dceacd1197927808a53543d9460c8f329cad83e177
+DIST kdelibs-4.14.19.tar.xz 11631092 SHA256 
e622a79688fbc1db7eb92a52615e4347528c5836893c656f62c807d27684d535 SHA512 
670e169f98fa25ebb615fe75caddc684f1bbd56bfcbc7f68d36d9f7c7d4677df5372a79346eefa116668e6c0c6dec27fa49c52c10025ad5857bede59b61c7057
 WHIRLPOOL 
4ffdc7258d64a02c9d2779a6dafdc5fc20d651224dfb842265e15507ed0cbb3193e02131b6da7e277b63d49e5ca53a7059f21a8f1f5cfdc82f557e8e0873592b
 DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 
705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 
0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e
 WHIRLPOOL 
6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4

diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch 
b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
index 228914f..c12c2ab 100644
--- a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
+++ b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
@@ -3,8 +3,8 @@ KDE4 applications outside of KDE4 environment.
 
 Index: kded/vfolder_menu.cpp
 ===
 kded/vfolder_menu.cpp  (revision 1014368)
-+++ kded/vfolder_menu.cpp  (working copy)
+--- a/kded/vfolder_menu.cpp(revision 1014368)
 b/kded/vfolder_menu.cpp(working copy)
 @@ -770,7 +770,9 @@
 QString result;
  

diff --git 
a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch 
b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
index 3049b0a..074847a 100644
--- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
+++ b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
@@ -5,8 +5,8 @@ Set up XDG_CONFIG_DIRS lookup in order:
 
 Index: kdecore/kernel/kstandarddirs.cpp
 ===
 kdecore/kernel/kstandarddirs.cpp   (revision 1014759)
-+++ kdecore/kernel/kstandarddirs.cpp   (working copy)
+--- a/kdecore/kernel/kstandarddirs.cpp (revision 1014759)
 b/kdecore/kernel/kstandarddirs.cpp (working copy)
 @@ -1664,16 +1664,13 @@
  {
  tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR)));

diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch 
b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
index 7de5ec9..63e9b30 100644
--- a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
@@ -1,8 +1,8 @@
 udisks1 is deprecated and going away, so removing this clause
 will permit us to build without udisks at all.
 
 solid/solid/CMakeLists.txt
-+++ solid/solid/CMakeLists.txt
+--- a/solid/solid/CMakeLists.txt
 b/solid/solid/CMakeLists.txt
 @@ -283,20 +283,6 @@
 backends/udisks2/udisksgenericinterface.cpp
 backends/udisks2/dbus/manager.cp

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2016-03-11 Thread Johannes Huber 
commit: 68c67069217a5f40b2b4a75fcaaf2ea0f3ab465f
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Mar 11 17:58:49 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Mar 11 17:59:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c67069

kde-base/kdelibs: Version bump 4.14.17

Package-Manager: portage-2.2.28

 kde-base/kdelibs/Manifest  |   3 +-
 .../kdelibs/files/kdelibs-4.14.15-revert.patch |  52 
 kde-base/kdelibs/kdelibs-4.14.14.ebuild| 303 -
 ...bs-4.14.15-r1.ebuild => kdelibs-4.14.17.ebuild} |   1 -
 4 files changed, 1 insertion(+), 358 deletions(-)

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 59108e1..c74c4ed 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,4 +1,3 @@
-DIST kdelibs-4.14.14.tar.xz 11631016 SHA256 
63199b12957211b5ba0250b82da1d8ebc84cd5e55df287ea588cc69745c0b614 SHA512 
93e6bb918449df51bc39b7b952e9487f77759616ebdae1f6f244e3a6dd7a60ee49ca2cf21eca7bc90226b7a7b9669096717ceefbc2af43cc96291f849dfe3791
 WHIRLPOOL 
603652472b0e813cf101d41b55afc7ed1b373f7cb7b5757cac2713615481483c1f8618968673cad5e79d5e42af505acb5bf932f29bfd142b4d9cf2616e8655d8
-DIST kdelibs-4.14.15.tar.xz 11633836 SHA256 
479ddc9cab1c6c615456bebd0f09a2710f76273157e99c11c8f3e902e3b22819 SHA512 
a50dcf8bd06024efe4c4e62a7822cd4e20820452812e1a41961d32b8b8dd2ae52346220830a5ab2ebf6f7a99071852fa21f8dca6e4ba6ddb872b5023b7b2d6df
 WHIRLPOOL 
067aac20c9cca4a3acf06daeed4c15214f8579b8475a45ec4ceeabfce5c0caa7256d847a9dd417680cca30cdd3edd49c826cb11f1c7a2bc67ab2f4d8220edcdb
 DIST kdelibs-4.14.16.tar.xz 11633476 SHA256 
7bf6b930c49952dceb1a090c20bf567f4385a2bbc0069a4393608b2a79e6b3aa SHA512 
882df4ce0a2f77fdc2fddbeae401c961c639b12ee2f198c2afd458eb7bcb41268924033b348fc1ef187f273783b92ae05a87422def3751d4003836bda9b153bd
 WHIRLPOOL 
96e45ac474e4c79bf031047fdb6fe74066ae95cfaf13484498632cfcfd18409ffe46e13b3e72403d2d53fc24e78008f55061c146fbdb5631a80b4ae759e6bebf
+DIST kdelibs-4.14.17.tar.xz 11634968 SHA256 
e64510badfb8ec4238cfd391cb06cd874fa1d7ca2591be1d3e2b8ba4a0a4 SHA512 
a8835f09edac5faeefba088c96a2bd380f9e9d356eacc0173de8f9dfdeeb2a1baed8f60fd22a6ddb762ff41a5152deca91fc0c9bb5d2c3348c23a9116c084396
 WHIRLPOOL 
29204abfadce0e2f8aa2bf9594523f5bddd6295dfede19bd33803189ba5de05a72096d23141f7bb78145327cc5b18963866e658eeffe15aebc45b24220f6a89d
 DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 
705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 
0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e
 WHIRLPOOL 
6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch
deleted file mode 100644
index 3840331..000
--- a/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Alex Merry 
-Date: Tue, 15 Dec 2015 19:26:47 +
-Subject: Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
-X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a02df05e4bd083f98147c86f88da2f818fc6c9f4

-Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
-
-This reverts commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb.
-
-This change seems to be causing more problems than it fixes - it's
-probably just too big of a behaviour change for kdelibs. Which means
-that akregator will probably keep randomly crashing, but the alternative
-seems to be various other applications consistently crashing at exit.
-
-If we can fix those applications (Kopete in particular), we can consider
-re-applying this afterwards.
-
-BUG: 355275

-
-
 a/kparts/part.cpp
-+++ b/kparts/part.cpp
-@@ -350,7 +350,7 @@
- d->m_widget = 0;
- if (d->m_autoDeletePart) {
- kDebug(1000) << "deleting part" << objectName();
--this->deleteLater();
-+delete this; // ouch, this should probably be deleteLater()
- }
- }
- 
-
 a/kparts/tests/parttest.cpp
-+++ b/kparts/tests/parttest.cpp
-@@ -48,7 +48,6 @@
- KParts::Part* part = new TestPart(0, 0);
- QPointer partPointer(part);
- delete part->widget();
--QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
- QVERIFY(partPointer.isNull());
- }
- 
-@@ -58,7 +57,6 @@
- QPointer partPointer(part);
- QPointer widgetPointer(part->widget());
- delete part;
--QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
- QVERIFY(widgetPointer.isNull());
- }
- 
-

diff --git a/kde-base/kdelibs/kdelibs-4.14.14.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.14.ebuild
deleted file mode 100644
index ca8747b..000
--- a/kde-base/kdelibs/kdelibs-4.14.14.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2015-12-29 Thread Michael Palimaka 
commit: cd28e7b30b1a2c93e489974ce7c05bb127ce3fdf
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Dec 25 21:48:48 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec 29 16:09:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd28e7b3

kde-base/kdelibs: Add patch that should have been part of 4.14.15 already

This reverts a change from 4.14.14 that supposedly fixed a crash in
kde-base/akregator, but led to crashes on exit in other applications
such as kopete.

Package-Manager: portage-2.2.24

 .../kdelibs/files/kdelibs-4.14.15-revert.patch |  52 
 kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild | 304 +
 2 files changed, 356 insertions(+)

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch
new file mode 100644
index 000..3840331
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch
@@ -0,0 +1,52 @@
+From: Alex Merry 
+Date: Tue, 15 Dec 2015 19:26:47 +
+Subject: Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
+X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a02df05e4bd083f98147c86f88da2f818fc6c9f4
+---
+Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
+
+This reverts commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb.
+
+This change seems to be causing more problems than it fixes - it's
+probably just too big of a behaviour change for kdelibs. Which means
+that akregator will probably keep randomly crashing, but the alternative
+seems to be various other applications consistently crashing at exit.
+
+If we can fix those applications (Kopete in particular), we can consider
+re-applying this afterwards.
+
+BUG: 355275
+---
+
+
+--- a/kparts/part.cpp
 b/kparts/part.cpp
+@@ -350,7 +350,7 @@
+ d->m_widget = 0;
+ if (d->m_autoDeletePart) {
+ kDebug(1000) << "deleting part" << objectName();
+-this->deleteLater();
++delete this; // ouch, this should probably be deleteLater()
+ }
+ }
+ 
+
+--- a/kparts/tests/parttest.cpp
 b/kparts/tests/parttest.cpp
+@@ -48,7 +48,6 @@
+ KParts::Part* part = new TestPart(0, 0);
+ QPointer partPointer(part);
+ delete part->widget();
+-QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+ QVERIFY(partPointer.isNull());
+ }
+ 
+@@ -58,7 +57,6 @@
+ QPointer partPointer(part);
+ QPointer widgetPointer(part->widget());
+ delete part;
+-QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+ QVERIFY(widgetPointer.isNull());
+ }
+ 
+

diff --git a/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild
new file mode 100644
index 000..f0ded53
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="3.3.1-r1"
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+EGIT_BRANCH="KDE/4.14"
+
+DESCRIPTION="KDE libraries needed by all KDE programs"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+   udisks? ( udev )
+   upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+   >=app-misc/strigi-0.7.7
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xsl-stylesheets
+   >=dev-libs/libattica-0.4.2
+   >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
+   dev-libs/libpcre[unicode]
+   dev-libs/libxml2
+   dev-libs/libxslt
+   media-libs/fontconfig
+   media-libs/freetype:2
+   media-libs/giflib
+   media-libs/libpng:0=
+   media-libs/phonon[qt4]
+   sys-libs/zlib
+   virtual/jpeg:0
+   >=x11-misc/shared-mime-info-0.60
+   acl? ( virtual/acl )
+   alsa? ( media-libs/alsa-lib )
+   !aqua? (
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXau
+   x11-libs/libXcursor
+   x11-libs/libXdmcp
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXft
+   x11-libs/libXpm
+   x11-libs/libXrender
+   x11-libs/libXScrnSaver
+   x11-libs/libXtst
+   !kernel_SunOS? (
+   || (
+   sys-libs/libutempter
+   >=sys-freebsd/freebsd-lib-9.0
+

[gentoo-commits] repo/gentoo:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

2015-10-15 Thread Michael Palimaka 
commit: 39c63862dd155941501a8196f7425c44fbff90ca
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct 15 19:01:33 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct 15 19:05:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c63862

kde-base/kdelibs: restore bundled FindQt4.cmake and apply Qt version selection 
patch

Removal of the bundled FindQt4 cmake module caused build failure in kdelibs
consumers relying on some of its quirks.

The patch applied to FindQt4.cmake ensures that for Gentoo builds, the correct
version of Qt will be used regardless of what /usr/bin/qmake points to.

Gentoo-bug: 562746
Gentoo-bug: 563124
Gentoo-bug: 563128
Gentoo-bug: 563160

Package-Manager: portage-2.2.20.1

 .../kdelibs/files/kdelibs-4.14.13-FindQt4.patch|  38 +++
 kde-base/kdelibs/kdelibs-4.14.13-r1.ebuild | 300 +
 2 files changed, 338 insertions(+)

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch 
b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
new file mode 100644
index 000..4d413b7
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
@@ -0,0 +1,38 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to 
qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 562746
+
+--- cmake/modules/FindQt4.cmake
 cmake/modules/FindQt4.cmake
+@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version 
"[HKEY_CURRENT_USER\\Software\\trollte
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
++if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  find_program(QT_QMAKE_EXECUTABLE NAMES qmake
++PATHS
++  /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++  /usr/bin
++  NO_DEFAULT_PATH
++DOC "The qmake executable for the Qt installation to use"
++  )
++else()
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+   
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 
qmake-qt4 qmake-mac PATHS
+   $ENV{QTDIR}/bin
+   DOC "The qmake executable for the Qt installation to use"
+ )
++endif()
+ 
+ IF (QT_QMAKE_EXECUTABLE)
+ 

diff --git a/kde-base/kdelibs/kdelibs-4.14.13-r1.ebuild 
b/kde-base/kdelibs/kdelibs-4.14.13-r1.ebuild
new file mode 100644
index 000..75e7306
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.14.13-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="3.3.1-r1"
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+EGIT_BRANCH="KDE/4.14"
+
+DESCRIPTION="KDE libraries needed by all KDE programs"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
+cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+   udisks? ( udev )
+   upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+   >=app-misc/strigi-0.7.7
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xsl-stylesheets
+   >=dev-libs/libattica-0.4.2
+   >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
+   dev-libs/libpcre[unicode]
+   dev-libs/libxml2
+   dev-libs/libxslt
+   media-libs/fontconfig
+   media-libs/freetype:2
+   media-libs/giflib
+   media-libs/libpng:0=
+   media-libs/phonon[qt4]
+   sys-libs/zlib
+   virtual/jpeg:0
+   >=x11-misc/shared-mime-info-0.60
+   acl? ( virtual/acl )
+   alsa? ( media-libs/alsa-lib )
+   !aqua? (
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXau
+   x11-libs/libXcursor
+   x11-libs/libXdmcp
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXft
+   x11-libs/libXpm
+   x11-libs/libXrender
+   x11-libs/libXScrnSaver
+   x11-libs/libXtst
+   !kernel_SunOS? (
+   || (
+   sys-libs/libutempter
+   >=sys-freebsd/freebsd-lib-9.0
+