media-gfx/povray: Version Bump; fixes compilation problems with boost, #461542

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 244 insertions, 7 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 7f8173199ae6..5e384da2f7f4 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,13 @@
 # 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.144 2013/03/05 01:34:02 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.145 2013/03/14 07:53:14 jlec Exp $
+
+*povray-3.7.0_rc7 (14 Mar 2013)
+
+  14 Mar 2013; Justin Lecher <jlec@gentoo.org> +povray-3.7.0_rc7.ebuild,
+  +files/povray-3.7.0_rc7-boost-1.50.patch,
+  +files/povray-3.7.0_rc7-user-conf.patch, metadata.xml:
+  Version Bump; fixes compilation problems with boost, #461542
 
   05 Mar 2013; Christoph Junghans <ottxor@gentoo.org>
   +files/povray-3.7.0_rc6-darwin-defaults.patch, povray-3.7.0_rc3.ebuild,
diff --git a/media-gfx/povray/files/povray-3.7.0_rc7-boost-1.50.patch b/media-gfx/povray/files/povray-3.7.0_rc7-boost-1.50.patch
new file mode 100644
index 000000000000..ced8996cc927
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0_rc7-boost-1.50.patch
@@ -0,0 +1,68 @@
+Index: povray-3.7.0.RC5/configure.ac
+===================================================================
+--- povray-3.7.0.RC5.orig/configure.ac
++++ povray-3.7.0.RC5/configure.ac
+@@ -54,8 +54,6 @@ AC_CONFIG_SRCDIR([unix/disp_text.cpp])
+ m4_include([unix/config/acx_pthread.m4])
+ m4_include([unix/config/ax_arg_enable.m4])
+ m4_include([unix/config/ax_arg_with.m4])
+-m4_include([unix/config/ax_boost_base.m4])
+-m4_include([unix/config/ax_boost_thread.m4])
+ m4_include([unix/config/ax_test_compiler_flags.m4])
+ m4_include([unix/config/ax_check_lib.m4])
+ m4_include([unix/config/ax_check_libjpeg.m4])
+@@ -165,6 +163,7 @@ AC_CANONICAL_HOST
+ 
+ AM_INIT_AUTOMAKE([1.9 dist-bzip2])
+ AM_MAINTAINER_MODE
++LT_INIT
+ 
+ AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"])
+ AX_FIX_INCORRECT_PATH(CPLUS_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path CPLUS_INCLUDE_PATH"])
+@@ -295,28 +294,15 @@ LIBS="$LIBS $PTHREAD_CFLAGS $PTHREAD_LIB
+ 
+ # Boost; required library
+ # the following macro stops with error when boost is not found
+-AX_BOOST_BASE([$required_libboost_version])
+-AX_BOOST_THREAD
+-if test x"$ax_cv_boost_thread" != x"yes"; then
++BOOST_REQUIRE([$required_libboost_version])
++BOOST_THREADS
++if test x"$boost_cv_lib_thread" != x"yes"; then
+   AC_MSG_ERROR([cannot find a suitable boost thread library])
+ else
+   CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"  # append
+-  LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"     # append
+-  LIBS="$BOOST_THREAD_LIB $LIBS"
++  LDFLAGS="$LDFLAGS -L$BOOST_LDPATH"     # append
++  LIBS="$BOOST_THREAD_LIBS $LIBS"
+ fi
+-AC_MSG_CHECKING([whether the boost thread library is usable])
+-AC_RUN_IFELSE(
+-  [AC_LANG_PROGRAM([[
+-#include <boost/thread/thread.hpp>
+-    ]],
+-    [[boost::defer_lock_t(); return 0;]])],
+-  [AC_MSG_RESULT([yes])],
+-  [
+-    AC_MSG_RESULT([no])
+-    AC_MSG_FAILURE([cannot link with the boost thread library])
+-  ],
+-  [AC_MSG_RESULT([cross-compiling])]  # FIXME
+-)
+ AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.])
+ 
+ # Intel Math Kernel library
+Index: povray-3.7.0.RC5/vfe/unix/platformbase.cpp
+===================================================================
+--- povray-3.7.0.RC5.orig/vfe/unix/platformbase.cpp
++++ povray-3.7.0.RC5/vfe/unix/platformbase.cpp
+@@ -126,7 +126,7 @@ namespace pov_base
+ #else
+ 		// taken from source/base/timer.cpp
+ 		boost::xtime t;
+-		boost::xtime_get(&t, boost::TIME_UTC);
++		boost::xtime_get(&t, POV_TIME_UTC);
+ 		POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
+ 		t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
+ 		t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
diff --git a/media-gfx/povray/files/povray-3.7.0_rc7-user-conf.patch b/media-gfx/povray/files/povray-3.7.0_rc7-user-conf.patch
new file mode 100644
index 000000000000..b3c279fcdeff
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0_rc7-user-conf.patch
@@ -0,0 +1,27 @@
+ Makefile.am |   13 -------------
+ 1 files changed, 0 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 76b394c..9822c52 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -107,19 +107,6 @@ install-data-local:
+ 	for f in $$filelist ; do \
+ 	  $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
+ 	done
+-	@echo "Creating user directories..."; \
+-	for p in $(povuser) $(povconfuser) ; do \
+-	  $(MKDIR_P) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
+-	done
+-	@echo "Copying user configuration and INI files..."; \
+-	for f in povray.conf povray.ini ; do \
+-	  if test -f $(povconfuser)/$$f; then \
+-	    echo "Creating backup of $(povconfuser)/$$f"; \
+-	    mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
+-	  fi; \
+-	done; \
+-	$(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
+-	$(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
+ 
+ # Remove data, config, and empty folders for 'make uninstall'.
+ # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml
index 377b2a0830bb..745a3fe46b0e 100644
--- a/media-gfx/povray/metadata.xml
+++ b/media-gfx/povray/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>sci@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="mkl">Enable support for Intel Vector Math Library, part of sci-libs/mkl</flag>
-	</use>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="mkl">Enable support for Intel Vector Math Library, part of sci-libs/mkl</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-gfx/povray/povray-3.7.0_rc7.ebuild b/media-gfx/povray/povray-3.7.0_rc7.ebuild
new file mode 100644
index 000000000000..6787e8933b4b
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_rc7.ebuild
@@ -0,0 +1,135 @@
+# 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_rc7.ebuild,v 1.1 2013/03/14 07:53:14 jlec Exp $
+
+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="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="povlegal-3.6"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~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
+	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}"/${PN}-3.7.0_rc5-automagic.patch
+	)
+
+src_prepare() {
+	[[ ${CHOST} == *-darwin* ]] && \
+		PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.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' \
+		-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_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_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
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	# For the beta releases, we generate a license extension in case needed
+	VIRTUALX_COMMAND="autotools-utils_src_test"
+	POVRAY_BETA=$(./unix/povray --betacode 2>&1) 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
+}