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

[Michael Palimaka]

commit:     04811fd320ec1859d95872782585f1860149eb2a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar 30 10:33:54 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 18:19:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=04811fd3

kde-apps/cantor: Patch upstreamed

Package-Manager: portage-2.2.27

 kde-apps/cantor/cantor-16.04.49.9999.ebuild | 9 ---------
 kde-apps/cantor/cantor-9999.ebuild          | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/kde-apps/cantor/cantor-16.04.49.9999.ebuild 
b/kde-apps/cantor/cantor-16.04.49.9999.ebuild
index 3cdcedc..7f99167 100644
--- a/kde-apps/cantor/cantor-16.04.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.04.49.9999.ebuild
@@ -56,8 +56,6 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" )
-
 pkg_setup() {
        use python && python_setup
        kde5_pkg_setup
@@ -69,13 +67,6 @@ src_prepare() {
        # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
        sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
                -i src/backends/CMakeLists.txt || die
-
-       if ! use test ; then
-               sed -e "/add_subdirectory(test)/ s/^/#DONT/" \
-                       -i src/lib/CMakeLists.txt || die
-               sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
-                       -i src/backends/python3/CMakeLists.txt || die
-       fi
 }
 
 src_configure() {

diff --git a/kde-apps/cantor/cantor-9999.ebuild 
b/kde-apps/cantor/cantor-9999.ebuild
index 3cdcedc..7f99167 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -56,8 +56,6 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" )
-
 pkg_setup() {
        use python && python_setup
        kde5_pkg_setup
@@ -69,13 +67,6 @@ src_prepare() {
        # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
        sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
                -i src/backends/CMakeLists.txt || die
-
-       if ! use test ; then
-               sed -e "/add_subdirectory(test)/ s/^/#DONT/" \
-                       -i src/lib/CMakeLists.txt || die
-               sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
-                       -i src/backends/python3/CMakeLists.txt || die
-       fi
 }
 
 src_configure() {