Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 kde-frameworks/kdelibs4support/DEPENDS   |    4 ++--
 kde-frameworks/kdelibs4support/HISTORY   |    4 ++++
 kde-frameworks/kdelibs4support/PRE_BUILD |    9 ++++++++-
 python-pypi/setuptools_scm/DETAILS       |    8 ++++----
 python-pypi/setuptools_scm/HISTORY       |    3 +++
 5 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit 9dd41489eaaf5f638bce67fc83d975e98023f5b7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdelibs4support - make obsolete kdesignerplugin optional

commit 4e41c4957841bd7587e85a53fbf4ee19ebd3d95f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    setuptools_scm: => 2.1.0

diff --git a/kde-frameworks/kdelibs4support/DEPENDS 
b/kde-frameworks/kdelibs4support/DEPENDS
index 7f4318b..1669ef5 100755
--- a/kde-frameworks/kdelibs4support/DEPENDS
+++ b/kde-frameworks/kdelibs4support/DEPENDS
@@ -7,7 +7,6 @@ depends kcoreaddons &&
 depends kcrash   &&
 depends kded     &&
 depends kdbusaddons &&
-depends kdesignerplugin &&
 depends kdoctools  &&
 depends kemoticons &&
 depends kglobalaccel &&
@@ -25,4 +24,5 @@ depends kunitconversion &&
 depends kwidgetsaddons &&
 depends kwindowsystem  &&
 depends kxmlgui   &&
-optional_depends SSL '' '' 'secure communications + https'
+optional_depends SSL '' '' 'secure communications + https' &&
+optional_depends kdesignerplugin '' '' 'obsolete plugins for qtdesinger'
diff --git a/kde-frameworks/kdelibs4support/HISTORY 
b/kde-frameworks/kdelibs4support/HISTORY
index f0680f2..f894209 100644
--- a/kde-frameworks/kdelibs4support/HISTORY
+++ b/kde-frameworks/kdelibs4support/HISTORY
@@ -1,3 +1,7 @@
+2018-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS PRE_BUILD: make kdesignerplugin option
+         it is obsolete and drags in extra dependencies
+
 2018-06-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.47.0
 
diff --git a/kde-frameworks/kdelibs4support/PRE_BUILD 
b/kde-frameworks/kdelibs4support/PRE_BUILD
index 0eaa1b1..60d1cc8 100755
--- a/kde-frameworks/kdelibs4support/PRE_BUILD
+++ b/kde-frameworks/kdelibs4support/PRE_BUILD
@@ -1,3 +1,10 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-sed -i '/FindGettext.cmake/D' cmake/modules/CMakeLists.txt
+sed -i '/FindGettext.cmake/D' cmake/modules/CMakeLists.txt &&
+# designerplugin is obsolete
+if ! is_depends_enabled $SPELL kdesignerplugin;then
+sed -i '/KF5DesignerPlugin/D' cmake/modules/KDE4Macros.cmake \
+       CMakeLists.txt \
+       KF5KDELibs4SupportConfig.cmake.in &&
+sed -i '/kf5designerplugin_add_plugin/,/\/designer/D'  src/CMakeLists.txt
+fi
diff --git a/python-pypi/setuptools_scm/DETAILS 
b/python-pypi/setuptools_scm/DETAILS
index 1be0f73..57d85e6 100755
--- a/python-pypi/setuptools_scm/DETAILS
+++ b/python-pypi/setuptools_scm/DETAILS
@@ -1,9 +1,9 @@
            SPELL=setuptools_scm
-         VERSION=1.15.6
-              
VX=03/6d/aafdd01edd227ee879b691455bf19895091872af7e48192bea1758c82032
-     
SOURCE_HASH=sha512:ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
+         VERSION=2.1.0
+              
VX=e5/62/f9e1ac314464eb5945c97542acb6bf6f3381dfa5d7a658de7730c36f31a1
+     
SOURCE_HASH=sha512:69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=https://pypi.python.org/packages/$VX/$SOURCE
+   SOURCE_URL[0]=https://files.pythonhosted.org/packages/$VX/$SOURCE
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=https://github.com/pypa/setuptools_scm
       LICENSE[0]=MIT
diff --git a/python-pypi/setuptools_scm/HISTORY 
b/python-pypi/setuptools_scm/HISTORY
index 521202b..be0e1d1 100644
--- a/python-pypi/setuptools_scm/HISTORY
+++ b/python-pypi/setuptools_scm/HISTORY
@@ -1,3 +1,6 @@
+2018-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.1.0
+
 2017-09-29 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.15.6