gentoo auto-resync : 21:07:2024 - 12:30:10

2 files changed, 31 insertions, 31 deletions

diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index fdf8d3afc913..b44d401d4744 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -5,5 +5,5 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r4.ebuild 4744 BLAKE2B 2ae377fe34abc461192a1a6f3f3bffa183bbd72b23c3e675f4dc33adadce5d1a5b07a48646c250f1c8bd9eba8d6a55806bb3cce74892c08c052cfc0842ec7c47 SHA512 1da454f9e9b59aa291dc898b4591a8814aaffac55bad3e9c5383a9760dec0f487ce3833e082107d12177f472eed95f82d90c417865e4789a09266ba3d6d23f5b
+EBUILD povray-3.7.0.0-r5.ebuild 4762 BLAKE2B f58846072b9d4c7b4291e3abd5b4d02419ac96eba86c58e66d56113f08f86ab821efada05cb2416c95402c1d0164a85df6fa7c0a21b40c308d84f333a0da2332 SHA512 353a3f61f39e3e3c107cca3d8d3424374af5dbe4e8360e27a10766bb2b4fb82c433929506b5d1229ffda6b67b5b7841f26ea769e96382ef931889984d0293ba8
 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be
diff --git a/media-gfx/povray/povray-3.7.0.0-r4.ebuild b/media-gfx/povray/povray-3.7.0.0-r5.ebuild
index 1192304ed3d6..7b8e8d9ca6d5 100644
--- a/media-gfx/povray/povray-3.7.0.0-r4.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools eapi7-ver flag-o-matic virtualx
+inherit autotools flag-o-matic virtualx
 
 POVRAY_MAJOR_VER=$(ver_cut 1-3)
 POVRAY_MINOR_VER=$(ver_cut 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
+if [[ -n ${POVRAY_MINOR_VER} ]]; then
 	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
 	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
 else
@@ -18,8 +18,9 @@ DESCRIPTION="The Persistence of Vision Raytracer"
 HOMEPAGE="https://www.povray.org/"
 SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~soap/distfiles/${P}_p20160914-fix-c++14.patch.bz2"
+S=${WORKDIR}/${PN}-${MY_PV}
 
-LICENSE="AGPL-3"
+LICENSE="AGPL-3+ CC-BY-SA-3.0 CC-BY-NC-SA-2.5"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug +io-restrictions tiff X"
@@ -30,12 +31,10 @@ DEPEND="
 	media-libs/libpng:=
 	sys-libs/zlib
 	tiff? ( media-libs/tiff:= )
-	X? ( media-libs/libsdl )"
+	X? ( media-libs/libsdl )
+"
 RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-build/autoconf-archive"
-
-S=${WORKDIR}/${PN}-${MY_PV}
+BDEPEND="dev-build/autoconf-archive"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-user-conf.patch
@@ -107,25 +106,26 @@ src_configure() {
 	# but the code compiles using incorrect [default] paths
 	# (based on /usr/local...), so povray will not find the system
 	# config files without the following fix:
-	append-cppflags -DPOVLIBDIR=\\\""${EROOT}"usr/share/${PN}\\\" -DPOVCONFDIR=\\\""${EROOT}"etc/${PN}\\\"
+	append-cppflags -DPOVLIBDIR=\\\""${EROOT}"/usr/share/${PN}\\\" -DPOVCONFDIR=\\\""${EROOT}"/etc/${PN}\\\"
 
 	# TODO: Restore OpenEXR if upstream start to support OpenEXR 3/imath
-	econf \
-		COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)" \
-		$(use_enable debug) \
-		$(use_enable io-restrictions) \
-		--without-openexr \
-		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
-		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes") \
-		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--without-libmkl \
-		--disable-pipe \
-		--disable-static \
-		--disable-strip \
-		--disable-optimiz \
+	local myeconfargs=(
+		COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)"
+		$(use_enable debug)
+		$(use_enable io-restrictions)
+		--without-openexr
+		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)")
+		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)")
+		$(use_with X x "${EPREFIX}/usr/$(get_libdir)")
+		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes")
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--without-libmkl
+		--disable-pipe
+		--disable-strip
+		--disable-optimiz
 		--disable-optimiz-arch
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
@@ -138,11 +138,11 @@ pkg_preinst() {
 	# This way, they can be treated by CONFIG_PROTECT as normal.
 	local conf_file version_dir
 	for conf_file in "${ED}"/etc/"${PN}"/*; do
-		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(echo "${EROOT}"etc/"${PN}"/* | grep "^[0-9]" | sort -rn); do
-				if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}" || die
-					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
+		if [[ ! -e "${EROOT}/etc/${PN}/${conf_file}" ]]; then
+			for version_dir in $(echo "${EROOT}"/etc/"${PN}"/* | grep "^[0-9]" | sort -rn); do
+				if [ -e "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" ]; then
+					mv "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" "${EROOT}/etc/${PN}" || die
+					elog "Note: ${conf_file} moved from ${EROOT}/etc/povray/${version_dir}/ to ${EROOT}/etc/povray/"
 					break
 				fi
 			done