aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsenShnurkov <Arsen.Shnurkov@gmail.com>2016-08-16 15:11:40 +0300
committerArsenShnurkov <Arsen.Shnurkov@gmail.com>2016-08-16 15:11:40 +0300
commitb3c9bffb93db8dd25df03feaa85c41c92764159e (patch)
tree7fc45c2dfe01af099e8fe7ade541d73efa3faf32
parentmove egacinstall into separate eclass (diff)
downloaddotnet-b3c9bffb93db8dd25df03feaa85c41c92764159e.tar.gz
dotnet-b3c9bffb93db8dd25df03feaa85c41c92764159e.tar.bz2
dotnet-b3c9bffb93db8dd25df03feaa85c41c92764159e.zip
move icon for dryioc from FILESDIR to SRC_URI
-rw-r--r--dev-dotnet/dryioc/Manifest3
-rw-r--r--dev-dotnet/dryioc/dryioc-2.1.0_p201512110-r1.ebuild (renamed from dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild)15
-rw-r--r--dev-dotnet/dryioc/files/icon.pngbin24160 -> 0 bytes
-rw-r--r--dev-dotnet/npgsql/npgsql-3.1.6.ebuild18
-rw-r--r--dev-util/mono-tools/mono-tools-9999.ebuild2
-rw-r--r--eclass/gac.eclass28
-rw-r--r--eclass/machine.eclass13
-rw-r--r--eclass/nupkg.eclass2
-rw-r--r--profiles/use.desc3
9 files changed, 68 insertions, 16 deletions
diff --git a/dev-dotnet/dryioc/Manifest b/dev-dotnet/dryioc/Manifest
index 6b3d9f9..656ad61 100644
--- a/dev-dotnet/dryioc/Manifest
+++ b/dev-dotnet/dryioc/Manifest
@@ -1,2 +1,3 @@
-DIST dryioc-2.1.0-r201512110.tar.gz 6396532 SHA256 2bee8531e586eccfd51f7c9ad8b8069be0fb82fd2efb4b26174e3506422eb182 SHA512 c9011f17b8a19fe81d925ae55d8c724b394644d87b9a7907361e0da3ff59516ce22db323b00e765ca17a21315150e3aec376d06000d1115910704b001e8b968c WHIRLPOOL 2e996a05c179152d72618c26ad79120ffc2c213cea505897e0704b0927e02e63ddb8c4d87d72959d4a0d7c7ecbca2314ca17923946ca139bc144218edabf196e
+DIST dryioc-2.1.0_p201512110-r1.icon.png 24160 SHA256 968f8835ab86a51e7c889fb0268bbf12948ea2e1a2b0d35092a79857b689141e SHA512 4d379f4934c4d6a3ea781d7be45086db0a5301850aaf6f87abbb858e6724644f839216d2236d8ac3e7f9a85915dd1280a2da46d3d752f71ff532920eedc50055 WHIRLPOOL dd530dfcf4705bcd20cf5d32cfb0c87abbc72c4a58ff411ca2718324b6fca8eaad4f35abf07074469b5495f45482e60acbee47f1bc41d162ecf71b0defd34a40
+DIST dryioc-2.1.0_p201512110-r1.tar.gz 6396532 SHA256 2bee8531e586eccfd51f7c9ad8b8069be0fb82fd2efb4b26174e3506422eb182 SHA512 c9011f17b8a19fe81d925ae55d8c724b394644d87b9a7907361e0da3ff59516ce22db323b00e765ca17a21315150e3aec376d06000d1115910704b001e8b968c WHIRLPOOL 2e996a05c179152d72618c26ad79120ffc2c213cea505897e0704b0927e02e63ddb8c4d87d72959d4a0d7c7ecbca2314ca17923946ca139bc144218edabf196e
DIST mono.snk.bz2 785 SHA256 0cc2ca58f90773eafa8460dfb8ff4ac6238b68106eb1631348a800091a6ff3de SHA512 de64da7a9e4fa53e5a5abaee00aae05ce3560c72ad8251fd79e2ff9ffa7fb2d5e7c1a4bdb2dbc2eeeeac6450aaad8c40649ff4675ddf95365ef8604a93333224 WHIRLPOOL 05882dd5cc9e2b99b78dc882fed49547dc6b6c133616574987322623e3bd734dc74435b69a6c864f928eb087df7a1ab42910adc47a7d0e70d54178e6b319f628
diff --git a/dev-dotnet/dryioc/dryioc-2.1.0-r201512110.ebuild b/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
--- a/dev-dotnet/dryioc/files/icon.png
+++ /dev/null
Binary files 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