From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D901915808C for ; Tue, 15 Feb 2022 19:51:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3252DE0849; Tue, 15 Feb 2022 19:51:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F218DE0849 for ; Tue, 15 Feb 2022 19:51:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 345B934312A for ; Tue, 15 Feb 2022 19:51:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D72312EB for ; Tue, 15 Feb 2022 19:51:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1644954610.5d2f32df6d14ef3b47278e59ab39fd4df1d3eba8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/povray/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/povray/povray-3.7.0.0-r2.ebuild X-VCS-Directories: media-gfx/povray/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5d2f32df6d14ef3b47278e59ab39fd4df1d3eba8 X-VCS-Branch: master Date: Tue, 15 Feb 2022 19:51:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f229abc0-28c8-4f82-bb3f-ac9c88b35e2d X-Archives-Hash: 1456a78aeb19991d5af3dcaa5f640edb commit: 5d2f32df6d14ef3b47278e59ab39fd4df1d3eba8 Author: Sam James gentoo org> AuthorDate: Sat Feb 12 21:02:22 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 15 19:50:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2f32df media-gfx/povray: drop OpenEXR support - No activity upstream involving this, it seems - Fedora don't seem to be patching it but it doesn't seem to work here (silently ignored during build) - No reverse dependencies Bug: https://bugs.gentoo.org/833158 Signed-off-by: Sam James gentoo.org> media-gfx/povray/povray-3.7.0.0-r2.ebuild | 143 ++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/media-gfx/povray/povray-3.7.0.0-r2.ebuild b/media-gfx/povray/povray-3.7.0.0-r2.ebuild new file mode 100644 index 000000000000..3e4c29a04a3e --- /dev/null +++ b/media-gfx/povray/povray-3.7.0.0-r2.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic 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="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" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug +io-restrictions tiff X" + +DEPEND=" + >=dev-libs/boost-1.50.0:=[threads(+)] + media-libs/libpng:0 + sys-libs/zlib + virtual/jpeg:0 + tiff? ( media-libs/tiff:0 ) + X? ( media-libs/libsdl )" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} + sys-devel/autoconf-archive" + +S=${WORKDIR}/${PN}-${MY_PV} + +PATCHES=( + "${FILESDIR}"/${P}-user-conf.patch + "${FILESDIR}"/${P}-automagic.patch + "${WORKDIR}"/${P}_p20160914-fix-c++14.patch + "${FILESDIR}"/${P}-gcc6-openexr.patch +) + +src_prepare() { + [[ ${CHOST} == *-darwin* ]] && \ + PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch ) + eapply "${FILESDIR}"/${P}-r1-boost-1.50.patch + + pushd unix &>/dev/null || die + pushd config &>/dev/null || die + rm -rf \ + acx_pthread.m4 \ + ax_boost_base.m4 \ + ax_boost_thread.m4 \ + ax_compare_version.m4 \ + ax_compiler_vendor.m4 \ + ax_compiler_version.m4 || die + popd &>/dev/null || die + bash -x prebuild.sh || die + popd &>/dev/null || die + + rm -rf libraries || die + + # Change some 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' \ + -e 's:"/usr/include":"'${EPREFIX}'/usr/include":' \ + -e 's:"/usr/lib":"'${EPREFIX}'/usr/'$(get_libdir)'":' \ + -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 + default + + eautoreconf +} + +src_configure() { + # 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}\\\" + + # 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 \ + --disable-optimiz-arch +} + +src_test() { + virtx default +} + +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. + 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/" + break + fi + done + fi + done +}