commit: b3c9bffb93db8dd25df03feaa85c41c92764159e Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Tue Aug 16 12:11:40 2016 +0000 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> CommitDate: Tue Aug 16 12:11:40 2016 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=b3c9bffb
move icon for dryioc from FILESDIR to SRC_URI ...10.ebuild => dryioc-2.1.0_p201512110-r1.ebuild} | 15 ++++++++--- dev-dotnet/dryioc/files/icon.png | Bin 24160 -> 0 bytes dev-dotnet/npgsql/npgsql-3.1.6.ebuild | 18 ++++++++++--- dev-util/mono-tools/mono-tools-9999.ebuild | 2 +- eclass/gac.eclass | 28 ++++++++++++++++++++- eclass/machine.eclass | 13 ++++++---- eclass/nupkg.eclass | 2 ++ profiles/use.desc | 3 ++- 8 files changed, 66 insertions(+), 15 deletions(-) diff --git a/dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild b/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild similarity index 91% rename from dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild rename to dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild index de3a4b9..a5da7e5 100644 --- a/dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild +++ b/dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild @@ -9,7 +9,7 @@ EAPI=6 # 2015-11-17, portage-2.2.25 has been committed and it comes with complete EAPI 6 support # https://archives.gentoo.org/gentoo-dev/message/73cc181e4949b88abfbd68f8a8ca9254 -inherit versionator vcs-snapshot dotnet nupkg +inherit versionator vcs-snapshot dotnet gac nupkg HOMEPAGE="https://bitbucket.org/dadhi/dryioc"; DESCRIPTION="fast, small, full-featured IoC Container for .NET" @@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86" # nupkg = create .nupkg file from .nuspec # gac = install into gac # pkg-config = register in pkg-config database -IUSE="net45 debug developer test +nupkg +gac +pkg-config" +IUSE="net45 debug developer test +nupkg +pkg-config" USE_DOTNET="net45" COMMON_DEPEND=">=dev-lang/mono-4.0.2.5 @@ -46,17 +46,21 @@ 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 - mirror://gentoo/mono.snk.bz2" + https://raw.githubusercontent.com/ArsenShnurkov/dotnet/dryioc/dev-dotnet/dryioc/files/icon.png -> ${PF}.icon.png + gac? ( mirror://gentoo/mono.snk.bz2 ) + " +#RESTRICT="mirror" #METAFILETOBUILD="DryIoc.sln" METAFILETOBUILD="DryIoc/DryIoc.csproj" +NUSPEC_ID=DryIoc NUSPEC_FILE_NAME=DryIoc.nuspec # get_version_component_range is from inherit versionator # PR Package revision, or r0 if no revision exists. NUSPEC_VERSION=$(get_version_component_range 1-3)"${PR//r/.}" #ICON_URL="https://bitbucket.org/account/dadhi/avatar/256/?ts=1451481107"; -#ICON_URL="https://raw.githubusercontent.com/ArsenShnurkov/dotnet/dryioc/dev-dotnet/dryioc/files/icon.png"; +#ICON_URL="" ICON_URL="https://raw.githubusercontent.com/gentoo/dotnet/master/dev-dotnet/dryioc/files/icon.png"; # rm -rf /var/tmp/portage/dev-dotnet/dryioc-* @@ -108,6 +112,9 @@ src_install() { egacinstall "bin/${DIR}/DryIoc.dll" + insinto "$(get_nuget_trusted_icons_location)" + newins "${DISTDIR}/${PF}.icon.png" "${NUSPEC_ID}.${NUSPEC_VERSION}.png" + install_pc_file } diff --git a/dev-dotnet/dryioc/files/icon.png b/dev-dotnet/dryioc/files/icon.png deleted file mode 100644 index 486fd24..0000000 Binary files a/dev-dotnet/dryioc/files/icon.png and /dev/null differ diff --git a/dev-dotnet/npgsql/npgsql-3.1.6.ebuild b/dev-dotnet/npgsql/npgsql-3.1.6.ebuild index 3b7ce0e..e88c27d 100644 --- a/dev-dotnet/npgsql/npgsql-3.1.6.ebuild +++ b/dev-dotnet/npgsql/npgsql-3.1.6.ebuild @@ -11,7 +11,7 @@ EAPI=6 # gac = install into gac # pkg-config = register in pkg-config database USE_DOTNET="net45" -IUSE="${USE_DOTNET} debug developer test +nupkg +gac +pkg-config +machine" +IUSE="${USE_DOTNET} debug developer test +pkg-config" inherit gac machine nupkg @@ -21,8 +21,8 @@ HOMEPAGE="https://github.com/npgsql/${NAME}"; EGIT_COMMIT="a7e147759c3756b6d22f07f5602aacd21f93d48d" SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - gac? ( mirror://gentoo/mono.snk.bz2 ) - http://www.npgsql.org/css/img/postgresql-header.png"; + http://www.npgsql.org/css/img/postgresql-header.png + gac? ( mirror://gentoo/mono.snk.bz2 )" RESTRICT="mirror" S="${WORKDIR}/${NAME}-${EGIT_COMMIT}" @@ -169,3 +169,15 @@ EOF eend $? fi } + +pkg_postinst() +{ + egacadd "${libdir}/Npgsql.dll" + emachineadd "${libdir}/Npgsql.dll" "Npgsql" "Npgsql Data Provider" +} + +pkg_prerm() +{ + egacdel "Npgsql" + emachinedel "Npgsql" +} diff --git a/dev-util/mono-tools/mono-tools-9999.ebuild b/dev-util/mono-tools/mono-tools-9999.ebuild index ae84f0f..16a64ac 100644 --- a/dev-util/mono-tools/mono-tools-9999.ebuild +++ b/dev-util/mono-tools/mono-tools-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit dotnet autotools git-2 +inherit dotnet autotools git-r3 DESCRIPTION="Set of useful Mono related utilities" HOMEPAGE="http://www.mono-project.com/"; diff --git a/eclass/gac.eclass b/eclass/gac.eclass index a074aff..48d648f 100644 --- a/eclass/gac.eclass +++ b/eclass/gac.eclass @@ -13,9 +13,13 @@ case ${EAPI:-0} in 6) ;; esac -DEPEND+=" dev-lang/mono" IUSE+=" +gac" +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 @@ -29,3 +33,25 @@ egacinstall() { -package ${2:-${GACPN:-${PN}}} \ || die "installing ${1} into the Global Assembly Cache failed" } + +# @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" +} + +# @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 +} diff --git a/eclass/machine.eclass b/eclass/machine.eclass index 0cb37c7..20c1c7c 100644 --- a/eclass/machine.eclass +++ b/eclass/machine.eclass @@ -22,11 +22,14 @@ RDEPEND+=" dev-lang/mono IUSE+=" +machine" -# SRC_URI+=" https://github.com/mono/mono/raw/master/mcs/class/mono.snk"; -# I was unable to setup it this ^^ way - -# @FUNCTION: emachineinstall +# @FUNCTION: emachineadd # @DESCRIPTION: install a provider into machine.config -emachineinstall() { +emachineadd() { einfo "Installing $1 into machine.config" } + +# @FUNCTION: emachinedel +# @DESCRIPTION: remove a provider from machine.config +emachinedel() { + einfo "Removing $1 from machine.config" +} diff --git a/eclass/nupkg.eclass b/eclass/nupkg.eclass index 3008e2d..ed6731f 100644 --- a/eclass/nupkg.eclass +++ b/eclass/nupkg.eclass @@ -9,6 +9,8 @@ inherit dotnet +IUSE+=" +nupkg" + # @FUNCTION: get_nuget_trusted_icons_location # @USAGE: [directory] # @DESCRIPTION: diff --git a/profiles/use.desc b/profiles/use.desc index d403369..0662104 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -11,7 +11,8 @@ nuget - Grab binary from nuget # is nuget use necessary now, when we have source-compiled version of nuget from ebuild? nupkg - build binary package for local repository -gac - register library assemblies in the gac (where ebuild allows that) +gac - register library assemblies in the gac (where ebuild requests that) +machine - register ADO .NET data provider in the machine.config (where ebuild requests that) developer - create .mdb files debug - build Debug configuration instead of Release default
![https://raw.githubusercontent.com/ArsenShnurkov/dotnet/dryioc/dev-dotnet/dryioc/files/icon.png"](https://raw.githubusercontent.com/ArsenShnurkov/dotnet/dryioc/dev-dotnet/dryioc/files/icon.png"){kind=link}
![https://raw.githubusercontent.com/gentoo/dotnet/master/dev-dotnet/dryioc/files/icon.png"](https://raw.githubusercontent.com/gentoo/dotnet/master/dev-dotnet/dryioc/files/icon.png"){kind=link}
![http://www.npgsql.org/css/img/postgresql-header.png"](http://www.npgsql.org/css/img/postgresql-header.png"){kind=link}
