From 345c02ca33341652116ddec6705530223af2de85 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Aug 2024 12:00:02 +0100 Subject: gentoo auto-resync : 27:08:2024 - 12:00:02 --- media-gfx/povray/Manifest | 2 +- media-gfx/povray/povray-3.7.0.0-r5.ebuild | 151 ----------------------------- media-gfx/povray/povray-3.7.0.0-r6.ebuild | 153 ++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 152 deletions(-) delete mode 100644 media-gfx/povray/povray-3.7.0.0-r5.ebuild create mode 100644 media-gfx/povray/povray-3.7.0.0-r6.ebuild (limited to 'media-gfx/povray') diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest index 1ff931f7be07..2e085d4433f4 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-r5.ebuild 4761 BLAKE2B d6a9668ecb03293ca809607a59891b0bbf2ab0e31d4645f954aebc38aa8a98e2bb3d5690e921a112bf94bf790dbdbb1a4e46e35405452aeeee066ec46c7f592d SHA512 05570bce087c6916c32f0c1f7217e8dfe70538a2fd16feaa0418f8050a4c741a602f5dcabe806f50f39ba01ad314139e604bf5b71165049fcf47aa2294b703d6 +EBUILD povray-3.7.0.0-r6.ebuild 4889 BLAKE2B 7f4d154e0ff8a45ddf6e1d0a69290a1fddadc5bf3c940fa466564df93b7e45af8099d354e3225f08222c7e1f9d904f285d637f2418af9a7714f8a3da4f2bcabc SHA512 4279092dae83534c452f3132a7438ae05e57e1dd1fc30d4064fc290a8ce07356cf3b2c9e1ab0c9570a88633ac7db5499373c71f2a00ca796c3ee08b54e74def7 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be diff --git a/media-gfx/povray/povray-3.7.0.0-r5.ebuild b/media-gfx/povray/povray-3.7.0.0-r5.ebuild deleted file mode 100644 index ea1666fa2b34..000000000000 --- a/media-gfx/povray/povray-3.7.0.0-r5.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 - 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" -S=${WORKDIR}/${PN}-${MY_PV} - -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" - -DEPEND=" - dev-libs/boost:= - media-libs/libjpeg-turbo:= - media-libs/libpng:= - sys-libs/zlib - tiff? ( media-libs/tiff:= ) - X? ( media-libs/libsdl ) -" -RDEPEND="${DEPEND}" -BDEPEND="dev-build/autoconf-archive" - -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() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/859784 - # https://github.com/POV-Ray/povray/issues/458 - # Upstream activity is dead for 3 years now, so don't hold - # your breath for a fix. - append-flags -fno-strict-aliasing - filter-lto - - # 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 - 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() { - 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 -} diff --git a/media-gfx/povray/povray-3.7.0.0-r6.ebuild b/media-gfx/povray/povray-3.7.0.0-r6.ebuild new file mode 100644 index 000000000000..2f37892249f4 --- /dev/null +++ b/media-gfx/povray/povray-3.7.0.0-r6.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + 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" +S=${WORKDIR}/${PN}-${MY_PV} + +# Upstream claims to have CC-BY-NC-SA-2.5 documentation, but it doesn't seem +# to actually be in the sources, so we don't distribute it either. +LICENSE="AGPL-3+ CC-BY-SA-3.0" +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" + +DEPEND=" + dev-libs/boost:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib + tiff? ( media-libs/tiff:= ) + X? ( media-libs/libsdl ) +" +RDEPEND="${DEPEND}" +BDEPEND="dev-build/autoconf-archive" + +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() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/859784 + # https://github.com/POV-Ray/povray/issues/458 + # Upstream activity is dead for 3 years now, so don't hold + # your breath for a fix. + append-flags -fno-strict-aliasing + filter-lto + + # 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 + 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() { + 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 +} -- cgit v1.2.3