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 A285E198005 for ; Tue, 5 Mar 2013 10:26:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F310E060F; Tue, 5 Mar 2013 10:26:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A83D2E060D for ; Tue, 5 Mar 2013 10:26:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D53933DB18 for ; Tue, 5 Mar 2013 10:26:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0FD49E4073 for ; Tue, 5 Mar 2013 10:26:54 +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: <1362478804.7998fabe57edb02d77f9c9a5e3aba908366d3fae.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdesdk-misc/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild kde-base/kdesdk-misc/metadata.xml X-VCS-Directories: kde-base/kdesdk-misc/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 7998fabe57edb02d77f9c9a5e3aba908366d3fae X-VCS-Branch: master Date: Tue, 5 Mar 2013 10:26:54 +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: 221d1d1a-7ed8-4b73-b6e3-0ebb39805c82 X-Archives-Hash: 1ee41b7858221c8af741c525ad8baa79 commit: 7998fabe57edb02d77f9c9a5e3aba908366d3fae Author: Michael Palimaka gentoo org> AuthorDate: Tue Mar 5 10:20:04 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Mar 5 10:20:04 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7998fabe [kde-base/kdesdk-misc] Restore old poxml behaviour for 4.10. Package-Manager: portage-2.1.11.55 --- kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild | 24 +++++++++++++++++-- .../kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild | 22 ++++++++++++++++- kde-base/kdesdk-misc/metadata.xml | 3 ++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild index cfc6aef..1b5e95d 100644 --- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild +++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild @@ -5,8 +5,9 @@ EAPI=5 if [[ ${PV} == *9999 ]]; then - KMNAME="kde-dev-util" + KMNAME="kde-dev-utils" else + KMEXTRA="poxml/" KMNAME="kdesdk" KMMODULE="kde-dev-utils" fi @@ -15,10 +16,27 @@ inherit kde4-meta DESCRIPTION="KDE miscellaneous SDK tools" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug" +IUSE="debug extras" -KMEXTRA=" +KMEXTRA+=" ${KMMODULE}/kmtrace/ ${KMMODULE}/kpartloader/ ${KMMODULE}/kprofilemethod/ " + +DEPEND=" + extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) +" +RDEPEND="${DEPEND}" + +# java deps on anltr cant be properly explained to cmake deps +# needs to be run in one thread +MAKEOPTS+=" -j1" + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with extras Antlr2) + ) + + kde4-meta_src_configure +} diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild index 6fce21f..376fc4c 100644 --- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild +++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild @@ -7,6 +7,7 @@ EAPI=5 if [[ ${PV} == *9999 ]]; then KMNAME="kde-dev-utils" else + KMEXTRA="poxml/" KMNAME="kdesdk" KMMODULE="kde-dev-utils" fi @@ -15,10 +16,27 @@ inherit kde4-meta DESCRIPTION="KDE miscellaneous SDK tools" KEYWORDS="" -IUSE="debug" +IUSE="debug extras" -KMEXTRA=" +KMEXTRA+=" ${KMMODULE}/kmtrace/ ${KMMODULE}/kpartloader/ ${KMMODULE}/kprofilemethod/ " + +DEPEND=" + extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) +" +RDEPEND="${DEPEND}" + +# java deps on anltr cant be properly explained to cmake deps +# needs to be run in one thread +MAKEOPTS+=" -j1" + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with extras Antlr2) + ) + + kde4-meta_src_configure +} diff --git a/kde-base/kdesdk-misc/metadata.xml b/kde-base/kdesdk-misc/metadata.xml index a23f444..5941d59 100644 --- a/kde-base/kdesdk-misc/metadata.xml +++ b/kde-base/kdesdk-misc/metadata.xml @@ -2,4 +2,7 @@ kde + + Build po2xml and swappo tools +