commit: 1c45c0c812a23e939439e81e9e543688f6f9cea0
Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github
<DOT> com>
AuthorDate: Tue Jan 24 22:49:21 2017 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 22:49:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=1c45c0c8
repoman fixes 1
dev-dotnet/x-pagedlist/x-pagedlist-5.3.0.8.ebuild | 6 +-
.../mono-packaging-tools-0.1.3_p2016090904.ebuild | 104 ---------------------
....ebuild => mono-packaging-tools-1.4.2.2.ebuild} | 94 ++++++++++++++-----
3 files changed, 74 insertions(+), 130 deletions(-)
diff --git a/dev-dotnet/x-pagedlist/x-pagedlist-5.3.0.8.ebuild
b/dev-dotnet/x-pagedlist/x-pagedlist-5.3.0.8.ebuild
index 4cac7b1..e90f1bb 100644
--- a/dev-dotnet/x-pagedlist/x-pagedlist-5.3.0.8.ebuild
+++ b/dev-dotnet/x-pagedlist/x-pagedlist-5.3.0.8.ebuild
@@ -53,9 +53,9 @@ NUSPEC_VERSION="${PV}"
src_prepare() {
einfo "patching project files"
- find ${S} -iname "AssemblyInfo.cs" -exec sed -i '/Assembly.*Version/d'
{} \; || die
- mpt-csproj
--inject-import='$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets' ${S} ||
die
- mpt-csproj --inject-versioning=BuildVersion ${S} || die
+ find "${S}" -iname "AssemblyInfo.cs" -exec sed -i
'/Assembly.*Version/d' {} \; || die
+ mpt-csproj
--inject-import='$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets' "${S}" ||
die
+ mpt-csproj --inject-versioning=BuildVersion "${S}" || die
einfo "preparing nuspec"
cp "${FILESDIR}/${NUSPEC_FILE_NAME}" "${S}/${NUSPEC_FILE_NAME}" || die
diff --git
a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016090904.ebuild
b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016090904.ebuild
deleted file mode 100644
index 38b1161..0000000
---
a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016090904.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6 # >=portage-2.2.25
-KEYWORDS="~x86 ~amd64"
-
-USE_DOTNET="net45"
-# 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)
-# aot = compile to machine code and store to disk during install, to save time
later during startups
-# 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 doc"
-
-inherit nupkg
-
-NAME="mono-packaging-tools"
-HOMEPAGE="http://arsenshnurkov.github.io/mono-packaging-tools";
-
-REPOSITORY_URL="https://github.com/ArsenShnurkov/${NAME}";
-
-EGIT_COMMIT="cd5d9c335989ec9c50a5d20790281385d7b14cae"
-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/mono-options[gac]
- >=dev-dotnet/slntools-1.1.3_p201508170-r1[gac]
- >=dev-dotnet/eto-parse-1.4.0[gac]
- "
-DEPEND="${COMMON_DEPENDENCIES}
- sys-apps/sed"
-RDEPEND="${COMMON_DEPENDENCIES}
- "
-
-SLN_FILE="mono-packaging-tools.sln"
-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/.}"
-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@/${NUSPEC_VERSION}/g" "${FILESDIR}/${NUSPEC_ID}.nuspec"
>"${S}/${NUSPEC_ID}.nuspec" || die
-
- # restoring is not necessary after switching to GAC references
- # enuget_restore "${METAFILETOBUILD}"
- default
-}
-
-src_compile() {
- exbuild "${METAFILETOBUILD}"
- enuspec "${NUSPEC_ID}.nuspec"
-}
-
-install_tool() {
- if use debug; then
- DIR="Debug"
- else
- DIR="Release"
- fi
-
- MONO=/usr/bin/mono
-
- # 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}-${SLOT}/$1.exe"
- else
- make_wrapper "$1" "${MONO} /usr/share/${PN}-${SLOT}/$1.exe"
- fi;
-}
-
-src_install() {
- 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}/${NUSPEC_ID}.${NUSPEC_VERSION}.nupkg"
-
- if use doc; then
- dodoc README.md
- fi
-}
diff --git
a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082302.ebuild
b/dev-util/mono-packaging-tools/mono-packaging-tools-1.4.2.2.ebuild
similarity index 60%
rename from
dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082302.ebuild
rename to dev-util/mono-packaging-tools/mono-packaging-tools-1.4.2.2.ebuild
index ef7564d..26b584c 100644
---
a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082302.ebuild
+++ b/dev-util/mono-packaging-tools/mono-packaging-tools-1.4.2.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6 # >=portage-2.2.25
KEYWORDS="~x86 ~amd64"
+RESTRICT="mirror"
USE_DOTNET="net45"
# debug = debug configuration (symbols and defines for debugging)
@@ -13,23 +14,33 @@ 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 doc"
+IUSE="+${USE_DOTNET} debug +developer test +aot doc"
+
+TOOLS_VERSION=14.0
+
+inherit gac nupkg
-inherit nupkg
+get_revision()
+{
+ git rev-list --count $2..$1
+}
+
+get_dlldir() {
+ echo /usr/lib64/mono/${PN}
+}
NAME="mono-packaging-tools"
HOMEPAGE="http://arsenshnurkov.github.io/mono-packaging-tools";
REPOSITORY_URL="https://github.com/ArsenShnurkov/${NAME}";
-EGIT_COMMIT="2420590310aa420e9b5d6edc170660ae496cd004"
-SRC_URI="${REPOSITORY_URL}/archive/${EGIT_COMMIT}.tar.gz -> ${PF}.tar.gz"
-RESTRICT="mirror"
+EGIT_COMMIT="92b9ac4cb83e52a5b679f139ff536da29c321456"
+SRC_URI="${REPOSITORY_URL}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
SLOT="0"
-DESCRIPTION="mono packaging helpers"
+DESCRIPTION="Command line utilities for packaging mono assemblies with portage"
LICENSE="GPL-3"
LICENSE_URL="https://raw.githubusercontent.com/ArsenShnurkov/mono-packaging-tools/master/LICENSE";
@@ -39,16 +50,19 @@ COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2
<dev-lang/mono-9999 )
>=dev-dotnet/eto-parse-1.4.0[gac]
"
DEPEND="${COMMON_DEPENDENCIES}
+ dev-dotnet/msbuildtasks
sys-apps/sed"
RDEPEND="${COMMON_DEPENDENCIES}
"
+NUSPEC_VERSION=${PV}
+ASSEMBLY_VERSION=${PV}
+
SLN_FILE="mono-packaging-tools.sln"
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/.}"
NUSPEC_FILENAME="${PN}.nuspec"
#ICON_FILENAME="${PN}.png"
#ICON_FINALNAME="${NUSPEC_ID}.${NUSPEC_VERSION}.png"
@@ -66,30 +80,23 @@ src_prepare() {
}
src_compile() {
- exbuild "${METAFILETOBUILD}"
+ exbuild_strong /p:VersionNumber="${ASSEMBLY_VERSION}"
"${METAFILETOBUILD}"
enuspec "${NUSPEC_ID}.nuspec"
}
-install_tool() {
+src_install() {
+ # install dlls
+ insinto "$(get_dlldir)/slot-${SLOT}"
if use debug; then
DIR="Debug"
else
DIR="Release"
fi
+ doins mpt-core/bin/${DIR}/mpt-core.dll
+ dosym slot-${SLOT}/mpt-core.dll $(get_dlldir)/mpt-core.dll
+ einstall_pc_file ${PN} ${ASSEMBLY_VERSION} mpt-core
- MONO=/usr/bin/mono
-
- # 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}-${SLOT}/$1.exe"
- else
- make_wrapper "$1" "${MONO} /usr/share/${PN}-${SLOT}/$1.exe"
- fi;
-}
-
-src_install() {
- insinto "/usr/share/${PN}-${SLOT}/"
+ insinto "/usr/share/${PN}/slot-${SLOT}"
install_tool mpt-gitmodules
install_tool mpt-sln
install_tool mpt-csproj
@@ -102,3 +109,44 @@ src_install() {
dodoc README.md
fi
}
+
+pkg_prerm() {
+ if use gac; then
+ # TODO determine version for uninstall from slot-N dir
+ einfo "removing from GAC"
+ gacutil -u mpt-core
+ # don't die, it there is no such assembly in GAC
+ fi
+}
+
+pkg_postinst() {
+ if use gac; then
+ einfo "adding to GAC"
+ gacutil -i "$(get_dlldir)/slot-${SLOT}/mpt-core.dll" || die
+ fi
+}
+
+install_tool() {
+ if use debug; then
+ DIR="Debug"
+ else
+ DIR="Release"
+ fi
+
+ # installs .exe, .exe.config (if any), .mdb (if exists)
+ doins "$1"/bin/${DIR}/*.exe
+ if [ -f "$1"/bin/${DIR}/*.exe.config ]; then
+ doins "$1"/bin/${DIR}/*.exe.config
+ fi
+ if use developer; then
+ doins "$1"/bin/${DIR}/*.mdb
+ fi
+
+ MONO=/usr/bin/mono
+
+ if use debug; then
+ make_wrapper "$1" "${MONO} --debug
/usr/share/${PN}/slot-${SLOT}/$1.exe"
+ else
+ make_wrapper "$1" "${MONO} /usr/share/${PN}/slot-${SLOT}/$1.exe"
+ fi;
+}
