* [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/dryioc/, dev-util/mono-packaging-tools/, eclass/, dev-dotnet/npgsql/
@ 2016-08-17 9:44 Mikhail Pukhlikov
0 siblings, 0 replies; only message in thread
From: Mikhail Pukhlikov @ 2016-08-17 9:44 UTC (permalink / raw
To: gentoo-commits
commit: d67c029b5c92939a29fcc0f52ec69c4e8d3c51ec
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 13:24:59 2016 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 13:24:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=d67c029b
fix null reference bug in mpt-machine
.../dryioc/dryioc-2.1.0_p201512110-r1.ebuild | 9 ++-
dev-dotnet/npgsql/npgsql-3.1.6.ebuild | 19 +++---
.../mono-packaging-tools-0.1.1-r20150918.ebuild | 78 ----------------------
...=> mono-packaging-tools-0.1.2_p20160816.ebuild} | 2 +-
eclass/gac.eclass | 48 +++++++------
eclass/machine.eclass | 22 +++---
6 files changed, 57 insertions(+), 121 deletions(-)
diff --git a/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild b/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild
index a5da7e5..50bcfb9 100644
--- a/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild
+++ b/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild
@@ -46,7 +46,7 @@ HG_COMMIT="${EHG_REVISION:0:8}"
# PF Full package name, ${PN}-${PVR}, for example vim-6.3-r1
SRC_URI="${REPOSITORY_URL}/get/${HG_COMMIT}.tar.gz -> ${PF}.tar.gz
- https://raw.githubusercontent.com/ArsenShnurkov/dotnet/dryioc/dev-dotnet/dryioc/files/icon.png -> ${PF}.icon.png
+ nupkg? ( https://raw.githubusercontent.com/ArsenShnurkov/dotnet/dryioc/dev-dotnet/dryioc/files/icon.png -> ${PF}.icon.png )
gac? ( mirror://gentoo/mono.snk.bz2 )
"
#RESTRICT="mirror"
@@ -79,6 +79,7 @@ src_prepare() {
default
# /var/tmp/portage/dev-dotnet/dryioc-2.1.0-r201512110/work/dadhi-dryioc-9f1954dd921a
einfo "patching project files"
+ sed -i 's=\r$==g' "${METAFILETOBUILD}" || die
eapply "${FILESDIR}/DryIoc.csproj.patch"
if ! use test ; then
einfo "removing unit tests from solution"
@@ -112,8 +113,10 @@ src_install() {
egacinstall "bin/${DIR}/DryIoc.dll"
- insinto "$(get_nuget_trusted_icons_location)"
- newins "${DISTDIR}/${PF}.icon.png" "${NUSPEC_ID}.${NUSPEC_VERSION}.png"
+ if use nupkg; then
+ insinto "$(get_nuget_trusted_icons_location)"
+ newins "${DISTDIR}/${PF}.icon.png" "${NUSPEC_ID}.${NUSPEC_VERSION}.png"
+ fi
install_pc_file
}
diff --git a/dev-dotnet/npgsql/npgsql-3.1.6.ebuild b/dev-dotnet/npgsql/npgsql-3.1.6.ebuild
index e88c27d..ee52d85 100644
--- a/dev-dotnet/npgsql/npgsql-3.1.6.ebuild
+++ b/dev-dotnet/npgsql/npgsql-3.1.6.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/npgsql/${NAME}"
EGIT_COMMIT="a7e147759c3756b6d22f07f5602aacd21f93d48d"
SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- http://www.npgsql.org/css/img/postgresql-header.png
+ nupkg? ( http://www.npgsql.org/css/img/postgresql-header.png )
gac? ( mirror://gentoo/mono.snk.bz2 )"
RESTRICT="mirror"
S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
@@ -110,12 +110,13 @@ src_install() {
FINAL_DLL=src/Npgsql/bin/${DIR}/Npgsql.dll
- if use gac; then
- egacinstall "${FINAL_DLL}"
- fi
+ insinto ${PREFIX}/usr/lib/mono/${EBUILD_FRAMEWORK}
+ doins ${FINAL_DLL}
- insinto "$(get_nuget_trusted_icons_location)"
- newins "${DISTDIR}/${ICON_FILENAME}" "${NUSPEC_ID}.${NUSPEC_VERSION}.png"
+ if use nupkg; then
+ insinto "$(get_nuget_trusted_icons_location)"
+ newins "${DISTDIR}/${ICON_FILENAME}" "${NUSPEC_ID}.${NUSPEC_VERSION}.png"
+ fi
enupkg "${WORKDIR}/${NUSPEC_ID}.${NUSPEC_VERSION}.nupkg"
@@ -172,12 +173,12 @@ EOF
pkg_postinst()
{
- egacadd "${libdir}/Npgsql.dll"
- emachineadd "${libdir}/Npgsql.dll" "Npgsql" "Npgsql Data Provider"
+ egacadd "${PREFIX}/usr/lib/mono/${EBUILD_FRAMEWORK}/Npgsql.dll"
+ emachineadd "Npgsql" "Npgsql Data Provider" "${PREFIX}/usr/lib/mono/${EBUILD_FRAMEWORK}/Npgsql.dll"
}
pkg_prerm()
{
egacdel "Npgsql"
- emachinedel "Npgsql"
+ emachinedel "Npgsql" "Npgsql Data Provider" "${PREFIX}/usr/lib/mono/${EBUILD_FRAMEWORK}/Npgsql.dll"
}
diff --git a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.1-r20150918.ebuild b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.1-r20150918.ebuild
deleted file mode 100644
index 25c305f..0000000
--- a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.1-r20150918.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit mono-env nuget dotnet
-
-NAME="mono-packaging-tools"
-HOMEPAGE="https://github.com/ArsenShnurkov/${NAME}"
-
-EGIT_COMMIT="b1261238bf03e84a30bf965d17c809a8a14d1cc1"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${PF}.zip"
-S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
-
-SLOT="0"
-
-DESCRIPTION="mono packaging helpers"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="developer nupkg debug"
-
-COMMON_DEPENDENCIES=">=dev-lang/mono-4.2
- >=dev-dotnet/eto-parse-1.4.0[nupkg]
- "
-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}"
-NUGET_PACKAGE_ID="${NAME}"
-
-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}/${NUGET_PACKAGE_ID}.nuspec" >"${S}/${NUGET_PACKAGE_ID}.nuspec" || die
-
- enuget_restore "${METAFILETOBUILD}"
-}
-
-src_compile() {
- exbuild "${METAFILETOBUILD}"
- enuspec "${NUGET_PACKAGE_ID}.nuspec"
-}
-
-install_tool() {
- MONO=/usr/bin/mono
- doins $1/bin/${DIR}/*
- if use developer; then
- make_wrapper $1 "${MONO} --debug /usr/share/${PN}/$1.exe"
- else
- make_wrapper $1 "${MONO} /usr/share/${PN}/$1.exe"
- fi;
-}
-
-src_install() {
- DIR=""
- if use debug; then
- DIR="Debug"
- else
- DIR="Release"
- fi
-
- insinto "/usr/share/${PN}/"
- 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"
-
- dodoc README.md
-}
diff --git a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2.ebuild b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p20160816.ebuild
similarity index 96%
rename from dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2.ebuild
rename to dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p20160816.ebuild
index ff82f05..0454d20 100644
--- a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2.ebuild
+++ b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p20160816.ebuild
@@ -8,7 +8,7 @@ inherit mono-env nuget dotnet
NAME="mono-packaging-tools"
HOMEPAGE="https://github.com/ArsenShnurkov/${NAME}"
-EGIT_COMMIT="37179a0d34cc17396d618a839761864685957aaa"
+EGIT_COMMIT="50b799d3bcfd12fd4d1c651f55f8dcf81d6ac2d2"
SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${PF}.tar.gz"
RESTRICT="mirror"
S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
diff --git a/eclass/gac.eclass b/eclass/gac.eclass
index 48d648f..c5b7e85 100644
--- a/eclass/gac.eclass
+++ b/eclass/gac.eclass
@@ -15,10 +15,8 @@ esac
IUSE+=" +gac"
-DEPEND+=" dev-lang/mono
- "
-RDEPEND+=" dev-lang/mono
- "
+DEPEND+=" dev-lang/mono"
+RDEPEND+=" dev-lang/mono"
# SRC_URI+=" https://github.com/mono/mono/raw/master/mcs/class/mono.snk"
# I was unable to setup it this ^^ way
@@ -26,32 +24,38 @@ RDEPEND+=" dev-lang/mono
# @FUNCTION: egacinstall
# @DESCRIPTION: install package to GAC
egacinstall() {
- use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
- gacutil -i "${1}" \
- -root "${ED}"/usr/$(get_libdir) \
- -gacdir /usr/$(get_libdir) \
- -package ${2:-${GACPN:-${PN}}} \
- || die "installing ${1} into the Global Assembly Cache failed"
+ if use gac; then
+ use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
+ gacutil -i "${1}" \
+ -root "${ED}"/usr/$(get_libdir) \
+ -gacdir /usr/$(get_libdir) \
+ -package ${2:-${GACPN:-${PN}}} \
+ || die "installing ${1} into the Global Assembly Cache failed"
+ fi
}
# @FUNCTION: egacadd
# @DESCRIPTION: install package to GAC
egacadd() {
- use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
- gacutil -i "${1}" \
- -root "${ED}"/usr/$(get_libdir) \
- -gacdir /usr/$(get_libdir) \
- -package ${2:-${GACPN:-${PN}}} \
- || die "installing ${1} into the Global Assembly Cache failed"
+ if use gac; then
+ use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
+ gacutil -i "${1}" \
+ -root "${ED}"/usr/$(get_libdir) \
+ -gacdir /usr/$(get_libdir) \
+ -package ${2:-${GACPN:-${PN}}} \
+ || die "installing ${1} into the Global Assembly Cache failed"
+ fi
}
# @FUNCTION: egacdel
# @DESCRIPTION: remove package from GAC
egacdel() {
- use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
- gacutil -r "${1}" \
- -root "${ED}"/usr/$(get_libdir) \
- -gacdir /usr/$(get_libdir) \
- -package ${2:-${GACPN:-${PN}}}
- # don't die
+ if use gac; then
+ use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
+ gacutil -u "${1}" \
+ -root "${ED}"/usr/$(get_libdir) \
+ -gacdir /usr/$(get_libdir) \
+ -package ${2:-${GACPN:-${PN}}}
+ # don't die
+ fi
}
diff --git a/eclass/machine.eclass b/eclass/machine.eclass
index 20c1c7c..c0f21ca 100644
--- a/eclass/machine.eclass
+++ b/eclass/machine.eclass
@@ -8,28 +8,34 @@
# @DESCRIPTION:
# ADO .NET data providers should be able to be registred in machine.config
+inherit gac
+
case ${EAPI:-0} in
0|1|2|3|4|5) die "this eclass doesn't support EAPI ${EAPI:-0}" ;;
6) ;;
esac
-DEPEND+=" dev-lang/mono
- dev-util/mono-packaging-tools
- "
-RDEPEND+=" dev-lang/mono
- dev-util/mono-packaging-tools
- "
+DEPEND+=" >=dev-util/mono-packaging-tools-0.1.2"
+RDEPEND+=" >=dev-util/mono-packaging-tools-0.1.2"
IUSE+=" +machine"
# @FUNCTION: emachineadd
# @DESCRIPTION: install a provider into machine.config
emachineadd() {
- einfo "Installing $1 into machine.config"
+ if use machine; then
+ if ! use gac; then die 'you should enable USE="+gac" if you want USE="machine"'; fi;
+ einfo "Installing $1 into machine.config"
+ einfo mpt-machine --in /etc/mono/4.5/machine.config --out /etc/mono/4.5/._cfg0000_machine.config --name "$2" --invariant "$1" --dll "$3"
+ mpt-machine --in /etc/mono/4.5/machine.config --out /etc/mono/4.5/._cfg0000_machine.config --name "$2" --invariant "$1" --dll "$3" || die
+ fi
}
# @FUNCTION: emachinedel
# @DESCRIPTION: remove a provider from machine.config
emachinedel() {
- einfo "Removing $1 from machine.config"
+ if use machine; then
+ einfo "Removing $1 from machine.config"
+ mpt-machine --in=/etc/mono/4.5/machine.config --out=/etc/mono/4.5/._cfg0000_machine.config --name="$2" --invariant="$1" || die
+ fi
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-08-17 9:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-17 9:44 [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/dryioc/, dev-util/mono-packaging-tools/, eclass/, dev-dotnet/npgsql/ Mikhail Pukhlikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox