[gentoo-commits] proj/dotnet:master commit in: dev-util/mono-packaging-tools/, dev-dotnet/slntools/

[Mikhail Pukhlikov]

commit:     53d14ba4cd070035a0a3f1ca0cc36d2f3714aa27
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 13:41:05 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 13:41:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=53d14ba4

version bump

 ....ebuild => slntools-1.1.3_p201508170-r1.ebuild} |  0
 .../mono-packaging-tools-0.1.2_p201608183.ebuild   |  1 -
 ... mono-packaging-tools-0.1.3_p2016082301.ebuild} | 77 ++++++++++++----------
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/dev-dotnet/slntools/slntools-1.1.3-r201508170.ebuild b/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
similarity index 100%
rename from dev-dotnet/slntools/slntools-1.1.3-r201508170.ebuild
rename to dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild

diff --git a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild
index 0d6dac2..0ce32a9 100644
--- a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild
+++ b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild
@@ -29,7 +29,6 @@ DEPEND="${COMMON_DEPENDENCIES}
 RDEPEND="${COMMON_DEPENDENCIES}
 	"
 
-S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
 # PN = Package name, for example vim.
 SLN_FILE=${PN}.sln
 METAFILETOBUILD="${S}/${SLN_FILE}"

diff --git a/dev-util/mono-packaging-tools/mono-packaging-tools-0.2.1_p20160115.ebuild b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
similarity index 61%
rename from dev-util/mono-packaging-tools/mono-packaging-tools-0.2.1_p20160115.ebuild
rename to dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
index f5f790c..300e2d2 100644
--- a/dev-util/mono-packaging-tools/mono-packaging-tools-0.2.1_p20160115.ebuild
+++ b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
@@ -5,7 +5,7 @@
 EAPI=6 # >=portage-2.2.25
 KEYWORDS="~x86 ~amd64"
 
-USE_DOTNET="net45"
+USE_DOTNET="net45 +developer doc"
 # debug = debug configuration (symbols and defines for debugging)
 # test = allow NUnit tests to run
 # developer = generate symbols information (to view line numbers in stack traces, either in debug or release configuration)
@@ -13,83 +13,92 @@ USE_DOTNET="net45"
 # nupkg = create .nupkg file from .nuspec
 # gac = install into gac
 # pkg-config = register in pkg-config database
-IUSE="${USE_DOTNET} debug test +developer +aot +nupkg +gac +pkg-config"
+IUSE="${USE_DOTNET} debug test +developer +aot +nupkg +gac +pkg-config doc"
 
 inherit nupkg
 
+NAME="mono-packaging-tools"
 HOMEPAGE="http://arsenshnurkov.github.io/mono-packaging-tools"
-DESCRIPTION="mono packaging helpers"
-LICENSE="GPL-3"
-LICENSE_URL="https://raw.githubusercontent.com/ArsenShnurkov/mono-packaging-tools/master/LICENSE"
 
-SLOT="0"
+REPOSITORY_URL="https://github.com/ArsenShnurkov/${NAME}"
 
-REPOSITORY_NAME="mono-packaging-tools"
-REPOSITORY_URL="https://github.com/ArsenShnurkov/${REPOSITORY_NAME}"
 EGIT_COMMIT="17bfa8a2c3a7c3f6507e0226764066750ef91f03"
-SRC_URI="${REPOSITORY_URL}/archive/${EGIT_COMMIT}.zip -> ${P}.zip
-	mirror://gentoo/mono.snk.bz2"
-S="${WORKDIR}/${REPOSITORY_NAME}-${EGIT_COMMIT}"
+SRC_URI="${REPOSITORY_URL}/archive/${EGIT_COMMIT}.tar.gz -> ${PF}.tar.gz"
+RESTRICT="mirror"
+S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
+
+SLOT="0"
+
+DESCRIPTION="mono packaging helpers"
+LICENSE="GPL-3"
+LICENSE_URL="https://raw.githubusercontent.com/ArsenShnurkov/mono-packaging-tools/master/LICENSE"
 
 COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )
