gentoo resync : 23.09.2020

3 files changed, 25 insertions, 132 deletions

diff --git a/sci-chemistry/raster3d/Manifest b/sci-chemistry/raster3d/Manifest
index 20d6841c24e5..16451dfe6c2f 100644
--- a/sci-chemistry/raster3d/Manifest
+++ b/sci-chemistry/raster3d/Manifest
@@ -1,7 +1,5 @@
 AUX 3.0.2-as-needed.patch 1579 BLAKE2B a9a8290e1d58da904835a3badd11eec07d4a968f81016e30641df917b14edf178c85e4410607b29cf2255fea4b770502a3544729ed6973a53d7470e1de20f8b1 SHA512 2898b55dca4e8d8d353922c36f44a9bb1dece19fa4c1de3f13ea5a09202004c10fbab6c2df2a39b71a65de3f30c19cd2724703b22b7ef978f366c69894761ce9
 AUX 3.0.2-gentoo-prefix.patch 738 BLAKE2B 1d2b11034bf058d45d0c55391b8f297774f2ef09278275f77625a51f965de336ae23009f5f614447483be7aa63f951cb8f435fba9e739a6f9f2d9e4a289bee92 SHA512 5cb22fdff116c6a84a9f570af99062c08463d391cb0460d06e64990eaab2c945e86f0b3f5a378144c49014c0c41dc70cafb102c5feba500c43c8555ce41612a0
-DIST Raster3D_3.0-2.tar 1743034 BLAKE2B 3331d971696f2d95d1b2afe09995a8b5ce5ce7041725f1dd8a5ea27645d1e824956019a1466b60395ac0406d8c055a5052e0a483564777435d7fafda15cad6bb SHA512 f8f73cc91eae521839a9db8ee1a7a9d8727ed510cb574116d89e918480700d844691a6fc3c4a28cb54312b0133cc610422e55d99716803cf3e8bb5d9d934e37f
-DIST Raster3D_3.0-3.tar 1729356 BLAKE2B be933cfb2c4bdc500d2cd221b8d71a01f1f4fab9cc0c70e0f5538363fa53714b6198a78e7cf7dd111dd0242e8537f2fcc38e54a12fc71588250e6ecfc561c0bc SHA512 bd372c4ba8d40db38e19f520883ca71ab7c5ef7a451b67150894e229b45167dfe00b77c19e118afc6abdb9ac07800cc16de5d2dc82c3ef9baa751200490e40fa
-EBUILD raster3d-3.0.2.ebuild 2465 BLAKE2B b451cd2b8590bc6efb717f823183737eebe1bd108fbb2b313a7752a762f213775602182f3ac6878567840083796c7681c900bf4e5d1ec9a0c360f74553a6d683 SHA512 4e8a30469d18f14da0b8258622adaa17c8ac6ff06229dfa59efdf1ec4ba5386c23a594317d059a53d21160d229c17b2fb0db8b8cfc02c36d257230ec641ba9db
-EBUILD raster3d-3.0.3.ebuild 2468 BLAKE2B e336eae62daef4a89526bb9d3f28f3aa040d26ff4f6c7f22b41d2a5601c7ecd314abfaf377a69eedb25c466e267e1f4141a0d4a0af6388b85ce459322f198078 SHA512 3cb278b220520dec632ed9c15c33df8774e4c99b327cd0e895307f9b61c427a8da31d321e27df04985b780957470b739d5202d4d8544c8864ebaeaa50dd0df38
+DIST Raster3D_3.0-6.tar 1729698 BLAKE2B d51b752c189ef720306e78a97e75a8b30c4286b1e75bfa20dd6d8c6e02e3a57d49508faaa1324d8b1f8311049ab3a9b18847bdcb73e7237e3bc91c34fb1ea55b SHA512 656bc19fdef882713c540598173e7f46246b4245f7983edc906fe9fdab7393c47c1687c6e9366987e8af7627d4bfe56a996ff0003aa19872d79724b3e555fdda
+EBUILD raster3d-3.0.6.ebuild 2352 BLAKE2B 873821af6c3823f9ecc459526e5b1933a6147ad4d440f89c2f9c91499fdcaab4da8d766b0f98a4a8304f885ef57e20f709ea9390cbd70650f2263ef2ed6789c6 SHA512 6f8e78b35b631588679429b7495ab3ba1e0c128b1e8d76349cb8604c9fd8ffe6d437761e3936ddd9322b8274f605a2e903464cdba00d293bc7959dad55c8706d
 MISC metadata.xml 459 BLAKE2B c04c6562ba9f56e65d106bcab29b29f5d3000d9ea6270777df8b6d6d90f80c35464d9d1958b991bd23b2f4d946bac4f4486baf74b2b533bd1b43fd131efae52f SHA512 fe5bb2f873ea63f4c7185601842757cb0f791cecd8651fb4e15ea4992898ae60508e4a4c7bc161bddcfa3cf4125577da029b04cf06c900d6269af3f5b63bd916
