From 623d9c3069f16a2423fe862e51cd60f3e06309dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
Date: Sat, 11 Dec 2021 01:56:05 +0100
Subject: [PATCH] dev-lang/dafny: fixes; regen Manifest; z3 4.8.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
 dev-lang/dafny/Manifest                       |  2 +-
 ...fny-3.3.0.ebuild => dafny-3.3.0-r1.ebuild} | 55 ++++++++++++-------
 2 files changed, 36 insertions(+), 21 deletions(-)
 rename dev-lang/dafny/{dafny-3.3.0.ebuild => dafny-3.3.0-r1.ebuild} (52%)

diff --git a/dev-lang/dafny/Manifest b/dev-lang/dafny/Manifest
index 189398e..66df14e 100644
--- a/dev-lang/dafny/Manifest
+++ b/dev-lang/dafny/Manifest
@@ -1 +1 @@
-DIST dafny-3.3.0.tar.gz 3413584 BLAKE2B 5d9cd2da9559cbc5584fe9c6dccf0773ba7b981f3708dc8695907243d647e34ad43ed89fb64a95f9b646209d5f963ca0dd287764d3b7ae89335c8fbb50091eac SHA512 1a9af37a1826176f369e1c732e561bfa1e10a5b1fe7c0b61d7e64754052b806f776e70c40080c93cde4a47a7cb9f9e208899d77be88104606d833f77abd160ab
+DIST dafny-3.3.0.tar.gz 3719703 BLAKE2B a5eba706dd592f2bcff83b73fd650c429d71200bb65d9d5db74642640e2d7deb1ed0cb282cd36fa11f0a30357ce6296c867dd712183b64782c222041e0a72378 SHA512 ca8b37fac3620e5732677cf09ca8699823b84485b37dabd60fd0307b03b761c0ef90d7526a6599b1360337e6405c33fc2ecbe599a8a9a38476885a3fdae55977
diff --git a/dev-lang/dafny/dafny-3.3.0.ebuild b/dev-lang/dafny/dafny-3.3.0-r1.ebuild
similarity index 52%
rename from dev-lang/dafny/dafny-3.3.0.ebuild
rename to dev-lang/dafny/dafny-3.3.0-r1.ebuild
index 8e04130..950fe30 100644
--- a/dev-lang/dafny/dafny-3.3.0.ebuild
+++ b/dev-lang/dafny/dafny-3.3.0-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-DOTNET_FRAMEWORK="5.0"
+DOTNET_V=5.0
+DOTNET=net${DOTNET_V}
 
 DESCRIPTION="Verification-aware programming language"
 HOMEPAGE="https://dafny-lang.github.io/dafny/"
@@ -12,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dafny-lang/${PN}.git"
 else
-	SRC_URI="https://github.com/dafny-lang/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/dafny-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -20,18 +21,22 @@ fi
 RESTRICT="network-sandbox test"
 LICENSE="MIT"
 SLOT="0"
-IUSE="debug"
+IUSE="debug doc"
 
-BDEPEND="
-	|| ( dev-java/gradle-bin dev-java/gradle )
-"
 DEPEND="
 	>=virtual/jdk-1.8.0:*
-	virtual/dotnet-sdk:${DOTNET_FRAMEWORK}
+	virtual/dotnet-sdk:${DOTNET_V}
 "
 RDEPEND="
 	${DEPEND}
-	sci-mathematics/z3
+	~sci-mathematics/z3-4.8.5
+"
+BDEPEND="
+	|| ( dev-java/gradle-bin dev-java/gradle )
+	doc? (
+		dev-texlive/texlive-xetex
+		|| ( app-text/pandoc app-text/pandoc-bin )
+	)
 "
 
 DAFNY_EXES="
@@ -43,36 +48,46 @@ DAFNY_EXES="
 QA_PREBUILT="${DAFNY_EXES}"
 
 src_prepare() {
-	if use debug; then
-		DOTNET_CONFIGURATION="Debug"
+	unset _JAVA_OPTIONS
+	export GRADLE_USER_HOME="${HOME}/.gradle"
+
+	if use debug ; then
+		DOTNET_CONFIGURATION=Debug
 	else
-		DOTNET_CONFIGURATION="Release"
+		DOTNET_CONFIGURATION=Release
 	fi
 	export DOTNET_CONFIGURATION
-	einfo "DOTNET_CONFIGURATION=${DOTNET_CONFIGURATION}"
+	einfo "DOTNET_CONFIGURATION: ${DOTNET_CONFIGURATION}"
 
 	default
 }
 
 src_configure() {
-	dotnet restore --no-cache ./Source/Dafny.sln ||
-		die "dotnet restore filed"
+	ebegin "Restoring"
+	dotnet restore --no-cache ./Source/Dafny.sln
+	eend $? || die "dotnet restore filed"
 }
 
 src_compile() {
-	dotnet build --configuration "${DOTNET_CONFIGURATION}" ./Source/Dafny.sln ||
-		die "dotnet build failed"
+	ebegin "Building"
+	dotnet build --configuration "${DOTNET_CONFIGURATION}" ./Source/Dafny.sln
+	eend $? || die "dotnet build failed"
+
+	use doc && emake -j1 refman-release
 }
 
 src_install() {
 	insinto /usr/share/${PN}
-	doins -r ./Binaries/net${DOTNET_FRAMEWORK}/*
+	doins -r ./Binaries/${DOTNET}/*
 
 	local exe
-	for exe in ${DAFNY_EXES}; do
-		# fix permissions (make executable)
+	for exe in ${DAFNY_EXES} ; do
 		fperms +x "/${exe}"
-		# create symlinks to bin (also convert to a lowercase name)
 		dosym "../../${exe}" "/usr/bin/$(basename "${exe,,}")"
+		dosym "../../${exe}" "/usr/bin/$(basename "${exe}")"
 	done
+
+	dodoc *.md *.txt
+
+	use doc && dodoc docs/DafnyRef/DafnyRef.pdf
 }