[gentoo-commits] proj/kde:master commit in: dev-libs/libattica/, kde-frameworks/attica/

[gentoo-commits] proj/kde:master commit in: dev-libs/libattica/, kde-frameworks/attica/

[Michael Palimaka]

commit:     807e62387df5bc828fbf621868424a8fdccf979c
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Fri Jan 17 20:31:05 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 09:27:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=807e6238

[dev-libs/libattica] Move to kde-frameworks and build for Qt4+5 simultaneously.

Package-Manager: portage-2.2.7

---
 dev-libs/libattica/libattica-9999.ebuild           | 57 ++--------------------
 .../attica/attica-9999.ebuild                      | 45 ++++++++++++++---
 kde-frameworks/attica/metadata.xml                 |  5 ++
 3 files changed, 46 insertions(+), 61 deletions(-)

diff --git a/dev-libs/libattica/libattica-9999.ebuild b/dev-libs/libattica/libattica-9999.ebuild
index 6f88d98..4c0bbb4 100644
--- a/dev-libs/libattica/libattica-9999.ebuild
+++ b/dev-libs/libattica/libattica-9999.ebuild
@@ -4,61 +4,12 @@
 
 EAPI=5
 
-MY_P="${P#lib}"
-MY_PN="${PN#lib}"
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI=( "git://anongit.kde.org/attica" )
-	KEYWORDS=""
-	scm_eclass=git-r3
-else
-	SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="A library providing access to Open Collaboration Services"
+DESCRIPTION="A library providing access to Open Collaboration Services (dummy package)"
 HOMEPAGE="http://www.kde.org/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE=""
 SLOT="0"
+KEYWORDS=""
 IUSE="debug +qt4 qt5 test"
 
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? ( dev-qt/qtcore:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-"
-DEPEND="${RDEPEND}
-	qt5? (
-		dev-libs/extra-cmake-modules
-		dev-qt/qtconcurrent:5
-	)
-	test? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qttest:4
-		)
-		qt5? (
-			dev-qt/qttest:5
-			dev-qt/qtwidgets:5
-		)
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-[[ ${PV} != *9999 ]] && S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use test ATTICA_ENABLE_TESTS)
-	)
-	cmake-utils_src_configure
-}
+RDEPEND="kde-frameworks/attica[debug?,qt4?,qt5?,test?]"

diff --git a/dev-libs/libattica/libattica-9999.ebuild b/kde-frameworks/attica/attica-9999.ebuild
similarity index 56%
copy from dev-libs/libattica/libattica-9999.ebuild
copy to kde-frameworks/attica/attica-9999.ebuild
index 6f88d98..276be65 100644
--- a/dev-libs/libattica/libattica-9999.ebuild
+++ b/kde-frameworks/attica/attica-9999.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
-inherit cmake-utils ${scm_eclass}
+inherit cmake-utils ${scm_eclass} multibuild
 
 DESCRIPTION="A library providing access to Open Collaboration Services"
 HOMEPAGE="http://www.kde.org/"
@@ -25,14 +25,13 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 IUSE="debug +qt4 qt5 test"
 
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
 RDEPEND="
 	qt4? ( dev-qt/qtcore:4 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtnetwork:5
 	)
+	!<dev-libs/libattica-9999
 "
 DEPEND="${RDEPEND}
 	qt5? (
@@ -55,10 +54,40 @@ DOCS=( AUTHORS ChangeLog README )
 
 [[ ${PV} != *9999 ]] && S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
+
 src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use test ATTICA_ENABLE_TESTS)
-	)
-	cmake-utils_src_configure
+	myconfigure() {
+		local mycmakeargs=(
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+="-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON"
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+="-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=OFF"
+		fi
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
 }

diff --git a/kde-frameworks/attica/metadata.xml b/kde-frameworks/attica/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/kde-frameworks/attica/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>