gentoo resync : 29.01.2021

3 files changed, 1 insertions, 149 deletions

diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 1ee961644e88..8ade99d481de 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -7,5 +7,4 @@ AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00a
 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-r1.ebuild 4591 BLAKE2B b4f021ddee8d71229d8da5f5c8de887d7b48aacab6ad7d205626a33395e9fdecf34e5f7be52a13dd9823b0a6052e8b99afcae307169b170b9bbca76c3063e381 SHA512 703f21c9dbe850608a50b9b96f1c1ee570a0ecfec4687069623f0543f44305be930453f1063cca5420d5adc1c1e7e3cc5514f2d7c1dfbc28d9bc8e58e7cacf81
-EBUILD povray-3.7.0.0.ebuild 4370 BLAKE2B cc4cc0a86bab78ff481f4ae63c6a522bd34659774c8e6ff1d291da5cdbb3cc82fd191c0e5afd0fe1371169717c6a2b6c83e8fa153772a711c50d65f1d596bfd2 SHA512 f1ff9e45b4b853613e5aeec844f6f7843f77669e8ac432b22e1d8b89a80e9e761a22cd59e3e272425cdfa43a411a41e996ada8b66e809e2e69692ecf574bc5d6
-MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
+MISC metadata.xml 409 BLAKE2B e2a6e08275a5f651f9f01b40d2b65a96ab4e339913a436310ff628c16c4b75c2c760ffd83fc028b4b281c86eb21097f8a4f837b33c44ea86c7c5c179377e824a SHA512 fdd7e78c78ae071ae955489caf83beff36f2db53a85bae66a2660db005bb40ff27a4a34312ea293b319c346f5ed68c55ac488abfd09eece266eb003362a56987
diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml
index a23bbb8953d4..fbb9f48050c7 100644
--- a/media-gfx/povray/metadata.xml
+++ b/media-gfx/povray/metadata.xml
@@ -5,7 +5,6 @@
     <email>sci@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="mkl">Enable support for Intel Vector Math Library, part of sci-libs/mkl</flag>
     <flag name="io-restrictions">POV-Ray's mechanism for control of I/O operations</flag>
   </use>
   <upstream>
diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild
deleted file mode 100644
index 18e8cc6886ce..000000000000
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic multilib versionator virtualx
-
-POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
-POVRAY_MINOR_VER=$(get_version_component_range 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
-	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
-	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
-	MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
-SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug +io-restrictions mkl openexr static-libs tiff X"
-
-DEPEND="
-	>=dev-libs/boost-1.50.0:=[threads(+)]
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/jpeg
-	mkl? ( sci-libs/mkl )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr )
-	tiff? ( media-libs/tiff:0 )
-	X? ( media-libs/libsdl )"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	sys-devel/boost-m4"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-user-conf.patch
-	"${FILESDIR}"/${P}-boost-1.50.patch
-	"${FILESDIR}"/${P}-automagic.patch
-	)
-
-src_prepare() {
-	[[ ${CHOST} == *-darwin* ]] && \
-		PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch )
-
-	cd unix || die
-	bash -x prebuild.sh || die
-	cd .. || die
-	rm -rf libraries || die
-
-	# Change some destination directories that cannot be adjusted via configure
-	sed \
-		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
-		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
-		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
-		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
-		-i configure.ac || die
-
-	sed \
-		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
-		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
-		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
-		-e 's:mkdir_p:MKDIR_P:g' \
-		-i Makefile.am || die
-
-	# The "+p" option on the test command line causes a pause and
-	# prompts the user to interact, so remove it.
-	sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
-
-	autotools-utils_src_prepare
-}
-
-_src_compile() {
-	einfo "${LDFLAGS}"
-	autotools-utils_src_compile LDFLAGS="${LDFLAGS}"
-}
-
-src_configure() {
-	local non_redist_conf
-
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	# The config files are installed correctly (e.g. povray.conf),
-	# 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}\\\"
-
-	if ! use tiff ; then
-		non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
-	else
-		non_redist_conf=""
-	fi
-
-	local myeconfargs=(
-		${non_redist_conf}
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`"
-		$(use_enable debug)
-		$(use_enable io-restrictions)
-		$(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with mkl libmkl "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with X x "${EPREFIX}/usr/$(get_libdir)")
-		--disable-pipe
-		--disable-strip
-		--disable-optimiz
-		--disable-optimiz-arch
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	# For the beta releases, we generate a license extension in case needed
-	VIRTUALX_COMMAND="autotools-utils_src_test"
-	virtualmake
-}
-
-pkg_preinst() {
-	# Copy the old config files if they are in the old location
-	# but do not yet exist in the new location.
-	# This way, they can be treated by CONFIG_PROTECT as normal.
-	for conf_file in $(ls "${ED}/etc/${PN}"); do
-		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(ls "${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}"
-					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
-					break
-				fi
-			done
-		fi
-	done
-}