commit: bb995c3a59804c89e6376389a027076eacda9d60
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sun Jul 17 09:53:02 2016 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 09:53:02 2016 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=bb995c3a
repoman fixes
.../deveel-irony-1.0.0_p20150328.ebuild | 2 +-
.../deveel-math-1.5.66-r201512290.ebuild | 7 +-
.../deveeldb-2.0_pre_alpha_p20160101.ebuild | 5 +-
dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild | 4 +-
.../eto-parse/eto-parse-1.4.0-r20150907.ebuild | 2 +-
.../irony-framework-1.0.0_p20131212-r1.ebuild | 2 +-
.../newtonsoft-json/newtonsoft-json-6.0.8.ebuild | 4 +-
.../newtonsoft-json-7.0.1_p20150831.ebuild | 4 +-
.../newtonsoft-json-8.0.1_p20151229.ebuild | 4 +-
dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild | 84 ----------------------
.../nunit/nunit-3.0.0_beta3-r201508190.ebuild | 7 +-
11 files changed, 22 insertions(+), 103 deletions(-)
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 fe96a2c..039bc76 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
@@ -140,7 +140,7 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
- test? ( dev-dotnet/nunit:2[nupkg] )
+ test? ( dev-util/nunit:2[nupkg] )
virtual/pkgconfig
"
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 a8d2cb6..27ac69a 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
@@ -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 versionator dotnet nupkg
@@ -27,7 +27,7 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
- test? ( dev-dotnet/nunit:2[nupkg] )
+ test? ( dev-util/nunit:2[nupkg] )
virtual/pkgconfig
"
@@ -87,6 +87,7 @@ src_prepare() {
enuget_restore "${METAFILETOBUILD}"
patch_nuspec_file "${S}/${NUSPEC_FILE_NAME}"
+ default
}
src_configure() {
diff --git a/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild
b/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild
index 670e784..2f201e2 100644
--- a/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild
+++ b/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -45,7 +45,7 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
- test? ( dev-dotnet/nunit:2[nupkg] )
+ test? ( dev-util/nunit:2[nupkg] )
dev-dotnet/deveel-irony[nupkg]
dev-dotnet/deveel-math[nupkg]
dev-dotnet/dryioc[nupkg]
@@ -138,6 +138,7 @@ src_prepare() {
cp "${FILESDIR}/${NUSPEC_FILE_NAME}" "${S}/${NUSPEC_FILE_NAME}" || die
patch_nuspec_file "${S}/${NUSPEC_FILE_NAME}"
+ default
}
src_configure() {
diff --git a/dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild
b/dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild
index 000c688..de3a4b9 100644
--- a/dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild
+++ b/dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
- test? ( dev-dotnet/nunit:2[nupkg] )
+ test? ( dev-util/nunit:2[nupkg] )
virtual/pkgconfig
"
diff --git a/dev-dotnet/eto-parse/eto-parse-1.4.0-r20150907.ebuild
b/dev-dotnet/eto-parse/eto-parse-1.4.0-r20150907.ebuild
index a924ba3..ff72670 100644
--- a/dev-dotnet/eto-parse/eto-parse-1.4.0-r20150907.ebuild
+++ b/dev-dotnet/eto-parse/eto-parse-1.4.0-r20150907.ebuild
@@ -34,7 +34,7 @@ IUSE="developer nupkg debug"
COMMON_DEPENDENCIES=">=dev-lang/mono-4.2"
DEPEND="${COMMON_DEPENDENCIES}
"
-# test? ( >=dev-dotnet/nunit-2.6.4-r201501110:2[nupkg] )
+# test? ( >=dev-util/nunit-2.6.4-r201501110:2[nupkg] )
RDEPEND="${COMMON_DEPENDENCIES}
"
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 923eb12..94f0dc0 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
@@ -139,7 +139,7 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
- test? ( dev-dotnet/nunit:2[nupkg] )
+ test? ( dev-util/nunit:2[nupkg] )
virtual/pkgconfig
"
diff --git a/dev-dotnet/newtonsoft-json/newtonsoft-json-6.0.8.ebuild
b/dev-dotnet/newtonsoft-json/newtonsoft-json-6.0.8.ebuild
index da5210b..d80e180 100644
--- a/dev-dotnet/newtonsoft-json/newtonsoft-json-6.0.8.ebuild
+++ b/dev-dotnet/newtonsoft-json/newtonsoft-json-6.0.8.ebuild
@@ -30,12 +30,12 @@ DESCRIPTION="Json.NET is a popular high-performance JSON
framework for .NET"
LICENSE="MIT"
LICENSE_URL="https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md";
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )"
RDEPEND="${COMMON_DEPENDENCIES}
"
DEPEND="${COMMON_DEPENDENCIES}
- >=dev-dotnet/nunit-2.6.4-r201501110:2[nupkg]
+ dev-util/nunit:2[nupkg]
"
METAFILETOBUILD=Src/Newtonsoft.Json.sln
diff --git a/dev-dotnet/newtonsoft-json/newtonsoft-json-7.0.1_p20150831.ebuild
b/dev-dotnet/newtonsoft-json/newtonsoft-json-7.0.1_p20150831.ebuild
index f0b7fc2..3cd3e40 100644
--- a/dev-dotnet/newtonsoft-json/newtonsoft-json-7.0.1_p20150831.ebuild
+++ b/dev-dotnet/newtonsoft-json/newtonsoft-json-7.0.1_p20150831.ebuild
@@ -30,12 +30,12 @@ DESCRIPTION="Json.NET is a popular high-performance JSON
framework for .NET"
LICENSE="MIT"
LICENSE_URL="https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md";
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )"
RDEPEND="${COMMON_DEPENDENCIES}
"
DEPEND="${COMMON_DEPENDENCIES}
- >=dev-dotnet/nunit-2.6.4-r201501110:2[nupkg]
+ dev-util/nunit:2[nupkg]
"
METAFILETOBUILD=Src/Newtonsoft.Json.sln
diff --git a/dev-dotnet/newtonsoft-json/newtonsoft-json-8.0.1_p20151229.ebuild
b/dev-dotnet/newtonsoft-json/newtonsoft-json-8.0.1_p20151229.ebuild
index ff73ba5..d247d62 100644
--- a/dev-dotnet/newtonsoft-json/newtonsoft-json-8.0.1_p20151229.ebuild
+++ b/dev-dotnet/newtonsoft-json/newtonsoft-json-8.0.1_p20151229.ebuild
@@ -30,12 +30,12 @@ DESCRIPTION="Json.NET is a popular high-performance JSON
framework for .NET"
LICENSE="MIT"
LICENSE_URL="https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md";
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )"
RDEPEND="${COMMON_DEPENDENCIES}
"
DEPEND="${COMMON_DEPENDENCIES}
- >=dev-dotnet/nunit-2.6.4-r201501110:2[nupkg]
+ dev-util/nunit:2[nupkg]
"
METAFILETOBUILD=Src/Newtonsoft.Json.sln
diff --git a/dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild
b/dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild
deleted file mode 100644
index 3d444ae..0000000
--- a/dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit mono-env nuget dotnet
-
-NAME="nunitv2"
-HOMEPAGE="https://github.com/nunit/${NAME}";
-
-EGIT_COMMIT="1b549f4f8b067518c7b54a5b263679adb83ccda4"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${PF}.zip"
-S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
-
-SLOT="2" # NUnit V2 IS NO LONGER MAINTAINED OR UPDATED.
-
-DESCRIPTION="NUnit test suite for mono applications"
-LICENSE="NUnit-License" # http://nunit.org/nuget/license.html
-KEYWORDS="~amd64 ~ppc ~x86"
-#USE_DOTNET="net20 net40 net45"
-USE_DOTNET="net45"
-IUSE="net45 developer debug gac nupkg doc"
-
-RDEPEND=">=dev-lang/mono-4.0.2.5
- dev-dotnet/nant[nupkg]
-"
-DEPEND="${RDEPEND}
-"
-
-S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
-FILE_TO_BUILD=nunit.sln
-METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
-
-src_prepare() {
- chmod -R +rw "${S}" || die
- enuget_restore "${METAFILETOBUILD}"
-}
-
-src_compile() {
- exbuild "${METAFILETOBUILD}"
- enuspec "${FILESDIR}/${PN}-${PV}.nuspec"
- # PN = Package name, for example vim.
- # PV = Package version (excluding revision, if any), for example 6.3.
-}
-
-src_install() {
- if use debug; then
- DIR="Debug"
- else
- DIR="Release"
- fi
-
- SLOTTEDDIR="/usr/share/nunit-${SLOT}/"
- insinto "${SLOTTEDDIR}"
- doins bin/${DIR}/*.{config,dll,exe}
- # install: cannot stat 'bin/Release/*.mdb': No such file or directory
- if use developer; then
- doins bin/${DIR}/*.mdb
- fi
-
-# into /usr
-# dobin ${FILESDIR}/nunit-console
- make_wrapper nunit264 "mono ${SLOTTEDDIR}/nunit-console.exe"
-
- if use gac; then
- if use debug; then
- DIR="Debug"
- else
- DIR="Release"
- fi
-
- egacinstall "${S}/bin/${DIR}/lib/nunit-console-runner.dll"
- fi
-
- if use doc; then
-# dodoc ${WORKDIR}/doc/*.txt
-# dohtml ${WORKDIR}/doc/*.html
-# insinto /usr/share/${P}/samples
-# doins -r ${WORKDIR}/samples/*
- doins license.txt
- fi
-
- enupkg "${WORKDIR}/NUnit.${PV}.nupkg"
-}
diff --git a/dev-dotnet/nunit/nunit-3.0.0_beta3-r201508190.ebuild
b/dev-dotnet/nunit/nunit-3.0.0_beta3-r201508190.ebuild
index a62b5f4..437759c 100644
--- a/dev-dotnet/nunit/nunit-3.0.0_beta3-r201508190.ebuild
+++ b/dev-dotnet/nunit/nunit-3.0.0_beta3-r201508190.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit mono-env nuget dotnet
NAME="nunit"
@@ -22,7 +22,7 @@ USE_DOTNET="net45"
IUSE="net45 developer debug nupkg doc"
RDEPEND=">=dev-lang/mono-4.0.2.5
- dev-dotnet/nant[nupkg]
+ dev-util/nant[nupkg]
"
DEPEND="${RDEPEND}
"
@@ -37,6 +37,7 @@ src_prepare() {
epatch "${FILESDIR}/removing-tests-from-nproj.patch"
epatch "${FILESDIR}/removing-2.0-compatibiility.patch"
enuget_restore "${METAFILETOBUILD}"
+ default
}
src_compile() {
