diff options
author | Christoph Junghans <ottxor@gentoo.org> | 2013-03-04 19:08:37 +0000 |
---|---|---|
committer | Christoph Junghans <ottxor@gentoo.org> | 2013-03-04 19:08:37 +0000 |
commit | 307cc1c2c24e3967302f6b5241df60749b886b47 (patch) | |
tree | 2cf206fa0c7e01a7c1790596d9265c88c9cbd53c /media-gfx/povray | |
parent | version bump (diff) | |
download | gentoo-2-307cc1c2c24e3967302f6b5241df60749b886b47.tar.gz gentoo-2-307cc1c2c24e3967302f6b5241df60749b886b47.tar.bz2 gentoo-2-307cc1c2c24e3967302f6b5241df60749b886b47.zip |
fixed build with boost-1.52 (bug #460238), also broken intermediate version
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'media-gfx/povray')
-rw-r--r-- | media-gfx/povray/ChangeLog | 6 | ||||
-rw-r--r-- | media-gfx/povray/povray-3.7.0_rc3.ebuild | 8 | ||||
-rw-r--r-- | media-gfx/povray/povray-3.7.0_rc5-r1.ebuild | 125 |
3 files changed, 11 insertions, 128 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog index 55a8f7cd3bed..6a0ca3ba4fd8 100644 --- a/media-gfx/povray/ChangeLog +++ b/media-gfx/povray/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/povray # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.142 2013/03/02 00:49:41 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.143 2013/03/04 19:08:37 ottxor Exp $ + + 04 Mar 2013; Christoph Junghans <ottxor@gentoo.org> + -povray-3.7.0_rc5-r1.ebuild, povray-3.7.0_rc3.ebuild: + fixed build with boost-1.52 (bug #460238), also broken intermediate version 02 Mar 2013; Christoph Junghans <ottxor@gentoo.org> povray-3.7.0_rc6.ebuild: added epatch_user to src_prepare diff --git a/media-gfx/povray/povray-3.7.0_rc3.ebuild b/media-gfx/povray/povray-3.7.0_rc3.ebuild index fe8566cae1cd..1047452359a4 100644 --- a/media-gfx/povray/povray-3.7.0_rc3.ebuild +++ b/media-gfx/povray/povray-3.7.0_rc3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.10 2011/11/17 17:02:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.11 2013/03/04 19:08:37 ottxor Exp $ EAPI="3" @@ -78,6 +78,10 @@ src_configure() { append-flags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" append-flags -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\" + #460238, included in the patch for povray-3.7.0_rc6 + has_version ">=dev-libs/boost-1.52" && \ + append-flags "-lboost_system" "-lboost_date_time" "-DTIME_UTC=TIME_UTC_" + if ! use tiff ; then non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes" else diff --git a/media-gfx/povray/povray-3.7.0_rc5-r1.ebuild b/media-gfx/povray/povray-3.7.0_rc5-r1.ebuild deleted file mode 100644 index 656610b4c13c..000000000000 --- a/media-gfx/povray/povray-3.7.0_rc5-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc5-r1.ebuild,v 1.7 2012/12/30 16:34:56 armin76 Exp $ - -EAPI=4 - -inherit autotools eutils flag-o-matic versionator multilib - -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="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV}.tar.gz" - -LICENSE="povlegal-3.6" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="debug mkl openexr tiff X" - -DEPEND=" - >=dev-libs/boost-1.50.0[threads(+)] - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg - openexr? ( - media-libs/ilmbase - media-libs/openexr ) - mkl? ( sci-libs/mkl ) - tiff? ( media-libs/tiff:0 ) - X? ( media-libs/libsdl )" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - sys-devel/boost-m4" - -S=${WORKDIR}/${PN}-${MY_PV} - -src_prepare() { - epatch \ - "${FILESDIR}"/3.7.0_rc3-user-conf.patch \ - "${FILESDIR}"/${P}+boost-1.50.patch \ - "${FILESDIR}"/${P}-automagic.patch - - # 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' \ - -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 - - eautoreconf -} - -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 - - econf \ - ${non_redist_conf} \ - COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \ - $(use_enable debug) \ - $(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-strip \ - --disable-optimiz \ - --disable-optimiz-arch -} - -src_test() { - # For the beta releases, we generate a license extension in case needed - POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check -} - -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 -} |