Remove USE="mkl" from -r0 for stabilization.

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

4 files changed, 147 insertions, 14 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index e5b6624ae9b3..f0ca2eef32ea 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/povray
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.117 2011/10/19 13:06:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.118 2011/10/21 16:40:19 ssuominen Exp $
+
+*povray-3.7.0_rc3-r1 (21 Oct 2011)
+
+  21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> povray-3.7.0_rc3.ebuild,
+  +povray-3.7.0_rc3-r1.ebuild:
+  Remove USE="mkl" from -r0 for stabilization.
 
   19 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> povray-3.7.0_rc3.ebuild:
   amd64 stable wrt #384823
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index aacd02367349..5907f09e4256 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -13,17 +13,18 @@ DIST povray-3.7.0.beta.40.tar.bz2 6537405 RMD160 fe7e0a45841da63e50cdc1af80d489c
 EBUILD povray-3.6.1-r4.ebuild 2838 RMD160 9b0068283d41384f0c80301fd459a139326c476d SHA1 67f7511292d3bc5eac2fe648b7ab5765dc32f17b SHA256 d7df0977d7bad8ae35fa3bcc18c61eeee8cacd77ca0c5a1851765433995c7d2d
 EBUILD povray-3.6.1-r6.ebuild 2867 RMD160 ab807be92381ce9c8e6cf7fc6ab9d48d82bd29d3 SHA1 16af311291fdcda48c8c92c005472bf5dd665253 SHA256 e0a94f160bddf812f5a88117696de91c1ff5e93ded63c720ad69dcd04f453b9b
 EBUILD povray-3.7.0_beta40.ebuild 4565 RMD160 da47c98a9df0281de7ffebfd8972aa13a1b81f37 SHA1 d9a921cdb5d737323bc595a272576c64c92370c7 SHA256 6adef09064fda79fcd367cfc6e4c042339bfb0bd4396fe772c6e5ccd62c8005d
-EBUILD povray-3.7.0_rc3.ebuild 3890 RMD160 a01bc735756dc5dc8a1ced3aa7426634bac21cd3 SHA1 7abff3f7b87ace78110761aa1098347ae7fdcfe4 SHA256 b6fbb64a148e4a1201868098df2c53c4ab928cc01a64359fb3a67cdd8725dcf3
-MISC ChangeLog 18167 RMD160 73337106891e247577a81d7a8f5916da2a2a17aa SHA1 281a725ec57107fdcaddfb371c5a2fcad05625d8 SHA256 23b9b6d912d45feccd6e626f1554362c6f82e37dcd18fb7125f9cd1d53a4206e
+EBUILD povray-3.7.0_rc3-r1.ebuild 3895 RMD160 74e171153561ec25c8c557abb25e0b7d2951bb4e SHA1 a6645687c801b799ba1b5cc051d0915179c286b4 SHA256 c6dcbca2cb6e73d647e210c73d088fc19315e92f6278466eb53c4508dc0686b2
+EBUILD povray-3.7.0_rc3.ebuild 3857 RMD160 2983454f47234ba9695e8dff09ba756e256f4f42 SHA1 16c8359589143264c34a62f193bcb7a72c37633d SHA256 3f824eb33d420e2e5d1473d8ed04267e2c74a5a05db07560d3253bdf9575a29e
+MISC ChangeLog 18361 RMD160 d7d381d07603904a3410367fbe8f695f740a8669 SHA1 b5b721e4303917b8f2541a25c3c6eae1415fe677 SHA256 ad869c85c6a6042131767cb42240ce9863b28bc39f7bd76be2349186d05bedcb
 MISC metadata.xml 308 RMD160 d08b61ccd3d1cae104067bbcb17e469eb6423e93 SHA1 55e0b28ec41eb401a55228d23fcb85ecd5bc892b SHA256 b4065642735e0016ff85663e8429d2d0953b975ffc1edebfa489444e3b0c8c7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOnstRAAoJEEdUh39IaPFNt6UH/iO6a9j5I4AJvmq8q8+c1gbK
