From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 17 Feb 2020 01:16:38 +0000
Subject: gentoo resync : 17.02.2020

---
 kde-apps/umbrello/Manifest                   |  4 +-
 kde-apps/umbrello/metadata.xml               |  3 ++
 kde-apps/umbrello/umbrello-19.12.2-r1.ebuild | 64 ++++++++++++++++++++++++++++
 kde-apps/umbrello/umbrello-19.12.2.ebuild    | 59 -------------------------
 4 files changed, 69 insertions(+), 61 deletions(-)
 create mode 100644 kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
 delete mode 100644 kde-apps/umbrello/umbrello-19.12.2.ebuild

(limited to 'kde-apps/umbrello')

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 23a79340def2..dd81be511fcc 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-19.08.3.tar.xz 3703784 BLAKE2B e992ef076f96da5599fe4315c4b6d8dc948485bf0bd2b14878e481c49fa4fe76087606f58268503dc401e817047d60ee52c27fa90749e28767bf7c4af70b4565 SHA512 1db25788a60e2a639c649a4d01809751b85a122426bdaedbebf6e6cce539b2b0f37893a8a61675df81517d7fe3e57a59377e49fd11e7ceebea5980372e284c9a
 DIST umbrello-19.12.2.tar.xz 3794060 BLAKE2B 831f7a7da672d70c3cf326d588d42e6df028e4c096e4b7be1df89f99e535c56ae117b4a5cbb5cd5719a5273d369092101d1394d0ac629d24e1a35a18fac7025a SHA512 85f3fda1d1f075aaf747265e377fd064e26ffb813fb92ec9157dfebfc5e3ba0e27f28ad1a879083db14f49908d6af688c747b24572705778538adab74d25fde3
 EBUILD umbrello-19.08.3.ebuild 1514 BLAKE2B a5eea2db0fe2cde1895fa17a43dd1af3c246e10b429bf32efc2be1e6fbb721f9438bfc7992bdb3a7bf3584e7dba6abac8009ba7b5981644522b60f1b2d864d82 SHA512 72074ce2dc5f92ea7108f2518882a131c29c400f8c799cef577cc956fea01933d39ac0c16594b7fb069cb8fabe222f1b0db38fe9ed8c854df16ef5f9057c4139
-EBUILD umbrello-19.12.2.ebuild 1522 BLAKE2B 8e5042930a28e6e737cf29002e11ef59a1235d63b66d7b93373ca07d114ecb8b75e9e3b83b56f1ca07dc1ec248e2b5094f0886fe388a0b66a112ee60863d5a43 SHA512 0ab6ea8e34fed4a6f87a4c13ce95668576ba23c8aafcf8d85d432374a4600bd4335e4c1b00bde014de91fa944c9b53f734e25e207efd1cecd8a6817b83e0415c
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD umbrello-19.12.2-r1.ebuild 1618 BLAKE2B 51f52a9a4478cada78d9966501aa4462f0e2f2f266a3aef4f8e7ad292d63fd9386b9102d44fd0aca4d69716e33af9325c9c65c55e42b5f06e2e35749b86bd812 SHA512 576d8c46f9c298915cd3f446199d4ef9e4814cc9ea696e8d6345e326aae6c71c353e7298d1deed196592d83740bfa58bca6effed1c50fd46c4948a419a73a9bb
+MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/metadata.xml b/kde-apps/umbrello/metadata.xml
index 2fdbf33d963d..c81c6f761d85 100644
--- a/kde-apps/umbrello/metadata.xml
+++ b/kde-apps/umbrello/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="php">Enable PHP import support using <pkg>dev-util/kdevelop</pkg> and <pkg>dev-util/kdevelop-pg-qt</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild b/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
new file mode 100644
index 000000000000..ee8fa5a72c4c
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
+https://umbrello.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="php"
+
+RDEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	php? (
+		dev-util/kdevelop:5=
+		dev-util/kdevelop-pg-qt
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KF5=ON
+		-DBUILD_PHP_IMPORT=$(usex php)
+		-DBUILD_unittests=$(usex test)
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
+
+	ecm_src_configure
+}
diff --git a/kde-apps/umbrello/umbrello-19.12.2.ebuild b/kde-apps/umbrello/umbrello-19.12.2.ebuild
deleted file mode 100644
index 2d66709a4099..000000000000
--- a/kde-apps/umbrello/umbrello-19.12.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KF5=ON
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
-
-	ecm_src_configure
-}
-- 
cgit v1.2.3