-	>=dev-dotnet/eto-parse-1.4.0[nupkg]
+	dev-dotnet/mono-options[gac]
+	>dev-dotnet/sln-tools-1.1.3[gac]
+	>=dev-dotnet/eto-parse-1.4.0[gac]
 	"
 DEPEND="${COMMON_DEPENDENCIES}
 	"
 RDEPEND="${COMMON_DEPENDENCIES}
 	"
 
+SLN_FILE="mono-packaging-tools.sln"
 METAFILETOBUILD="${S}/${SLN_FILE}"
-
-METAFILETOBUILD="mono-packaging-tools.sln"
-NUSPEC_FILENAME="${PN}.nuspec"
-NUSPEC_ID="${REPOSITORY_NAME}"
+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/}"
-ICON_FILENAME="${PN}.png"
-ICON_FINALNAME="${NUSPEC_ID}.${NUSPEC_VERSION}.png"
-ICON_PATH="$(get_nuget_trusted_icons_location)/${ICON_FINALNAME}"
+NUSPEC_FILENAME="${PN}.nuspec"
+#ICON_FILENAME="${PN}.png"
+#ICON_FINALNAME="${NUSPEC_ID}.${NUSPEC_VERSION}.png"
+#ICON_PATH="$(get_nuget_trusted_icons_location)/${ICON_FINALNAME}"
 
 src_prepare() {
 	#change version in .nuspec
 	# PV = Package version (excluding revision, if any), for example 6.3.
 	# It should reflect the upstream versioning scheme
-	sed "s/@VERSION@/${PV}/g" "${FILESDIR}/${NUSPEC_FILENAME}" >"${S}/${NUSPEC_FILENAME}" || die
+	sed "s/@VERSION@/${NUSPEC_VERSION}/g" "${FILESDIR}/${NUSPEC_ID}.nuspec" >"${S}/${NUSPEC_ID}.nuspec" || die
 
-	enuget_restore "${METAFILETOBUILD}"
+	# restoring is not necessary after switching to GAC references
+	# enuget_restore "${METAFILETOBUILD}"
+	default
 }
 
 src_compile() {
 	exbuild "${METAFILETOBUILD}"
-	enuspec "${NUGET_PACKAGE_ID}.nuspec"
+	enuspec "${NUSPEC_ID}.nuspec"
 }
 
 install_tool() {
+	if use debug; then
+		DIR="Debug"
+	else
+		DIR="Release"
+	fi
+
 	MONO=/usr/bin/mono
-	doins $1/bin/${DIR}/*
+
+	# installs .exe, .dll, .mdb (if exists), .exe.config (if any)
+	doins "$1"/bin/${DIR}/*
 	if use developer; then
-		make_wrapper $1 "${MONO} --debug /usr/share/${PN}/$1.exe"
+		make_wrapper "$1" "${MONO} --debug /usr/share/${PN}-${SLOT}/$1.exe"
 	else
-		make_wrapper $1 "${MONO} /usr/share/${PN}/$1.exe"
+		make_wrapper "$1" "${MONO} /usr/share/${PN}-${SLOT}/$1.exe"
 	fi;
 }
 
 src_install() {
-	if use debug; then
-		DIR="Debug"
-	else
-		DIR="Release"
-	fi
-
-	insinto "/usr/share/${PN}/"
+	insinto "/usr/share/${PN}-${SLOT}/"
 	install_tool mpt-gitmodules
 	install_tool mpt-sln
 	install_tool mpt-csproj
 	install_tool mpt-machine
 	install_tool mpt-nuget
 
-	enupkg "${WORKDIR}/${PN}.${PV}.nupkg"
+	enupkg "${WORKDIR}/${NUSPEC_ID}.${NUSPEC_VERSION}.nupkg"
 
-	dodoc README.md
+	if use doc; then
+		dodoc README.md
+	fi
 }