diff --git a/sci-chemistry/raster3d/raster3d-3.0.2.ebuild b/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
deleted file mode 100644
index a83e43ba57cf..000000000000
--- a/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils fortran-2 flag-o-matic multilib toolchain-funcs versionator prefix
-
-MY_PN="Raster3D"
-MY_PV=$(replace_version_separator 2 -)
-MY_P="${MY_PN}_${MY_PV}"
-
-DESCRIPTION="Generation high quality raster images of proteins or other molecules"
-HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html"
-SRC_URI="http://www.bmsc.washington.edu/${PN}/${MY_P}.tar.gz -> ${MY_P}.tar"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="gd tiff"
-
-RDEPEND="
-	tiff? ( media-libs/tiff:0 )
-	gd? ( media-libs/gd[jpeg,png] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-as-needed.patch \
-		"${FILESDIR}"/${PV}-gentoo-prefix.patch
-
-	sed \
-		-e "s:MYPF:${PF}:" \
-		-e "s:MYLIB:$(get_libdir):g" \
-		-i Makefile.template || \
-		die "Failed to patch makefile.template"
-
-	if ! use gd; then
-		sed \
-			-e "/GDLIBS/s:^:#:g" \
-			-e "/GDDEFS/s:^:#:g" \
-			-i Makefile.template || die
-	fi
-
-	if ! use tiff; then
-		sed \
-			-e "/TLIBS/s:^:#:g" \
-			-e "/TDEFS/s:^:#:g" \
-			-i Makefile.template || die
-	fi
-
-	if [[ $(tc-getFC) =~ gfortran ]]; then
-		append-cflags -Dgfortran
-	fi
-
-	append-fflags -ffixed-line-length-132
-
-	eprefixify Makefile.template
-	cp Makefile.template Makefile.incl || die
-}
-
-src_compile() {
-	local target
-	local i
-
-	if [[ $(tc-getFC) =~ gfortran ]]; then
-		target="linux"
-	else
-		target="linux-$(tc-getFC)"
-	fi
-
-	for i in render.o ${target} all; do
-		emake \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			FFLAGS="${FFLAGS}" \
-			CC="$(tc-getCC)"\
-			FC="$(tc-getFC)" \
-			INCDIRS="-I${EPREFIX}/usr/include" \
-			LIBDIRS="-L${EPREFIX}/usr/$(get_libdir)" \
-			${i}
-	done
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-			bindir="${ED}"/usr/bin \
-			datadir="${ED}"/usr/share/Raster3D/materials \
-			mandir="${ED}"/usr/share/man/man1 \
-			htmldir="${ED}"/usr/share/doc/${PF}/html \
-			examdir="${ED}"/usr/share/Raster3D/examples \
-			install
-
-	dodir /etc/env.d
-	echo -e "R3D_LIB=${EPREFIX}/usr/share/${NAME}/materials" > \
-		"${ED}"/etc/env.d/10raster3d || \
-		die "Failed to install env file."
-}
-
-pkg_postinst() {
-	elog "Add following line:"
-	elog "<delegate decode=\"r3d\" command='\"render\" < \"%i\" > \"%o\"' />"
-	elog "to ${EPREFIX}/usr/$(get_libdir)/ImageMagick-6.5.8/config/delegates.xml"
-	elog "to make imagemagick use raster3d for .r3d files"
-}
diff --git a/sci-chemistry/raster3d/raster3d-3.0.3.ebuild b/sci-chemistry/raster3d/raster3d-3.0.6.ebuild
index 309e0dfc1ba5..eb03d6182a84 100644
--- a/sci-chemistry/raster3d/raster3d-3.0.3.ebuild
+++ b/sci-chemistry/raster3d/raster3d-3.0.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils fortran-2 flag-o-matic multilib toolchain-funcs versionator prefix
+inherit fortran-2 flag-o-matic prefix toolchain-funcs
 
 MY_PN="Raster3D"
-MY_PV=$(replace_version_separator 2 -)
+MY_PV=$(ver_rs 2 -)
 MY_P="${MY_PN}_${MY_PV}"
 
 DESCRIPTION="Generation high quality raster images of proteins or other molecules"
@@ -19,16 +19,19 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gd tiff"
 
 RDEPEND="
-	tiff? ( media-libs/tiff:0 )
-	gd? ( media-libs/gd[jpeg,png] )"
+	gd? ( media-libs/gd[jpeg,png] )
+	tiff? ( media-libs/tiff:0 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/3.0.2-as-needed.patch
+	"${FILESDIR}"/3.0.2-gentoo-prefix.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/3.0.2-as-needed.patch \
-		"${FILESDIR}"/3.0.2-gentoo-prefix.patch
+	default
 
 	sed \
 		-e "s:MYPF:${PF}:" \
@@ -62,14 +65,13 @@ src_prepare() {
 
 src_compile() {
 	local target
-	local i
-
 	if [[ $(tc-getFC) =~ gfortran ]]; then
 		target="linux"
 	else
 		target="linux-$(tc-getFC)"
 	fi
 
+	local i
 	for i in render.o ${target} all; do
 		emake \
 			CFLAGS="${CFLAGS}" \
@@ -85,17 +87,16 @@ src_compile() {
 
 src_install() {
 	emake prefix="${ED}"/usr \
-			bindir="${ED}"/usr/bin \
-			datadir="${ED}"/usr/share/Raster3D/materials \
-			mandir="${ED}"/usr/share/man/man1 \
-			htmldir="${ED}"/usr/share/doc/${PF}/html \
-			examdir="${ED}"/usr/share/Raster3D/examples \
-			install
-
-	dodir /etc/env.d
-	echo -e "R3D_LIB=${EPREFIX}/usr/share/${NAME}/materials" > \
-		"${ED}"/etc/env.d/10raster3d || \
-		die "Failed to install env file."
+		bindir="${ED}"/usr/bin \
+		datadir="${ED}"/usr/share/Raster3D/materials \
+		mandir="${ED}"/usr/share/man/man1 \
+		htmldir="${ED}"/usr/share/doc/${PF}/html \
+		examdir="${ED}"/usr/share/Raster3D/examples \
+		install
+
+	newenvd - 10raster3d <<-EOF
+		R3D_LIB="${EPREFIX}/usr/share/${NAME}/materials"
+	EOF
 }
 
 pkg_postinst() {