commit: 1e7571f7795f972011adb7924675afccdd6c8964 Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Fri Aug 19 15:02:05 2016 +0000 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> CommitDate: Fri Aug 19 15:02:05 2016 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=1e7571f7
repoman fixes dev-dotnet/NLog/NLog-4.1.3_pre-r201510280.ebuild | 2 +- .../Open-NAT/Open-NAT-1.0.0-r201510290.ebuild | 2 +- .../deveel-irony-1.0.0_p20150328.ebuild | 4 +-- .../deveel-math-1.5.66-r201512290.ebuild | 2 +- .../dryioc/dryioc-2.1.0_p201512110-r1.ebuild | 2 +- .../eto-parse/eto-parse-1.4.0_p20150907.ebuild | 3 +- .../icsharpcodetexteditor-3.2.2-r20150630.ebuild | 2 +- dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild | 2 +- .../irony-framework-1.0.0_p20131212-r1.ebuild | 2 +- dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild | 2 +- dev-dotnet/notify-sharp/notify-sharp-0.4.1.ebuild | 8 ++--- dev-dotnet/notify-sharp/notify-sharp-3.0.3.ebuild | 8 ++--- .../sharpziplib-0.86.0-r20150714.ebuild | 2 +- .../x-pagedlist-1.24.0.23549-r201512120.ebuild | 2 +- .../mono-packaging-tools-0.1.2_p201608183.ebuild | 2 +- dev-util/nant/nant-0.93.5019_p201511150-r0.ebuild | 2 +- dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild | 2 +- dev-util/nunit/nunit-3.0.1-r1.ebuild | 2 +- eclass/nuget.eclass | 35 +++++++++++----------- media-sound/banshee/banshee-2.6.1-r1.ebuild | 4 +-- 20 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dev-dotnet/NLog/NLog-4.1.3_pre-r201510280.ebuild b/dev-dotnet/NLog/NLog-4.1.3_pre-r201510280.ebuild index 5a7fb55..bec9dec 100644 --- a/dev-dotnet/NLog/NLog-4.1.3_pre-r201510280.ebuild +++ b/dev-dotnet/NLog/NLog-4.1.3_pre-r201510280.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit mono-env dotnet nupkg gac +inherit mono-env gac nupkg NAME="NLog" HOMEPAGE="https://github.com/ArsenShnurkov/${NAME}"; diff --git a/dev-dotnet/Open-NAT/Open-NAT-1.0.0-r201510290.ebuild b/dev-dotnet/Open-NAT/Open-NAT-1.0.0-r201510290.ebuild index 6a233b1..ef91da6 100644 --- a/dev-dotnet/Open-NAT/Open-NAT-1.0.0-r201510290.ebuild +++ b/dev-dotnet/Open-NAT/Open-NAT-1.0.0-r201510290.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit dotnet nupkg gac +inherit gac nupkg HOMEPAGE="https://lontivero.github.io/Open.NAT"; DESCRIPTION="Class library to use port forwarding in NAT devices with UPNP and/or PMP" diff --git a/dev-dotnet/deveel-irony/deveel-irony-1.0.0_p20150328.ebuild b/dev-dotnet/deveel-irony/deveel-irony-1.0.0_p20150328.ebuild index e5b9e81..77326cb 100644 --- a/dev-dotnet/deveel-irony/deveel-irony-1.0.0_p20150328.ebuild +++ b/dev-dotnet/deveel-irony/deveel-irony-1.0.0_p20150328.ebuild @@ -11,12 +11,12 @@ EAPI=6 # nupkg = create .nupkg file from .nuspec # gac = install into gac # pkg-config = register in pkg-config database -IUSE="net45 debug +developer test +nupkg +gac +pkg-config" USE_DOTNET="net45" +IUSE="net45 debug +developer test +nupkg +gac +pkg-config" KEYWORDS="~amd64 ~x86" -inherit versionator dotnet nupkg gac +inherit versionator gac nupkg HOMEPAGE=https://github.com/deveel/irony NAME=irony diff --git a/dev-dotnet/deveel-math/deveel-math-1.5.66-r201512290.ebuild b/dev-dotnet/deveel-math/deveel-math-1.5.66-r201512290.ebuild index c168cf9..17a301c 100644 --- a/dev-dotnet/deveel-math/deveel-math-1.5.66-r201512290.ebuild +++ b/dev-dotnet/deveel-math/deveel-math-1.5.66-r201512290.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit versionator dotnet nupkg gac +inherit versionator gac nupkg HOMEPAGE="https://github.com/deveel/deveel-math/"; DESCRIPTION="A library for handling big numbers and decimals under Mono/.NET frameworks" diff --git a/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild b/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild index 1acc73d..6349f52 100644 --- a/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild +++ b/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild @@ -9,7 +9,7 @@ EAPI=6 # 2015-11-17, portage-2.2.25 has been committed and it comes with complete EAPI 6 support # https://archives.gentoo.org/gentoo-dev/message/73cc181e4949b88abfbd68f8a8ca9254 -inherit versionator vcs-snapshot dotnet gac nupkg +inherit versionator vcs-snapshot gac nupkg HOMEPAGE="https://bitbucket.org/dadhi/dryioc"; DESCRIPTION="fast, small, full-featured IoC Container for .NET" diff --git a/dev-dotnet/eto-parse/eto-parse-1.4.0_p20150907.ebuild b/dev-dotnet/eto-parse/eto-parse-1.4.0_p20150907.ebuild index 743beff..0484cf7 100644 --- a/dev-dotnet/eto-parse/eto-parse-1.4.0_p20150907.ebuild +++ b/dev-dotnet/eto-parse/eto-parse-1.4.0_p20150907.ebuild @@ -5,7 +5,7 @@ EAPI=6 USE_DOTNET="net45" -inherit mono-env dotnet gac nupkg +inherit mono-env gac nupkg IUSE="${USE_DOTNET} developer nupkg debug" @@ -26,7 +26,6 @@ KEYWORDS="~amd64 ~x86" # notes on testing, from https://devmanual.gentoo.org/ebuild-writing/functions/src_test/index.html # FEATURES+="test" - # there is no "test" in IUSE, because test project and solution are not build # there is no "gac" in IUSE, because utilities for patching are not ready # "Failure adding assembly Eto.Parse/bin/Release/net40/Eto.Parse.dll to the cache: Attempt to install an assembly without a strong name" diff --git a/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.ebuild b/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.ebuild index b312ed3..54b95e4 100644 --- a/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.ebuild +++ b/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit eutils nuget dotnet gac +inherit eutils gac nupkg DESCRIPTION="ICSharpCode.TextEditor library" LICENSE="MIT" diff --git a/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild index a4d62ca..e133ae6 100644 --- a/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild +++ b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild @@ -29,7 +29,7 @@ IUSE="+net45" USE_DOTNET="net45" RDEPEND=">=dev-lang/mono-2 - dev-libs/glib" + dev-libs/glib:*" DEPEND="${RDEPEND} !dev-dotnet/ikvm-bin dev-util/nant diff --git a/dev-dotnet/irony-framework/irony-framework-1.0.0_p20131212-r1.ebuild b/dev-dotnet/irony-framework/irony-framework-1.0.0_p20131212-r1.ebuild index a2b566d..db9542e 100644 --- a/dev-dotnet/irony-framework/irony-framework-1.0.0_p20131212-r1.ebuild +++ b/dev-dotnet/irony-framework/irony-framework-1.0.0_p20131212-r1.ebuild @@ -16,7 +16,7 @@ USE_DOTNET="net45" KEYWORDS="~amd64 ~x86" -inherit versionator vcs-snapshot dotnet nupkg gac +inherit versionator vcs-snapshot gac nupkg NAME=irony EHG_REVISION=09918247d378a0e3deedae2af563fa5f402530f9 diff --git a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild index fe56488..95851c5 100644 --- a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild +++ b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild @@ -10,7 +10,7 @@ USE_DOTNET="net45" EBUILD_FRAMEWORK="4.5" IUSE="${USE_DOTNET} +gac +nupkg" -inherit nuget nupkg +inherit nupkg DESCRIPTION="A C# PInvoke wrapper library for LibGit2 C library" diff --git a/dev-dotnet/notify-sharp/notify-sharp-0.4.1.ebuild b/dev-dotnet/notify-sharp/notify-sharp-0.4.1.ebuild index 441e1fe..260b380 100644 --- a/dev-dotnet/notify-sharp/notify-sharp-0.4.1.ebuild +++ b/dev-dotnet/notify-sharp/notify-sharp-0.4.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils dotnet MY_P=${PN}-${PV#*_pre} @@ -19,8 +19,8 @@ IUSE="doc" RDEPEND=">=dev-lang/mono-4.0.2.5 >=dev-dotnet/gtk-sharp-2.12.21:2 - >=dev-dotnet/dbus-sharp-0.7 - >=dev-dotnet/dbus-sharp-glib-0.5 + >=dev-dotnet/dbus-sharp-0.7:* + >=dev-dotnet/dbus-sharp-glib-0.5:* >=x11-libs/libnotify-0.4.5" DEPEND="${RDEPEND}" diff --git a/dev-dotnet/notify-sharp/notify-sharp-3.0.3.ebuild b/dev-dotnet/notify-sharp/notify-sharp-3.0.3.ebuild index 441e1fe..260b380 100644 --- a/dev-dotnet/notify-sharp/notify-sharp-3.0.3.ebuild +++ b/dev-dotnet/notify-sharp/notify-sharp-3.0.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils dotnet MY_P=${PN}-${PV#*_pre} @@ -19,8 +19,8 @@ IUSE="doc" RDEPEND=">=dev-lang/mono-4.0.2.5 >=dev-dotnet/gtk-sharp-2.12.21:2 - >=dev-dotnet/dbus-sharp-0.7 - >=dev-dotnet/dbus-sharp-glib-0.5 + >=dev-dotnet/dbus-sharp-0.7:* + >=dev-dotnet/dbus-sharp-glib-0.5:* >=x11-libs/libnotify-0.4.5" DEPEND="${RDEPEND}" diff --git a/dev-dotnet/sharpziplib/sharpziplib-0.86.0-r20150714.ebuild b/dev-dotnet/sharpziplib/sharpziplib-0.86.0-r20150714.ebuild index e50e229..537ea5c 100644 --- a/dev-dotnet/sharpziplib/sharpziplib-0.86.0-r20150714.ebuild +++ b/dev-dotnet/sharpziplib/sharpziplib-0.86.0-r20150714.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit mono-env nuget dotnet gac +inherit mono-env gac nupkg NAME="SharpZipLib" HOMEPAGE="https://github.com/icsharpcode/${NAME}"; diff --git a/dev-dotnet/x-pagedlist/x-pagedlist-1.24.0.23549-r201512120.ebuild b/dev-dotnet/x-pagedlist/x-pagedlist-1.24.0.23549-r201512120.ebuild index 1ea8e02..382af14 100644 --- a/dev-dotnet/x-pagedlist/x-pagedlist-1.24.0.23549-r201512120.ebuild +++ b/dev-dotnet/x-pagedlist/x-pagedlist-1.24.0.23549-r201512120.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit versionator dotnet nupkg gac +inherit versionator gac nupkg HOMEPAGE="https://github.com/kpi-ua/X.PagedList/"; DESCRIPTION="Nugget for easily paging through any IEnumerable/IQueryable in Asp.Net MVC" diff --git a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild index 7744e21..0d6dac2 100644 --- a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild +++ b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit mono-env nupkg dotnet +inherit mono-env nupkg NAME="mono-packaging-tools" HOMEPAGE="https://github.com/ArsenShnurkov/${NAME}"; diff --git a/dev-util/nant/nant-0.93.5019_p201511150-r0.ebuild b/dev-util/nant/nant-0.93.5019_p201511150-r0.ebuild index eb5ab2e..a91d38f 100644 --- a/dev-util/nant/nant-0.93.5019_p201511150-r0.ebuild +++ b/dev-util/nant/nant-0.93.5019_p201511150-r0.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit mono-env nuget dotnet +inherit mono-env nupkg HOMEPAGE="https://github.com/nant/${NAME}"; DESCRIPTION=".NET build tool" diff --git a/dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild b/dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild index 8e6d5c9..00dab1b 100644 --- a/dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild +++ b/dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit mono-env nuget dotnet gac +inherit mono-env gac nupkg NAME="nunitv2" HOMEPAGE="https://github.com/nunit/${NAME}"; diff --git a/dev-util/nunit/nunit-3.0.1-r1.ebuild b/dev-util/nunit/nunit-3.0.1-r1.ebuild index 69aed20..fcaa904 100644 --- a/dev-util/nunit/nunit-3.0.1-r1.ebuild +++ b/dev-util/nunit/nunit-3.0.1-r1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit mono-env nuget dotnet gac +inherit mono-env gac nupkg NAME="nunit" HOMEPAGE="https://github.com/nunit/${NAME}"; diff --git a/eclass/nuget.eclass b/eclass/nuget.eclass index c145dce..5137513 100644 --- a/eclass/nuget.eclass +++ b/eclass/nuget.eclass @@ -50,6 +50,24 @@ enuget_download_rogue_binary() { nuget install "$1" -Version "$2" -SolutionDirectory "${T}" -ConfigFile "${CONFIG_PATH}/${CONFIG_NAME}" -OutputDirectory "${S}/packages" -Verbosity detailed || die } +if [[ $PV == *_alpha* ]] ; then + NPV=${PVR/_alpha/-alpha} +else + if [[ $PV == *_beta* ]] ; then + NPV=${PVR/_beta/-beta} + else + if [[ $PV == *_pre* ]] ; then + NPV=${PVR/_pre/-pre} + else + if [[ $PV == *_p* ]] ; then + NPV=${PVR/_p/-p} + else + NPV=${PVR} + fi + fi + fi +fi + # @FUNCTION: nuget_src_unpack # @DESCRIPTION: Runs nuget # Here is usage example where nuget is alternative way: https://github.com/gentoo/dotnet/blob/master/dev-dotnet/fake @@ -60,23 +78,6 @@ nuget_src_unpack() { NPN=${PN/_/.} - if [[ $PV == *_alpha* ]] ; then - NPV=${PVR/_alpha/.} - else - if [[ $PV == *_beta* ]] ; then - NPV=${PVR/_beta/.} - else - if [[ $PV == *_pre* ]] ; then - NPV=${PVR/_pre/.} - else - if [[ $PV == *_p* ]] ; then - NPV=${PVR/_p/.} - else - NPV=${PVR} - fi - fi - fi - fi nuget install "${NPN}" -Version "${NPV}" -OutputDirectory "${P}" } diff --git a/media-sound/banshee/banshee-2.6.1-r1.ebuild b/media-sound/banshee/banshee-2.6.1-r1.ebuild index aef9b70..22b3f27 100644 --- a/media-sound/banshee/banshee-2.6.1-r1.ebuild +++ b/media-sound/banshee/banshee-2.6.1-r1.ebuild @@ -37,8 +37,8 @@ RDEPEND=" ) ) media-libs/musicbrainz:3 - dev-dotnet/dbus-sharp - dev-dotnet/dbus-sharp-glib + dev-dotnet/dbus-sharp:* + dev-dotnet/dbus-sharp-glib:* >=dev-dotnet/mono-addins-0.6.2[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3
