[gentoo-commits] proj/sci:master commit in: sci-physics/fullprof-bin/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     0a9d34caa2cf6e943e52c0bc773f567d9d19e209
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Jan 15 19:23:18 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 15 19:23:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a9d34ca

sci-physics/fullprof-bin: version bump, fix fetch, EAPI bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../fullprof-bin/fullprof-bin-2020.09.ebuild       | 44 +++++++++++++++
 .../fullprof-bin/fullprof-bin-20313.04.ebuild      | 65 ----------------------
 2 files changed, 44 insertions(+), 65 deletions(-)

diff --git a/sci-physics/fullprof-bin/fullprof-bin-2020.09.ebuild b/sci-physics/fullprof-bin/fullprof-bin-2020.09.ebuild
new file mode 100644
index 000000000..24bf5b364
--- /dev/null
+++ b/sci-physics/fullprof-bin/fullprof-bin-2020.09.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Crystallographic tools mainly for Rietveld analysis"
+HOMEPAGE="http://www.ill.eu/sites/fullprof/index.html"
+# Does not fetch correctly with wget, we get the index.html file instead
+# their website seems to explicitly not want us to do this so we
+# add RESTRICT="fetch"
+#SRC_URI="https://www.ill.eu/sites/fullprof/downloads/FullProf_Suite_September2020_Linux64.tgz"
+SRC_URI="FullProf_Suite_September2020_Linux64.tgz"
+RESTRICT="fetch"
+
+LICENSE="freedist HPND"
+# There is no clear license specified. But according to Docs/Readme_Fp_Suite.txt
+# those two seem to be appropriate.
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="x11-libs/motif"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/.*"
+
+pkg_nofetch() {
+	einfo "Please access https://www.ill.eu/sites/fullprof/downloads/${SRC_URI} using a browser"
+	einfo "and place the tgz file in your DISTDIR directory."
+}
+
+src_install() {
+	BASEDIR="/opt/fullprof"
+	echo "FULLPROF=\"${BASEDIR}\"" > "${T}"/99fullprof
+	doenvd "${T}"/99fullprof
+
+	dodir "${BASEDIR}"
+	# make symlinks
+	for i in * ; do
+		[[ -x $i && ! -d $i ]] && dosym "../fullprof/${i}" /opt/bin/"${i##*/}"
+	done
+	mv "${S}"/* "${ED}/${BASEDIR}" || die
+}

diff --git a/sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild b/sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild
deleted file mode 100644
index 8a4df4509..000000000
--- a/sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Crystallographic tools mainly for Rietveld analysis"
-HOMEPAGE="http://www.ill.eu/sites/fullprof/index.html"
-SRC_URI="http://www.ill.eu/sites/fullprof/downloads/FullProf_Suite_April2013_Lin.tgz"
-
-LICENSE="freedist HPND"
-# There is no clear license specified. But according to Docs/Readme_Fp_Suite.txt
-# those two seem to be appropriate.
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+doc +examples +X"
-
-RDEPEND="X? ( x11-libs/motif:0 )"
-DEPEND=""
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/.*"
-
-src_install() {
-	BASEDIR="/opt/fullprof"
-	echo "FULLPROF=\"${BASEDIR}\"" > "${T}"/99fullprof
-	doenvd "${T}"/99fullprof
-
-	if ! use examples; then
-		rm -r Examples || die
-	fi
-
-	if ! use doc; then
-		rm -r Docs Html || die
-	else
-		# fix (html) documentation to actually work
-		# as upstream is using inconsistent upper and lower case
-		mv Docs docs || die
-		cd docs || die
-		for i in *.HTM; do
-			mv "$i" "${i,,}" || die
-		done
-		mv "FullProf_Manual.pdf" "Fullprof_Manual.pdf" || die
-		mv "Manual_FullProf_Studio.pdf" "Manual_Fullprof_Studio.pdf" || die
-		mv "FullProf_News.htm" "Fullprof_News.htm" || die
-		for i in FullProf_News_200?.htm; do
-			mv "$i" "${i/FullProf/Fullprof}" || die
-		done
-		cd .. || die
-	fi
-
-	if ! use X; then
-		rm -rf \
-			tfp tfp.set winplotr-2006 check_group cryscal edpcr fp_studio \
-			gbasireps gbond_str gdatared gfourier gfourier.hlp gxlens \
-			powderpat resvis symmcal wfp2k winplotr.* \
-			Fps_Icons || die
-	fi
-
-	dodir "${BASEDIR}"
-	# make symlinks
-	for i in * ; do
-		[[ -x $i && ! -d $i ]] && dosym "../fullprof/${i}" /opt/bin/"${i##*/}"
-	done
-	mv "${S}"/* "${ED}/${BASEDIR}" || die
-}