From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 08FA213832E for ; Fri, 19 Aug 2016 16:12:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2420CE0AB3; Fri, 19 Aug 2016 16:12:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78ED7E0B0D for ; Fri, 19 Aug 2016 16:12:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48C083406AD for ; Fri, 19 Aug 2016 16:12:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B94072460 for ; Fri, 19 Aug 2016 16:12:19 +0000 (UTC) From: "Mikhail Pukhlikov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikhail Pukhlikov" Message-ID: <1471548303.1c0049ccaac716f6f988ce0cb65012ac6f119011.cynede@gentoo> Subject: [gentoo-commits] proj/dotnet:master commit in: eclass/ X-VCS-Repository: proj/dotnet X-VCS-Files: eclass/nuget.eclass eclass/nupkg.eclass X-VCS-Directories: eclass/ X-VCS-Committer: cynede X-VCS-Committer-Name: Mikhail Pukhlikov X-VCS-Revision: 1c0049ccaac716f6f988ce0cb65012ac6f119011 X-VCS-Branch: master Date: Fri, 19 Aug 2016 16:12:19 +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: 48eb5c8e-d6b2-41f8-bccf-2c57ab3a7eb9 X-Archives-Hash: 78c90e78b4ba0241085edf8735c1393b commit: 1c0049ccaac716f6f988ce0cb65012ac6f119011 Author: ArsenShnurkov gmail com> AuthorDate: Thu Aug 18 19:25:03 2016 +0000 Commit: Mikhail Pukhlikov gentoo org> CommitDate: Thu Aug 18 19:25:03 2016 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=1c0049cc add _p into NPV variable eclass/nuget.eclass | 22 +++++++++++++++++++--- eclass/nupkg.eclass | 16 ---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eclass/nuget.eclass b/eclass/nuget.eclass index 3fbb21c..5c59f05 100644 --- a/eclass/nuget.eclass +++ b/eclass/nuget.eclass @@ -11,10 +11,16 @@ inherit nupkg -IUSE+=" +nuget" +# @ECLASS_VARIABLE: NUGET_DEPEND +# @DESCRIPTION Set false to net depend on nuget +: ${NUGET_NO_DEPEND:=} -DEPEND+=" nuget? ( dev-dotnet/nuget )" -RDEPEND+=" nuget? ( dev-dotnet/nuget )" +if [[ -n ${NUGET_NO_DEPEND} ]]; then + IUSE+=" +nuget" + + DEPEND+=" nuget? ( dev-dotnet/nuget )" + RDEPEND+=" nuget? ( dev-dotnet/nuget )" +fi # @FUNCTION: enuget_download_rogue_binary # @DESCRIPTION: downloads a binary package from 3rd untrusted party repository @@ -50,6 +56,16 @@ enuget_download_rogue_binary() { # Src_compile does nothing and src_install just installs sources from nuget_src_unpack nuget_src_unpack() { default + + NPN=${PN/_/.} + + if [[ $PV == *_alpha* ]] || [[ $PV == *_beta* ]] || [[ $PV == *_pre* ]] || [[ $PV == *_p* ]] + then + NPV=${PVR/_/-} + else + NPV=${PVR} + fi + nuget install "${NPN}" -Version "${NPV}" -OutputDirectory "${P}" } diff --git a/eclass/nupkg.eclass b/eclass/nupkg.eclass index d50d65e..ccf3983 100644 --- a/eclass/nupkg.eclass +++ b/eclass/nupkg.eclass @@ -100,19 +100,3 @@ enupkg() { doins "$@" fi } - -# @ECLASS_VARIABLE: NUGET_DEPEND -# @DESCRIPTION Set false to net depend on nuget -: ${NUGET_NO_DEPEND:=} - -if [[ -n ${NUGET_NO_DEPEND} ]]; then - DEPEND+=" dev-dotnet/nuget" -fi - -NPN=${PN/_/.} -if [[ $PV == *_alpha* ]] || [[ $PV == *_beta* ]] || [[ $PV == *_pre* ]] -then - NPV=${PVR/_/-} -else - NPV=${PVR} -fi