[gentoo-commits] proj/kde:master commit in: net-libs/libmediawiki/, net-libs/libmediawiki/files/

[Michael Palimaka]

commit:     3c708c76bf8180193d9172f13e31d90cd5b2b68b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 13:54:02 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 13:54:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3c708c76

net-libs/libmediawiki: sync with main tree

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../libmediawiki-5.0.0_pre20170128-tests-optional.patch   | 15 +++++++++++++++
 net-libs/libmediawiki/libmediawiki-9999.ebuild            | 13 ++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch b/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch
new file mode 100644
index 0000000000..7b910e028a
--- /dev/null
+++ b/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2017-05-20 11:13:08.095098473 +0200
++++ b/CMakeLists.txt	2017-05-20 11:18:00.993712729 +0200
+@@ -45,8 +45,10 @@
+ 
+ # Subdirectories
+ add_subdirectory(src)
+-add_subdirectory(autotests)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(autotests)
++    add_subdirectory(tests)
++endif()
+ 
+ # Create a Config.cmake and a ConfigVersion.cmake file and install them
+ set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5MediaWiki")

diff --git a/net-libs/libmediawiki/libmediawiki-9999.ebuild b/net-libs/libmediawiki/libmediawiki-9999.ebuild
index 0994f724f2..99a99e5570 100644
--- a/net-libs/libmediawiki/libmediawiki-9999.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-9999.ebuild
@@ -5,17 +5,10 @@ EAPI=6
 
 inherit kde5
 
-DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
+DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org"
 HOMEPAGE="https://www.digikam.org/"
 
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	MY_PV="${PV/_/-}"
-	MY_P="digikam-${MY_PV}"
-	SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
-	S=${WORKDIR}/${MY_P}/extra/${PN}
-fi
-
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE=""
 
@@ -26,3 +19,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!net-libs/libmediawiki:4
 "
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.0_pre20170128-tests-optional.patch" )