-Aqwy1W+5nIENXOE6IgkbM8eB18T0lMkzna2GIlIFRsZYqfAAgOVY1rAbETiGsNs6
-c7vrUVYPkdcX0+LNvaH7VLvJFC7MLOOgCf0Jm3k8I1rgUJT7McqVRGbJMZCXShod
-dACyCqCMUH6xVWPs9KNpxKqVdb4NsZbsOQt0UkZQF0gXW/95v1QQdsDgQJmZuyuE
-U4Q6g0mkmbt/6fBD8kcwQvZF2S3HpmngPEvmCsc2qr9ILbkmD4oTTjrAF4UR5Ehy
-LOZcibPZNp8mqorb3WDQjyT9h1AsM11YgKrB7D/oAF0S1r0GBpK22gJcJRbyIh8=
-=ZMLz
+iQEcBAEBAgAGBQJOoaBQAAoJEEdUh39IaPFNIFMH/RxE6KDNOS3zMhJ4cXyW8xxh
+/i/oVwNDGzvZUXqmve8M98UevdvYfY/vcNq0H1tuAT3lCTucpDxjNAPqMzLt/so3
+C9km6d1pNkx7QsN/omGQQyaUpdjloBrYWVGtIuepUErIkMCSj/Mb7UqXkOo0+szn
+pm6qVb2e5aMqExPIWCVz4vRtFS65nqD2hJ3alKiRuidpj/LEf6xUEoZpq1wxDC2W
+PkYwu5/kgTXZ9Pf+xmcxzGnaSNC8J00ucia05KTfAa87OhdZRxIGE9Pf/0Vnm27P
+N5/LHIrtXdLy3G+0sBfopHEMQZ1BG4e2dEIONxCrkTcHT4AL3hx4qbZ+fYBB9/0=
+=73m5
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/povray/povray-3.7.0_rc3-r1.ebuild b/media-gfx/povray/povray-3.7.0_rc3-r1.ebuild
new file mode 100644
index 000000000000..b1fe55087e17
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_rc3-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/10/21 16:40:19 ssuominen Exp $
+
+EAPI="3"
+
+inherit autotools eutils flag-o-matic versionator
+
+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 ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug mkl openexr tiff X"
+
+DEPEND="
+	>=dev-libs/boost-1.41
+	virtual/jpeg
+	media-libs/libpng:0
+	sys-libs/zlib
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr )
+	mkl? ( sci-libs/mkl )
+	tiff? ( >=media-libs/tiff-3.6.1 )
+	X? ( media-libs/libsdl )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	# Change some destination directories that cannot be adjusted via configure
+	cp configure.ac configure.ac.orig
+	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
+
+	cp Makefile.am Makefile.am.orig
+	sed \
+		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
+		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
+		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
+		-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
+
+	epatch "${FILESDIR}"/${PV}-user-conf.patch
+
+	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-flags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\"
+	append-flags -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) \
+		$(use_with mkl libmkl) \
+		$(use_with tiff libtiff) \
+		$(use_with X libsdl) \
+		$(use_with X x) \
+		--disable-strip \
+		--disable-optimiz \
+		--disable-optimiz-arch \
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+	# For the beta releases, we generate a license extension in case needed
+	POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check || die "Test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
+
+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
+}
diff --git a/media-gfx/povray/povray-3.7.0_rc3.ebuild b/media-gfx/povray/povray-3.7.0_rc3.ebuild
index 56dbb77e76ed..5ab7ee32ba0d 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
 # 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.5 2011/10/19 13:06:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.6 2011/10/21 16:40:19 ssuominen Exp $
 
 EAPI="3"
 
@@ -22,7 +22,7 @@ SRC_URI="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV
 LICENSE="povlegal-3.6"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug mkl openexr tiff X"
+IUSE="debug openexr tiff X"
 
 DEPEND="
 	>=dev-libs/boost-1.41
@@ -32,7 +32,6 @@ DEPEND="
 	openexr? (
 		media-libs/ilmbase
 		media-libs/openexr )
-	mkl? ( sci-libs/mkl )
 	tiff? ( >=media-libs/tiff-3.6.1 )
 	X? ( media-libs/libsdl )"
 RDEPEND="${DEPEND}"
@@ -90,7 +89,7 @@ src_configure() {
 		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
 		$(use_enable debug) \
 		$(use_with openexr) \
-		$(use_with mkl libmkl) \
+		--without-libmkl \
 		$(use_with tiff libtiff) \
 		$(use_with X libsdl) \
 		$(use_with X x) \