From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5625F138247 for ; Mon, 20 Jan 2014 09:33:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 233B4E0F42; Mon, 20 Jan 2014 09:33:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0CB3E0F42 for ; Mon, 20 Jan 2014 09:33:40 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A65D133F7EB for ; Mon, 20 Jan 2014 09:33:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 62ED21871B for ; Mon, 20 Jan 2014 09:33:37 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1390210056.807e62387df5bc828fbf621868424a8fdccf979c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/libattica/, kde-frameworks/attica/ X-VCS-Repository: proj/kde X-VCS-Files: dev-libs/libattica/libattica-9999.ebuild kde-frameworks/attica/attica-9999.ebuild kde-frameworks/attica/metadata.xml X-VCS-Directories: dev-libs/libattica/ kde-frameworks/attica/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 807e62387df5bc828fbf621868424a8fdccf979c X-VCS-Branch: master Date: Mon, 20 Jan 2014 09:33:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1204e68c-5a8c-4094-85cb-a2ff793a2513 X-Archives-Hash: 1a92117020815c81119a963483ff91f5 commit: 807e62387df5bc828fbf621868424a8fdccf979c Author: Uwe L. Korn xhochy com> AuthorDate: Fri Jan 17 20:31:05 2014 +0000 Commit: Michael Palimaka gentoo 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 ) + ! + + + kde +