commit: 647f512e27127cb1dae88507708da210e2bacb1a
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sun Nov 13 12:01:21 2016 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 12:01:21 2016 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=647f512e
update EGIT_COMMIT
dev-dotnet/nlog/files/NLog.mono4.sln.patch | 43 --------------
dev-dotnet/nlog/files/NLog.nuspec.patch | 11 ++--
dev-dotnet/nlog/files/NoStdLib-NoConfig.patch | 81 --------------------------
dev-dotnet/nlog/nlog-4.3.11_p2016110901.ebuild | 34 ++++-------
4 files changed, 16 insertions(+), 153 deletions(-)
diff --git a/dev-dotnet/nlog/files/NLog.mono4.sln.patch
b/dev-dotnet/nlog/files/NLog.mono4.sln.patch
deleted file mode 100644
index 035c6c9..0000000
--- a/dev-dotnet/nlog/files/NLog.mono4.sln.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/NLog.mono4.sln b/src/NLog.mono4.sln
-index 1a9e752..75786e4 100644
---- a/src/NLog.mono4.sln
-+++ b/src/NLog.mono4.sln
-@@ -16,38 +16,27 @@ EndProject
- Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
-- Default|Any CPU = Default|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {2D85AAFA-76B0-4271-8AA8-42BBD796FD39}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {2D85AAFA-76B0-4271-8AA8-42BBD796FD39}.Debug|Any CPU.Build.0 =
Debug|Any CPU
-- {2D85AAFA-76B0-4271-8AA8-42BBD796FD39}.Default|Any
CPU.ActiveCfg = Debug|Any CPU
-- {2D85AAFA-76B0-4271-8AA8-42BBD796FD39}.Default|Any CPU.Build.0
= Debug|Any CPU
- {2D85AAFA-76B0-4271-8AA8-42BBD796FD39}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {2D85AAFA-76B0-4271-8AA8-42BBD796FD39}.Release|Any CPU.Build.0
= Release|Any CPU
- {5CCB56C3-4A6E-4C11-960B-2877099F52CE}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {5CCB56C3-4A6E-4C11-960B-2877099F52CE}.Debug|Any CPU.Build.0 =
Debug|Any CPU
-- {5CCB56C3-4A6E-4C11-960B-2877099F52CE}.Default|Any
CPU.ActiveCfg = Debug|Any CPU
-- {5CCB56C3-4A6E-4C11-960B-2877099F52CE}.Default|Any CPU.Build.0
= Debug|Any CPU
- {5CCB56C3-4A6E-4C11-960B-2877099F52CE}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {5CCB56C3-4A6E-4C11-960B-2877099F52CE}.Release|Any CPU.Build.0
= Release|Any CPU
- {E7AB20BF-6920-442A-B876-CC05BC5CEC79}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {E7AB20BF-6920-442A-B876-CC05BC5CEC79}.Debug|Any CPU.Build.0 =
Debug|Any CPU
-- {E7AB20BF-6920-442A-B876-CC05BC5CEC79}.Default|Any
CPU.ActiveCfg = Debug|Any CPU
- {E7AB20BF-6920-442A-B876-CC05BC5CEC79}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {E7AB20BF-6920-442A-B876-CC05BC5CEC79}.Release|Any CPU.Build.0
= Release|Any CPU
- {F801A1F9-1024-4446-BF9E-A923137340B8}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {F801A1F9-1024-4446-BF9E-A923137340B8}.Debug|Any CPU.Build.0 =
Debug|Any CPU
-- {F801A1F9-1024-4446-BF9E-A923137340B8}.Default|Any
CPU.ActiveCfg = Debug|Any CPU
- {F801A1F9-1024-4446-BF9E-A923137340B8}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {F801A1F9-1024-4446-BF9E-A923137340B8}.Release|Any CPU.Build.0
= Release|Any CPU
- {FE0A3713-E9A8-41F0-89FA-C1126F8FB6A8}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
-- {FE0A3713-E9A8-41F0-89FA-C1126F8FB6A8}.Debug|Any CPU.Build.0 =
Debug|Any CPU
-- {FE0A3713-E9A8-41F0-89FA-C1126F8FB6A8}.Default|Any
CPU.ActiveCfg = Debug|Any CPU
-- {FE0A3713-E9A8-41F0-89FA-C1126F8FB6A8}.Default|Any CPU.Build.0
= Debug|Any CPU
- {FE0A3713-E9A8-41F0-89FA-C1126F8FB6A8}.Release|Any
CPU.ActiveCfg = Release|Any CPU
-- {FE0A3713-E9A8-41F0-89FA-C1126F8FB6A8}.Release|Any CPU.Build.0
= Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
diff --git a/dev-dotnet/nlog/files/NLog.nuspec.patch
b/dev-dotnet/nlog/files/NLog.nuspec.patch
index e812dbc..0b6387b 100644
--- a/dev-dotnet/nlog/files/NLog.nuspec.patch
+++ b/dev-dotnet/nlog/files/NLog.nuspec.patch
@@ -1,14 +1,11 @@
-diff --git a/src/NuGet/NLog/NLog.nuspec b/src/NuGet/NLog/NLog.nuspec
-index 273ed21..305451b 100644
--- a/src/NuGet/NLog/NLog.nuspec
+++ b/src/NuGet/NLog/NLog.nuspec
-@@ -17,4 +17,8 @@ For your main project also need to install "NLog
Configuration" package.</descri
+@@ -17,4 +17,8 @@
<licenseUrl>http://raw.github.com/NLog/NLog/master/LICENSE.txt</licenseUrl>
- <tags>logging, log, tracing, logfiles, NLog</tags>
+ <tags>logging log tracing logfiles NLog database eventlog email wcf</tags>
</metadata>
+ <files>
-+ <file src="build/bin/$configuration$/Mono 4.x/NLog.dll"
target="lib/net45" />
-+ <file src="build/bin/$configuration$/Mono 4.x/NLog.Extended.dll"
target="lib/net45" />
++ <file src="build/bin/$configuration$/$platform$/NLog.dll"
target="lib/net45" />
++ <file src="build/bin/$configuration$/$platform$/NLog.Extended.dll"
target="lib/net45" />
+ </files>
</package>
-\ No newline at end of file
diff --git a/dev-dotnet/nlog/files/NoStdLib-NoConfig.patch
b/dev-dotnet/nlog/files/NoStdLib-NoConfig.patch
deleted file mode 100644
index f9f55b6..0000000
--- a/dev-dotnet/nlog/files/NoStdLib-NoConfig.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/src/NLog.Extended/NLog.Extended.mono4.csproj
b/src/NLog.Extended/NLog.Extended.mono4.csproj
-index 80eac6b..4c8bf1b 100644
---- a/src/NLog.Extended/NLog.Extended.mono4.csproj
-+++ b/src/NLog.Extended/NLog.Extended.mono4.csproj
-@@ -8,8 +8,6 @@
- <Configuration Condition=" '$(Configuration)' == ''
">Debug</Configuration>
- <ErrorReport>prompt</ErrorReport>
- <FileAlignment>512</FileAlignment>
-- <NoStdLib>true</NoStdLib>
-- <NoConfig>true</NoConfig>
- <OutputType>Library</OutputType>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{F801A1F9-1024-4446-BF9E-A923137340B8}</ProjectGuid>
-diff --git a/src/NLog/NLog.mono4.csproj b/src/NLog/NLog.mono4.csproj
-index cf48986..d0a07f1 100644
---- a/src/NLog/NLog.mono4.csproj
-+++ b/src/NLog/NLog.mono4.csproj
-@@ -8,8 +8,6 @@
- <Configuration Condition=" '$(Configuration)' == ''
">Debug</Configuration>
- <ErrorReport>prompt</ErrorReport>
- <FileAlignment>512</FileAlignment>
-- <NoConfig>true</NoConfig>
-- <NoStdLib>true</NoStdLib>
- <NoWarn>0419</NoWarn>
- <OutputType>Library</OutputType>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-diff --git a/src/NLogAutoLoadExtension/NLogAutoLoadExtension.mono4.csproj
b/src/NLogAutoLoadExtension/NLogAutoLoadExtension.mono4.csproj
-index 02fa2ca..7798377 100644
---- a/src/NLogAutoLoadExtension/NLogAutoLoadExtension.mono4.csproj
-+++ b/src/NLogAutoLoadExtension/NLogAutoLoadExtension.mono4.csproj
-@@ -21,7 +21,6 @@
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <OutputPath>bin\Debug</OutputPath>
-- <NoStdLib>true</NoStdLib>
- <IntermediateOutputPath>$(BaseOutputDirectory)obj\$(Configuration)\Mono
4.x</IntermediateOutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release|AnyCPU' ">
-@@ -32,12 +31,9 @@
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <OutputPath>bin\Release</OutputPath>
-- <NoStdLib>true</NoStdLib>
- <IntermediateOutputPath>$(BaseOutputDirectory)obj\$(Configuration)\Mono
4.x</IntermediateOutputPath>
- </PropertyGroup>
- <PropertyGroup>
-- <NoStdLib>true</NoStdLib>
-- <NoConfig>true</NoConfig>
- <OutputPath>$(BaseOutputDirectory)bin\$(Configuration)\Mono
4.x</OutputPath>
- <IntermediateOutputPath>$(BaseOutputDirectory)obj\$(Configuration)\Mono
4.x</IntermediateOutputPath>
- </PropertyGroup>
-diff --git a/tests/SampleExtensions/SampleExtensions.mono4.csproj
b/tests/SampleExtensions/SampleExtensions.mono4.csproj
-index e3d0803..d84de8d 100644
---- a/tests/SampleExtensions/SampleExtensions.mono4.csproj
-+++ b/tests/SampleExtensions/SampleExtensions.mono4.csproj
-@@ -17,8 +17,6 @@
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
-- <NoStdLib>true</NoStdLib>
-- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <IntermediateOutputPath>$(BaseOutputDirectory)obj\$(Configuration)\Mono
4.x</IntermediateOutputPath>
-@@ -28,16 +26,12 @@
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <DefineConstants>TRACE</DefineConstants>
-- <NoStdLib>true</NoStdLib>
-- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <IntermediateOutputPath>$(BaseOutputDirectory)obj\$(Configuration)\Mono
4.x</IntermediateOutputPath>
- <OutputPath>$(BaseOutputDirectory)bin\$(Configuration)\Mono
4.x</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
-- <NoStdLib>true</NoStdLib>
-- <NoConfig>true</NoConfig>
- <DefineConstants>MONO;MONO4_0;$(DefineConstants)</DefineConstants>
- <OutputPath>$(BaseOutputDirectory)bin\$(Configuration)\Mono
4.x</OutputPath>
- <IntermediateOutputPath>$(BaseOutputDirectory)obj\$(Configuration)\Mono
4.x</IntermediateOutputPath>
diff --git a/dev-dotnet/nlog/nlog-4.3.11_p2016110901.ebuild
b/dev-dotnet/nlog/nlog-4.3.11_p2016110901.ebuild
index e8b5d84..be7e539 100644
--- a/dev-dotnet/nlog/nlog-4.3.11_p2016110901.ebuild
+++ b/dev-dotnet/nlog/nlog-4.3.11_p2016110901.ebuild
@@ -14,15 +14,14 @@ SLOT="0"
inherit mono-env gac nupkg
NAME="NLog"
-HOMEPAGE="https://github.com/ArsenShnurkov/${NAME}";
+HOMEPAGE="https://github.com/NLog/${NAME}";
-EGIT_BRANCH="MONO_4_0"
-EGIT_COMMIT="c3eb07ff89523154dc2385c7db0ba9437bff3362"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_BRANCH}/${EGIT_COMMIT}.tar.gz ->
${PF}.tar.gz"
+EGIT_COMMIT="71c8b60b25cab4cdb56c58ab042c68502e9dbbb0"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
DESCRIPTION=" NLog - Advanced .NET and Silverlight Logging
http://nlog-project.org";
-LICENSE="BSD"
+LICENSE="BSD" # https://github.com/NLog/NLog/blob/master/LICENSE.txt
COMMON_DEPEND=">=dev-lang/mono-4.0.2.5
"
@@ -31,8 +30,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
"
-S="${WORKDIR}/${NAME}-${EGIT_BRANCH}"
-FILE_TO_BUILD=./src/NLog.mono4.sln
+FILE_TO_BUILD=./src/NLog.mono.sln
METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
COMMIT_DATE_INDEX="$(get_version_component_count ${PV} )"
@@ -42,27 +40,19 @@ NUSPEC_VERSION=$(get_version_component_range
1-3)"${COMMIT_DATEANDSEQ//p/.}"
src_prepare() {
chmod -R +rw "${S}" || die
- # enuget_restore is commented out, because it give errors:
- # Unable to find version '1.6.4375' of package 'StatLight'.
- # Unable to find version '1.9.2' of package 'xunit.runners'.
- #enuget_restore "${METAFILETOBUILD}"
+ eapply "${FILESDIR}/NLog.nuspec.patch"
- epatch "${FILESDIR}/NLog.mono4.sln.patch"
- epatch "${FILESDIR}/NoStdLib-NoConfig.patch"
- epatch "${FILESDIR}/NLog.nuspec.patch"
+ cd "${S}"
+ mpt-sln --sln-file "${METAFILETOBUILD}" --remove-proj
"NLog.UnitTests.mono" || die
eapply_user
}
-# cd /var/lib/layman/dotnet
-# ebuild ./dev-dotnet/NLog/NLog-4.1.3_pre-r201510280.ebuild compile
src_compile() {
exbuild "${METAFILETOBUILD}"
- einfo Package name ${PN}
-
- enuspec -Prop BuildVersion=${NUSPEC_VERSION}
./src/NuGet/NLog/NLog.nuspec
- # Successfully created package
'/var/tmp/portage/dev-dotnet/NLog-4.1.3_pre-r201510280/work/NLog.4.1.3.0.nupkg'.
+ NUSPEC_PROPERTIES="BuildVersion=${NUSPEC_VERSION};platform=Mono*"
+ enuspec -Prop ${NUSPEC_PROPERTIES} ./src/NuGet/NLog/NLog.nuspec
}
src_install() {
@@ -73,8 +63,8 @@ src_install() {
fi
if use gac; then
- egacinstall "${S}/build/bin/${DIR}/Mono 4.x/NLog.dll"
- egacinstall "${S}/build/bin/${DIR}/Mono 4.x/NLog.Extended.dll"
+ egacinstall "${S}/build/bin/${DIR}/Mono 2.x/NLog.dll"
+ egacinstall "${S}/build/bin/${DIR}/Mono 2.x/NLog.Extended.dll"
fi
if use doc; then
