From b62381b18b4bf2e919cbfbae11ebcad391e38e77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Dec 2022 03:35:12 +0000 Subject: gentoo auto-resync : 16:12:2022 - 03:35:12 --- media-gfx/povray/Manifest | 2 +- media-gfx/povray/povray-3.7.0.0-r2.ebuild | 143 ------------------------------ media-gfx/povray/povray-3.7.0.0-r4.ebuild | 143 ++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 144 deletions(-) delete mode 100644 media-gfx/povray/povray-3.7.0.0-r2.ebuild create mode 100644 media-gfx/povray/povray-3.7.0.0-r4.ebuild (limited to 'media-gfx/povray') diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest index 540f0723d49b..85c32d239db1 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-r2.ebuild 4475 BLAKE2B 49adb8ecb25491e20a183fb7483fb1741b478f0daa326edd6a5fb83acfa76789f4607d6c51362860ae11e9fb2723a57dff4138943fc78b6698f6c68926e15b39 SHA512 590e8c69ed935192ef2763a4c36ca8cf57ed7a08ce7a149689b30e6d691b0bc331f0956d354914cca17b5d32873145803377f961e87508187be9174442f68115 +EBUILD povray-3.7.0.0-r4.ebuild 4487 BLAKE2B 7dc74dadc1a8dd110e4da8a5bf06de00517cdc532a2fccc19e58e902caa24a108db8fa8e43f54371426d6ccd5af2a8885efe1a8fea2ef6b048822cf639f3792d SHA512 9ef0421d30fa168326022c4610fd9e3c6297d0ee3b7a039a8c0c0fc650db274fd632649dedb602fd3aa25c85989366e677457a1ae7cce5bb594bd64a6bec8fa6 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be diff --git a/media-gfx/povray/povray-3.7.0.0-r2.ebuild b/media-gfx/povray/povray-3.7.0.0-r2.ebuild deleted file mode 100644 index 23510219e5bc..000000000000 --- a/media-gfx/povray/povray-3.7.0.0-r2.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eapi7-ver 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" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 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/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 -} diff --git a/media-gfx/povray/povray-3.7.0.0-r4.ebuild b/media-gfx/povray/povray-3.7.0.0-r4.ebuild new file mode 100644 index 000000000000..71132b8b773e --- /dev/null +++ b/media-gfx/povray/povray-3.7.0.0-r4.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 eapi7-ver 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" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 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}" +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 +} -- cgit v1.2.3