Gentoo Archives: gentoo-commits

From: Mikhail Pukhlikov <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/slntools/, dev-util/mono-packaging-tools/
Date: Wed, 24 Aug 2016 06:51:08
Message-Id: 1471959955.8f8e8bb0ca74c3d252f9c4d7d8f96ea3b40df613.cynede@gentoo
1 commit: 8f8e8bb0ca74c3d252f9c4d7d8f96ea3b40df613
2 Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 23 13:45:55 2016 +0000
4 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 23 13:45:55 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=8f8e8bb0
7
8 EAPI bump
9
10 .../slntools/slntools-1.1.3_p201508170-r1.ebuild | 24 +++++++++-------------
11 .../mono-packaging-tools-0.1.2_p201608183.ebuild | 2 +-
12 .../mono-packaging-tools-0.1.3_p2016082301.ebuild | 2 +-
13 3 files changed, 12 insertions(+), 16 deletions(-)
14
15 diff --git a/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild b/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
16 index c9c1725..15674ce 100644
17 --- a/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
18 +++ b/dev-dotnet/slntools/slntools-1.1.3_p201508170-r1.ebuild
19 @@ -1,15 +1,16 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 -EAPI=5
26 -inherit dotnet
27 +EAPI=6
28 +inherit dotnet gac
29
30 NAME="slntools"
31 HOMEPAGE="https://github.com/ArsenShnurkov/${NAME}"
32
33 EGIT_COMMIT="705869e96a2f0e401be03f8e8478df3e1f2b9373"
34 SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${PF}.zip"
35 +RESTRICT="mirror"
36 S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
37
38 SLOT=0
39 @@ -27,17 +28,7 @@ S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
40 SLN_FILE=SLNTools.sln
41 METAFILETOBUILD="${S}/Main/${SLN_FILE}"
42
43 -src_unpack()
44 -{
45 - # /usr/portage/distfiles/csquery-1.3.5.200.zip
46 - # /var/tmp/portage/dev-dotnet/csquery-1.3.5.200-r20150522/work/CsQuery-696ac0533a3e665a34cdc4050d1f46e91f5a3356
47 - default
48 -}
49 -
50 src_prepare() {
51 -
52 - default
53 -
54 epatch "${FILESDIR}/remove-wix-project-from-sln-file.patch"
55
56 # System.EntryPointNotFoundException: GetStdHandle
57 @@ -48,7 +39,10 @@ src_prepare() {
58 # http://stackoverflow.com/questions/23824961/c-sharp-to-mono-getconsolewindow-exception
59 epatch "${FILESDIR}/console-window-width.patch"
60
61 - nuget restore "${METAFILETOBUILD}" || die
62 + # no need to restore if all dependencies are from GAC
63 + # nuget restore "${METAFILETOBUILD}" || die
64 +
65 + default
66 }
67
68 src_compile() {
69 @@ -100,6 +94,8 @@ src_install() {
70
71 make_wrapper slntools "mono /usr/share/slntools/SLNTools.exe"
72
73 + egac-install Main/SLNTools.exe/bin/${DIR}/CWDev.SLNTools.Core.dll
74 +
75 if use nupkg; then
76 if [ -d "/var/calculate/remote/distfiles" ]; then
77 # Control will enter here if the directory exist.
78
79 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
80 index 0ce32a9..d0d45e4 100644
81 --- a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild
82 +++ b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.2_p201608183.ebuild
83 @@ -25,7 +25,7 @@ COMMON_DEPENDENCIES=">=dev-lang/mono-4.2
84 >=dev-dotnet/eto-parse-1.4.0[gac]
85 "
86 DEPEND="${COMMON_DEPENDENCIES}
87 - "
88 + sys-apps/sed"
89 RDEPEND="${COMMON_DEPENDENCIES}
90 "
91
92
93 diff --git a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
94 index 300e2d2..44ae86b 100644
95 --- a/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
96 +++ b/dev-util/mono-packaging-tools/mono-packaging-tools-0.1.3_p2016082301.ebuild
97 @@ -39,7 +39,7 @@ COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )
98 >=dev-dotnet/eto-parse-1.4.0[gac]
99 "
100 DEPEND="${COMMON_DEPENDENCIES}
101 - "
102 + sys-apps/sed"
103 RDEPEND="${COMMON_DEPENDENCIES}
104 "