commit: 387761d3c9b28ca7d1b07016025a3b742c3c2408
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 19 14:50:02 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 14:50:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=387761d3
repoman warning about use removed
dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild | 5 +---
.../nunit/nunit-3.0.0_beta3-r201508190.ebuild | 3 ---
eclass/dotnet.eclass | 27 ++++++++++++++++++----
profiles/use.desc | 6 ++++-
4 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild
b/dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild
index be37514..3d444ae 100644
--- a/dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild
+++ b/dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild
@@ -15,15 +15,12 @@ S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
SLOT="2" # NUnit V2 IS NO LONGER MAINTAINED OR UPDATED.
DESCRIPTION="NUnit test suite for mono applications"
-LICENSE="BSD" # actually not, it is NUnit license -
http://nunit.org/nuget/license.html
+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"
-#USE="${USE} net45 " dev-dotnet/nunit/nunit-2.6.4-r201501110.ebuild: Ebuild
contains assignment to read-only variable on line: 23
-FRAMEWORK=4.5 # force it in another way
-
RDEPEND=">=dev-lang/mono-4.0.2.5
dev-dotnet/nant[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 d278773..a62b5f4 100644
--- a/dev-dotnet/nunit/nunit-3.0.0_beta3-r201508190.ebuild
+++ b/dev-dotnet/nunit/nunit-3.0.0_beta3-r201508190.ebuild
@@ -21,9 +21,6 @@ KEYWORDS="~amd64 ~ppc ~x86"
USE_DOTNET="net45"
IUSE="net45 developer debug nupkg doc"
-#USE="${USE} net45" # dev-dotnet/nunit/nunit-3.0.0_beta3-r201508190.ebuild:
Ebuild contains assignment to read-only variable on line: 23
-FRAMEWORK=4.5 # force it another way
-
RDEPEND=">=dev-lang/mono-4.0.2.5
dev-dotnet/nant[nupkg]
"
diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass
index 2bf9f72..85a1521 100644
--- a/eclass/dotnet.eclass
+++ b/eclass/dotnet.eclass
@@ -38,13 +38,16 @@ done
# @FUNCTION: dotnet_pkg_setup
# @DESCRIPTION: This function set FRAMEWORK
dotnet_pkg_setup() {
+ EBUILD_FRAMEWORK=""
for x in ${USE_DOTNET} ; do
+# elog "Cycle, start, x=""${x}"""
case ${x} in
- net45) if use net45; then F="4.5"; fi;;
- net40) if use net40; then F="4.0"; fi;;
- net35) if use net35; then F="3.5"; fi;;
- net20) if use net20; then F="2.0"; fi;;
+ net45) EBF="4.5"; if use net45; then F="${EBF}";fi;;
+ net40) EBF="4.0"; if use net40; then F="${EBF}";fi;;
+ net35) EBF="3.5"; if use net35; then F="${EBF}";fi;;
+ net20) EBF="2.0"; if use net20; then F="${EBF}";fi;;
esac
+# elog "Cycle, after switch, F=""${F}"", EBF=""${EBF}"""
if [[ -z ${FRAMEWORK} ]]; then
if [[ ${F} ]]; then
FRAMEWORK="${F}";
@@ -52,9 +55,23 @@ dotnet_pkg_setup() {
else
version_is_at_least "${F}" "${FRAMEWORK}" ||
FRAMEWORK="${F}"
fi
+ if [[ -z ${EBUILD_FRAMEWORK} ]]; then
+ if [[ ${EBF} ]]; then
+ EBUILD_FRAMEWORK="${EBF}";
+ fi
+ else
+ version_is_at_least "${EBF}" "${EBUILD_FRAMEWORK}" ||
EBUILD_FRAMEWORK="${EBF}"
+ fi
+# elog "Cycle, the end, FRAMEWORK=""${FRAMEWORK}"",
EBUILD_FRAMEWORK=""${EBUILD_FRAMEWORK}"" "
done
if [[ -z ${FRAMEWORK} ]]; then
- FRAMEWORK="4.0"
+ if [[ -z ${EBUILD_FRAMEWORK} ]]; then
+ FRAMEWORK="4.0"
+ elog "Ebuild doesn't contain USE_DOTNET="
+ else
+ FRAMEWORK="${EBUILD_FRAMEWORK}"
+ elog "User did not set any netNN use-flags in make.conf
or profile, .ebuild demands USE_DOTNET=""${USE_DOTNET}"""
+ fi
fi
einfo " -- USING .NET ${FRAMEWORK} FRAMEWORK -- "
}
diff --git a/profiles/use.desc b/profiles/use.desc
index fa38730..ca4817e 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -6,4 +6,8 @@ net35 - .NET 3.5 Framework
net40 - .NET 4.0 Framework
net45 - .NET 4.5 Framework
fake - F# Make build system
-nuget - Grab binary from nuget
\ No newline at end of file
+nuget - Grab binary from nuget
+gac - register library assemblies in the gac (where ebuild allows that)
+developer - create .mdb files
+debug - build Debug configuration instead of Release default
+
