commit: 860ed981b5e67546428978c4f8d94f2ca3925c8e
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 14:56:08 2016 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 14:56:08 2016 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=860ed981
link versions fixed
dev-dotnet/slntools/metadata.xml | 8 +++++-
.../slntools/slntools-1.1.3_p201508170-r1.ebuild | 31 +++++++++++++---------
.../mono-packaging-tools-0.1.3_p2016082301.ebuild | 6 ++---
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/dev-dotnet/slntools/metadata.xml b/dev-dotnet/slntools/metadata.xml
index b855da0..9312acc 100644
--- a/dev-dotnet/slntools/metadata.xml
+++ b/dev-dotnet/slntools/metadata.xml
@@ -5,8 +5,14 @@
<email>[email protected]</email>
<description>Gentoo Dotnet Project</description>
</maintainer>
- <use>
+ <use lang="en">
<flag name='developer'>enables debug information for any of
debug and release builds</flag>
<flag name='nupkg'>creates local nuget package</flag>
+ <flag name='cli'>installs command line interface</flag>
+ </use>
+ <use lang="ru">
+ <flag name='developer'>управляет генерированием и установкой
.mdb-файлов, запуском mono с ключом --debug</flag>
+ <flag name='nupkg'>создаёт локальный .nupkg-пакет для
nuget</flag>
+ <flag name='cli'>устанавливает .exe-файлы. Без этого флага
произойдёт только установка в gac, если она не запрещена</flag>
</use>
</pkgmetadata>
diff --git a/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
b/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
index 15674ce..b09cca4 100644
--- a/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
+++ b/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
@@ -3,6 +3,10 @@
# $Id$
EAPI=6
+KEYWORDS="~amd64 ~x86"
+USE_DOTNET="net45"
+# cli = do install command line interface
+IUSE="${USE_DOTNET} developer gac nupkg debug cli"
inherit dotnet gac
NAME="slntools"
@@ -17,8 +21,6 @@ SLOT=0
DESCRIPTION="Validator.nu HTML Parser, a HTML5 parser, port from Java Version
1.4 to C#"
LICENSE="MIT" #
https://github.com/jamietre/HtmlParserSharp/blob/master/LICENSE.txt
-KEYWORDS="~amd64 ~x86"
-IUSE="developer nupkg debug"
RDEPEND=">=dev-lang/mono-4.0.2.5"
DEPEND="${RDEPEND}
@@ -63,7 +65,7 @@ src_compile() {
ARGS="${ARGS} /p:DebugSymbols=False"
fi
- exbuild ${ARGS} ${METAFILETOBUILD}
+ exbuild_strong ${ARGS} ${METAFILETOBUILD}
if use nupkg; then
nuget pack "${FILESDIR}/${SLN_FILE}.nuspec" -Properties
${ARGSN} -BasePath "${S}" -OutputDirectory "${WORKDIR}" -NonInteractive
-Verbosity detailed
@@ -86,15 +88,20 @@ src_install() {
# || die is not necessary after doins,
# see examples at
https://devmanual.gentoo.org/ebuild-writing/functions/src_install/index.html
doins Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.Core.dll
- doins Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.Core.dll.mdb
- doins Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.UIKit.dll
- doins Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.UIKit.dll.mdb
- doins Main/SLNTools.exe/bin/${DIR}/SLNTools.exe
- doins Main/SLNTools.exe/bin/${DIR}/SLNTools.exe.mdb
-
- make_wrapper slntools "mono /usr/share/slntools/SLNTools.exe"
-
- egac-install Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.Core.dll
+ if use debug; then
+ doins Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.Core.dll.mdb
+ fi
+ egacinstall Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.Core.dll
+
+ if use cli; then
+ doins Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.UIKit.dll
+ doins Main/SLNTools.exe/bin/${DIR}/SLNTools.exe
+ if use debug; then
+ doins
Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.UIKit.dll.mdb
+ doins Main/SLNTools.exe/bin/${DIR}/SLNTools.exe.mdb
+ fi
+ make_wrapper slntools "mono /usr/share/slntools/SLNTools.exe"
+ fi
if use nupkg; then
if [ -d "/var/calculate/remote/distfiles" ]; then
diff --git
a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
index 44ae86b..2ede134 100644
---
a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
+++
b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://arsenshnurkov.github.io/mono-packaging-tools";
REPOSITORY_URL="https://github.com/ArsenShnurkov/${NAME}";
-EGIT_COMMIT="17bfa8a2c3a7c3f6507e0226764066750ef91f03"
+EGIT_COMMIT="a99068a066aa17e82b2469665c8484667d348490"
SRC_URI="${REPOSITORY_URL}/archive/${EGIT_COMMIT}.tar.gz -> ${PF}.tar.gz"
RESTRICT="mirror"
S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
@@ -35,7 +35,7 @@
LICENSE_URL="https://raw.githubusercontent.com/ArsenShnurkov/mono-packaging-tool
COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )
dev-dotnet/mono-options[gac]
- >dev-dotnet/sln-tools-1.1.3[gac]
+ >=dev-dotnet/slntools-1.1.3_p201508170-r1[gac]
>=dev-dotnet/eto-parse-1.4.0[gac]
"
DEPEND="${COMMON_DEPENDENCIES}
@@ -48,7 +48,7 @@ METAFILETOBUILD="${S}/${SLN_FILE}"
NUSPEC_ID="${NAME}"
COMMIT_DATE_INDEX="$(get_version_component_count ${PV} )"
COMMIT_DATE="$(get_version_component_range $COMMIT_DATE_INDEX ${PV} )"
-NUSPEC_VERSION="$(get_version_component_range 1-3)${COMMIT_DATE//p/.}${PR//r/}"
+NUSPEC_VERSION="$(get_version_component_range 1-3)${COMMIT_DATE//p/.}"
NUSPEC_FILENAME="${PN}.nuspec"
#ICON_FILENAME="${PN}.png"
#ICON_FINALNAME="${NUSPEC_ID}.${NUSPEC_VERSION}.png"
