commit: 1b7b76be2059abb6cbfd664867bef1ecabf352be Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Tue Aug 16 16:56:31 2016 +0000 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> CommitDate: Tue Aug 16 16:56:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=1b7b76be
repoman fixed ...24.2-r1.ebuild => gnome-sharp-2.24.2-r2.ebuild} | 10 ++-- .../icsharpcodetexteditor-3.2.2-r20150630.ebuild | 4 +- dev-dotnet/nuget-codeplex/metadata.xml | 14 ----- .../nuget-codeplex/nuget-codeplex-2015.01.ebuild | 50 ----------------- .../nuget-codeplex/nuget-codeplex-9999.ebuild | 50 ----------------- .../files/add-keyfile-option-to-csproj-r2.patch | 6 ++ .../files/strongnames-for-ebuild-2.8.1-r2.patch | 34 ++++++++++++ dev-dotnet/nuget/nuget-2.8.7-r2.ebuild | 64 ++++++++++++++++++++++ .../files/add-keyfile-option-to-csproj-r1.patch | 13 +++++ .../disable-testproject-build-in-sln-r1.patch | 12 ++++ .../xdt-for-monodevelop-2.8.1-r1.ebuild | 47 ++++++++++++++++ 11 files changed, 183 insertions(+), 121 deletions(-) diff --git a/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r1.ebuild b/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r2.ebuild similarity index 83% rename from dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r1.ebuild rename to dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r2.ebuild index 604e765..6683e78 100644 --- a/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r1.ebuild +++ b/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r2.ebuild @@ -1,16 +1,16 @@ -# 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 dotnet autotools base +inherit dotnet autotools SLOT="2" DESCRIPTION="gnome bindings for mono" HOMEPAGE="http://www.mono-project.com/GtkSharp"; LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~ppc ~x86-fbsd" +KEYWORDS="~amd64 ~x86 ~ppc" SRC_URI="mirror://gnome/sources/gnome-sharp/2.24/${P}.tar.bz2" IUSE="debug" @@ -30,7 +30,7 @@ DEPEND="${RDEPEND} sys-devel/automake:1.11" src_prepare() { - base_src_prepare + default eautoreconf elibtoolize } diff --git a/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.ebuild b/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.ebuild index 399b862..2391bb3 100644 --- a/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.ebuild +++ b/dev-dotnet/icsharpcodetexteditor/icsharpcodetexteditor-3.2.2-r20150630.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$ @@ -15,7 +15,7 @@ EGIT_COMMIT="24903d58cddab7d0ff17fc96a8bb25f66e6eea56" SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${P}-${PR}.zip" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~x86 ~ppc" DEPEND="|| ( >=dev-lang/mono-3.4.0 <dev-lang/mono-9999 ) " RDEPEND="${DEPEND}" USE_DOTNET="net45" diff --git a/dev-dotnet/nuget-codeplex/metadata.xml b/dev-dotnet/nuget-codeplex/metadata.xml deleted file mode 100644 index 5db81f6..0000000 --- a/dev-dotnet/nuget-codeplex/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <description>Gentoo Dotnet Project</description> - </maintainer> - <longdescription lang="en"> - NuGet - .NET Package Manager - </longdescription> - <longdescription lang="ru"> - NuGet - пакетный менеджер, чистый C# - </longdescription> -</pkgmetadata> diff --git a/dev-dotnet/nuget-codeplex/nuget-codeplex-2015.01.ebuild b/dev-dotnet/nuget-codeplex/nuget-codeplex-2015.01.ebuild deleted file mode 100644 index 4dae789..0000000 --- a/dev-dotnet/nuget-codeplex/nuget-codeplex-2015.01.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -USE_DOTNET="net45" - -inherit dotnet eutils - -DESCRIPTION="Nuget - .NET Package Manager" -HOMEPAGE="http://nuget.codeplex.com"; -SRC_URI="http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=nuget&changeSetId=44651439bd90c1707852d47093cda9ba3fb58396 -> nuget-archive-${PV}.zip" -S=${WORKDIR} - -LICENSE="Apache-2.0" -SLOT="0" - -KEYWORDS="x86 amd64 ~ppc" -IUSE="" - -# Mask 3.2.0 because of mcs compiler bug : http://stackoverflow.com/a/17926731/238232 -# it fixed in 3.2.3 -DEPEND="|| ( >=dev-lang/mono-3.2.3 <dev-lang/mono-3.2.0 )" -RDEPEND="${DEPEND}" - -pkg_setup() { - dotnet_pkg_setup - mozroots --import --sync --machine -} - -src_prepare() { - sed -i -e 's@RunTests@ @g' "${S}/Build/Build.proj" || die -} - -src_configure() { - export EnableNuGetPackageRestore="true" -} - -src_compile() { - xbuild Build/Build.proj /p:Configuration=Release /p:TreatWarningsAsErrors=false /tv:4.0 /p:TargetFrameworkVersion=v"${FRAMEWORK}" /p:Configuration="Mono Release" /t:GoMono || die -} - -src_install() { - elog "Installing libraries" - - insinto /usr/lib/mono/NuGet/"${FRAMEWORK}"/ - doins src/CommandLine/obj/Mono\ Release/NuGet.exe - doins src/Core/obj/Mono\ Release/NuGet.Core.dll - make_wrapper nuget "mono /usr/lib/mono/NuGet/${FRAMEWORK}/NuGet.exe" -} diff --git a/dev-dotnet/nuget-codeplex/nuget-codeplex-9999.ebuild b/dev-dotnet/nuget-codeplex/nuget-codeplex-9999.ebuild deleted file mode 100644 index b6913e6..0000000 --- a/dev-dotnet/nuget-codeplex/nuget-codeplex-9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -USE_DOTNET="net45" - -inherit git-2 dotnet eutils - -EGIT_REPO_URI="https://git01.codeplex.com/nuget"; - -DESCRIPTION="Nuget - .NET Package Manager" -HOMEPAGE="http://nuget.codeplex.com"; -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" # ~x86 ~amd64 -IUSE="" - -# Mask 3.2.0 and later builds because of mcs compiler bug : http://stackoverflow.com/a/17926731/238232 -# it fixed in 3.2.3. -DEPEND=">=dev-lang/mono-3.2.3" -RDEPEND="${DEPEND}" - -pkg_setup() { - dotnet_pkg_setup - mozroots --import --sync --machine -} - -src_prepare() { - sed -i -e 's@RunTests@ @g' "${S}/Build/Build.proj" || die -} - -src_configure() { - export EnableNuGetPackageRestore="true" -} - -src_compile() { - xbuild Build/Build.proj /p:Configuration=Release /p:TreatWarningsAsErrors=false /tv:4.0 /p:TargetFrameworkVersion=v"${FRAMEWORK}" /p:Configuration="Mono Release" /t:GoMono || die -} - -src_install() { - elog "Installing libraries" - - insinto /usr/lib/mono/NuGet/"${FRAMEWORK}"/ - doins src/CommandLine/obj/Mono\ Release/NuGet.exe - doins src/Core/obj/Mono\ Release/NuGet.Core.dll - make_wrapper nuget "mono /usr/lib/mono/NuGet/${FRAMEWORK}/NuGet.exe" -} diff --git a/dev-dotnet/nuget/files/add-keyfile-option-to-csproj-r2.patch b/dev-dotnet/nuget/files/add-keyfile-option-to-csproj-r2.patch new file mode 100644 index 0000000..0e68a16 --- /dev/null +++ b/dev-dotnet/nuget/files/add-keyfile-option-to-csproj-r2.patch @@ -0,0 +1,6 @@ +--- a/src/Core/Core.csproj ++++ b/src/Core/Core.csproj +@@ -8,1 +8,3 @@ + <AssemblyName>NuGet.Core</AssemblyName> ++ <SignAssembly>true</SignAssembly> ++ <AssemblyOriginatorKeyFile>rsa-4096.snk</AssemblyOriginatorKeyFile> diff --git a/dev-dotnet/nuget/files/strongnames-for-ebuild-2.8.1-r2.patch b/dev-dotnet/nuget/files/strongnames-for-ebuild-2.8.1-r2.patch new file mode 100644 index 0000000..ce39b51 --- /dev/null +++ b/dev-dotnet/nuget/files/strongnames-for-ebuild-2.8.1-r2.patch @@ -0,0 +1,34 @@ +--- a/src/Core/Core.csproj 2015-03-06 18:32:27.255819553 +0300 ++++ b/src/Core/Core.csproj 2015-03-06 18:51:33.240779088 +0300 +@@ -221,9 +221,7 @@ + <Compile Include="Utility\VersionSpec.cs" /> + <Compile Include="Utility\WebRequestEventArgs.cs" /> + <Compile Include="FileModifiers\XdtTransformer.cs" /> +- <Reference Include="Microsoft.Web.XmlTransform"> +- <HintPath>..\..\lib\Microsoft.Web.XmlTransform.dll</HintPath> +- </Reference> ++ <Reference Include="Microsoft.Web.XmlTransform, Version=2.8.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> + <Reference Include="System" /> + <Reference Include="System.ComponentModel.DataAnnotations" /> + <Reference Include="System.Core" /> +--- a/src/CommandLine/CommandLine.csproj 2015-03-06 18:32:27.265819553 +0300 ++++ b/src/CommandLine/CommandLine.csproj 2015-03-06 18:52:00.471778127 +0300 +@@ -30,10 +35,6 @@ + <Reference Include="Microsoft.Build.Engine" /> + <Reference Include="Microsoft.Build.Framework" /> + <Reference Include="Microsoft.CSharp" /> +- <Reference Include="Microsoft.Web.XmlTransform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> +- <SpecificVersion>False</SpecificVersion> +- <HintPath>..\..\lib\Microsoft.Web.XmlTransform.dll</HintPath> +- </Reference> + <Reference Include="System" /> + <Reference Include="System.ComponentModel.Composition" /> + <Reference Include="System.ComponentModel.DataAnnotations" /> +@@ -41,6 +42,7 @@ + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Xml" /> + <Reference Include="WindowsBase" /> ++ <Reference Include="Microsoft.Web.XmlTransform, Version=2.8.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> + </ItemGroup> + <ItemGroup> + <Compile Include="..\..\Common\MsBuildProjectUtility.cs"> diff --git a/dev-dotnet/nuget/nuget-2.8.7-r2.ebuild b/dev-dotnet/nuget/nuget-2.8.7-r2.ebuild new file mode 100644 index 0000000..2537951 --- /dev/null +++ b/dev-dotnet/nuget/nuget-2.8.7-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +USE_DOTNET="net45" + +inherit dotnet eutils + +# This ebuild provides a forked version of nuget modified to work with MonoDevelop. +# See https://bugzilla.xamarin.com/show_bug.cgi?id=27693 +# dev-dotnet/nuget-codeplex provides the upstream version. + +DESCRIPTION="Nuget - .NET Package Manager" +HOMEPAGE="http://nuget.codeplex.com"; +SRC_URI="https://github.com/mrward/nuget/archive/Release-${PV}-MonoDevelop.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/nuget-Release-${PV}-MonoDevelop + +LICENSE="Apache-2.0" +SLOT="0" + +KEYWORDS="~amd64 ~x86 ~ppc" +IUSE="" + +# Mask 3.2.0 because of mcs compiler bug : http://stackoverflow.com/a/17926731/238232 +# it fixed in 3.2.3 +DEPEND=">=dev-lang/mono-3.2.3 + <=dev-dotnet/xdt-for-monodevelop-2.8.2[gac] + !dev-dotnet/nuget-codeplex + app-misc/ca-certificates" +RDEPEND="${DEPEND}" + +pkg_setup() { + addwrite "/usr/share/.mono/keypairs" + dotnet_pkg_setup + cert-sync /etc/ssl/certs/ca-certificates.crt +} + +src_prepare() { + sed -i -e 's@RunTests@ @g' "${S}/Build/Build.proj" || die + cp "${FILESDIR}/rsa-4096.snk" "${S}/src/Core/" || die + eapply "${FILESDIR}/add-keyfile-option-to-csproj-r2.patch" + sed -i -E -e "s#(\[assembly: InternalsVisibleTo(.*)\])#/* \1 */#g" "src/Core/Properties/AssemblyInfo.cs" || die + eapply "${FILESDIR}/strongnames-for-ebuild-2.8.1-r2.patch" + default +} + +src_configure() { + export EnableNuGetPackageRestore="true" +} + +src_compile() { +# xbuild Build/Build.proj /p:Configuration=Release /p:TreatWarningsAsErrors=false /tv:4.0 /p:TargetFrameworkVersion="v${FRAMEWORK}" /p:Configuration="Mono Release" /t:GoMono || die + source ./build.sh || die +} + +src_install() { + elog "Installing NuGet.Core.dll into GAC" + egacinstall "src/Core/obj/Mono Release/NuGet.Core.dll" + elog "Installing NuGet console application" + insinto /usr/lib/mono/NuGet/"${FRAMEWORK}"/ + doins src/CommandLine/obj/Mono\ Release/NuGet.exe + make_wrapper nuget "mono /usr/lib/mono/NuGet/${FRAMEWORK}/NuGet.exe" +} diff --git a/dev-dotnet/xdt-for-monodevelop/files/add-keyfile-option-to-csproj-r1.patch b/dev-dotnet/xdt-for-monodevelop/files/add-keyfile-option-to-csproj-r1.patch new file mode 100644 index 0000000..ce440d9 --- /dev/null +++ b/dev-dotnet/xdt-for-monodevelop/files/add-keyfile-option-to-csproj-r1.patch @@ -0,0 +1,13 @@ +--- a/XmlTransform/Microsoft.Web.XmlTransform.csproj 2014-10-26 21:16:30.000000000 +0300 ++++ b/XmlTransform/Microsoft.Web.XmlTransform.csproj 2015-03-06 16:51:31.859038709 +0300 +@@ -16,7 +16,9 @@ + <PropertyGroup Condition="!$(ExtensionsCommonTargetsExists)"> + <AppDesignerFolder>Properties</AppDesignerFolder> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> +- </PropertyGroup> ++ <SignAssembly>true</SignAssembly> ++ <AssemblyOriginatorKeyFile>rsa-4096.snk</AssemblyOriginatorKeyFile> ++ </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' AND !$(ExtensionsCommonTargetsExists)"> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> diff --git a/dev-dotnet/xdt-for-monodevelop/files/disable-testproject-build-in-sln-r1.patch b/dev-dotnet/xdt-for-monodevelop/files/disable-testproject-build-in-sln-r1.patch new file mode 100644 index 0000000..c0baa6e --- /dev/null +++ b/dev-dotnet/xdt-for-monodevelop/files/disable-testproject-build-in-sln-r1.patch @@ -0,0 +1,12 @@ +--- a/Microsoft.Web.XmlTransform.sln 2014-10-26 21:16:30.000000000 +0300 ++++ b/Microsoft.Web.XmlTransform.sln 2015-03-06 16:29:38.736085076 +0300 +@@ -12,9 +12,7 @@ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {22AC988D-26C0-43A9-8EB1-102DA31F0F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {22AC988D-26C0-43A9-8EB1-102DA31F0F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22AC988D-26C0-43A9-8EB1-102DA31F0F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {22AC988D-26C0-43A9-8EB1-102DA31F0F8F}.Release|Any CPU.Build.0 = Release|Any CPU + {0684EE2A-6F30-4BC7-B5E7-8CBA15534E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0684EE2A-6F30-4BC7-B5E7-8CBA15534E06}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0684EE2A-6F30-4BC7-B5E7-8CBA15534E06}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/dev-dotnet/xdt-for-monodevelop/xdt-for-monodevelop-2.8.1-r1.ebuild b/dev-dotnet/xdt-for-monodevelop/xdt-for-monodevelop-2.8.1-r1.ebuild new file mode 100644 index 0000000..0eb37bb --- /dev/null +++ b/dev-dotnet/xdt-for-monodevelop/xdt-for-monodevelop-2.8.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +USE_DOTNET="net45" + +inherit dotnet eutils gac + +DESCRIPTION="Microsoft's Xml Document Transformation library" +HOMEPAGE="https://github.com/mrward/xdt"; +LICENSE="Apache-2.0" +SLOT="0" + +SRC_URI="https://github.com/mrward/xdt/archive/Release-NuGet-${PV}-Mono.tar.gz -> xdt-for-monodevelop-${PV}.tar.gz" +S=${WORKDIR}/xdt-Release-NuGet-${PV}-Mono + +KEYWORDS="~amd64 ~x86 ~ppc" +IUSE="" + +DEPEND="|| ( dev-lang/mono )" +RDEPEND="${DEPEND}" + +pkg_setup() { + dotnet_pkg_setup +} + +src_prepare() { + eapply "${FILESDIR}/disable-testproject-build-in-sln-r1.patch" + cp "${FILESDIR}/rsa-4096.snk" "${S}/XmlTransform" || die + eapply "${FILESDIR}/add-keyfile-option-to-csproj-r1.patch" + sed -i -e "s/1.0.0/${PV}/g" "${S}/XmlTransform/Properties/AssemblyInfo.cs" || die + default +} + +src_configure() { + export EnableNuGetPackageRestore="true" +} + +src_compile() { + exbuild Microsoft.Web.XmlTransform.sln +} + +src_install() { + elog "Installing Microsoft.Web.XmlTransform.dll to GAC" + egacinstall XmlTransform/bin/Release/Microsoft.Web.XmlTransform.dll +}
