Remove automagic dependency on pdflatex binary, add USE-flag 'pdf' for building extra pdf documentation, fix patch for documentation building

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

5 files changed, 30 insertions, 29 deletions

diff --git a/media-gfx/opencolorio/ChangeLog b/media-gfx/opencolorio/ChangeLog
index 002dcb6fe4f3..b07dff3d82d6 100644
--- a/media-gfx/opencolorio/ChangeLog
+++ b/media-gfx/opencolorio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/opencolorio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/ChangeLog,v 1.2 2012/11/24 21:40:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/ChangeLog,v 1.3 2012/11/26 07:42:27 pinkbyte Exp $
+
+  26 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> opencolorio-1.0.7.ebuild,
+  files/opencolorio-documentation-gen.patch, metadata.xml:
+  Remove automagic dependency on pdflatex binary, add USE-flag 'pdf' for
+  building extra pdf documentation, fix patch for documentation building
 
   24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> opencolorio-1.0.7.ebuild,
   +files/opencolorio-openimageio.patch:
diff --git a/media-gfx/opencolorio/Manifest b/media-gfx/opencolorio/Manifest
index ac6c7eb9981b..7b0b597c8e11 100644
--- a/media-gfx/opencolorio/Manifest
+++ b/media-gfx/opencolorio/Manifest
@@ -1,21 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX opencolorio-documentation-gen.patch 4479 SHA256 887ae8dfdb06026c6836253c322725c7042eb14fbef5c0e601bb1b1ef8c43b62 SHA512 4bf0227de03095cb822d89ef449c69df45ab8104ce6becfe8aeb45597fd05980e1910acd2023bf9468d61adeea2d5ec410afbf24cf8f947c0dcd9bf46bea6f24 WHIRLPOOL cb85017075aadd96315474838cb93f3cd7573912c668dee1cec0291209ed039cda687954104e12c0e70438f799d1c0b99bd652e495fc6684a49f48be1140ac07
+AUX opencolorio-documentation-gen.patch 4518 SHA256 bd128a455ce88d7462394e2e78b8b63a90757f37afc6149342210e8f06a8117f SHA512 c65e330044033b13f9e912aafc5276ae2e597b154097c01b52b28dc7217265ec2d43a4fb24ab91033c0dcf3d5979cc36a28a85a6bbbf0939ed206ffda3ca4629 WHIRLPOOL 659fe85f77157411b2c75ed90f0f48808d4dffbacd38a4fd8c1dcdf1923a2f6af99997091d110e99af061abc1947dec0d26513458a46a50fd3bed74e087141c8
 AUX opencolorio-openimageio.patch 931 SHA256 e7e41dcd784510c3d036474f33b8a4a8bcaf915b8571f50aa8d67d6accb2c633 SHA512 d3547b7a9f7699914cddb9f2493c1e97d69d0b1fbfe04295286dfec5815425ad1666cede9782176f12a1d56ff6ce502d493abd00d09def7e964ef03478449f30 WHIRLPOOL e7fbf82e3febaa5ce29a8da123a5211849f6eb6a7b2660f5a94e0dea6189a5ebd4d6a4c9d146012fe9f12cbbfb5aa12c7cf8f6b2afab792fbedfb5d969f7897b
 AUX opencolorio-use-system-libs.patch 984 SHA256 423f24c9d913e052cbcb863dcda9d9eb6166473a6ba133d04692b1bd8149a721 SHA512 8c98d02ebb29c8e085f96dbe59c79ae2bb57de19b73c3b06f6e374181e2bca624d20ad0a5d386cbc68e3f81e7427f43c0867ed7c74e86916d47f9c0fa63c4513 WHIRLPOOL 7a3bb0099347e048d324dfe19099dbc6184405a45d5d98ad3434546f58f6ccb32eabebb9fd7c7bfdb352c8b55d058e8051627326bb96d1f42034cfa547d1b4be
 DIST opencolorio-1.0.7.tar.gz 11844185 SHA256 54c6516a89dc9287f1bcc47f27a91fb608477295a4ba6106b45f34e89506d7d5 SHA512 34a9a92aa0cabb449e14fbca32ece1ba411b8d8154cb459e5a88d63bd0b43ffd9b6eeda324339cbd0e8f51b086a34235a984030647b766342c41dc1ec633a70a WHIRLPOOL 6701f1446c1540e2400982f1cd1961803c9e9bde50bd34bff46fd819366d1226defa0334fe1610d3b3ee4d30a04530bdecad89363fd480ea025391382b0e4537
-EBUILD opencolorio-1.0.7.ebuild 2003 SHA256 00caf8b2188ca6b170c8b86d3f53641e16dc300e479ade1f93e894b30f045fac SHA512 d8af3002ccaafe6b84f147d362327dfb96373d7a9d4faefdd63591674b8eba41038c08ee4d95d8ddefd19700b6aa5beccfcbcef2d00b4ffce3939de2ae166612 WHIRLPOOL 2f8f93cbe84541025a7764cdb0d146642dfa5510963524044548ae9cae8cf93dae17f9fd559ee682f247b5f1a71f4407761afd0ccb19cf1c50d2867b0ee1f8fd
-MISC ChangeLog 640 SHA256 8f2c345e7a86e0456ec3f4d00fa1a2184196e5580fe04178ae8a35a5a9284055 SHA512 1abbde463db7d090ac26da6a22ec1f36b075c066a91090916af2262a6e6cb41c2219afc6f5955e542914f87200750a95e0cfbe9ecce24b9245d0bc05c31748ae WHIRLPOOL 15f7091e7dc722ecde9cb897aee8709fa63cb594eec35c2a9ad9253cd8ddc7ef8a364ce2ad2d6f6323de21539922d4a51839fc05693422b0b10ac412756259ca
-MISC metadata.xml 438 SHA256 4e3bd3147d7af2d93cfae292dfb96451ba39e9a36fd110ff630f66c9cf065ec5 SHA512 cb8ae7cf634e17b800cf9992bd210d9d4f97a3449f4073aae4b9662536e575971836e50feed65975554a17ed08a65c620392511dec7d032d7c6883e1435fcf19 WHIRLPOOL c761ae14a8caece0bb6ccf0158dff6e65ee50f5b567a7ddb914d051cca4fea1e7b9173b7dc69002806f033e4c2168ef0f47a2a09880111d970faf227c4929eee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQsT61AAoJEEdUh39IaPFNnucIAI5nRrhLN4T7/B4z4zId367l
-CZAMvCdgZ0OB99XejMylup83hl2+4iK9jNCSL5HcUEEk8VlI0F0E7N7xFwLp75U8
-F9cd7V39h8zYTJLK/esdAF33shwBid6fSE0GV3s9fm7cwjTHOj7GuGPXkNKINS06
-Wg482h3LafQNLxcSbO/HvpFn42r2uPgJLyjf1nwePf2kQ5sqllG7mLvQS3pLD8ZJ
-v9/ImH0hiQC/5tRDPBZQc7gstuiq/9xL08OfGGBPoeK42srBicnG/4VU9oIhjcbg
-ol70lAT6dVzhcN2UDzOij3KiTP+x8U1O1RnGv0Djhc2EHuwIXTcyJDks6+9vUb8=
-=9Ftu
------END PGP SIGNATURE-----
+EBUILD opencolorio-1.0.7.ebuild 2016 SHA256 02e9986b39f9f90de9c8d6dc258ff81cb22da085afefe85ec59994a19c23ece3 SHA512 0aa204099618ab51f9dcd1ca0183940ea30364aea8a94a2276489af5e4d46167967570f4fd775d88d983d8f7e87b3f152ec8fa788dffa3dec68ae8c112e48d12 WHIRLPOOL 5fd4c0ae039beccbe1e86f855aa66c8d24e4c4c4e1b18e130f8be9d2ce7425536e5ef08f46da67039156d0adb6da6507aa0b3de6bf0509a5b895bdf1e6d42fe9
+MISC ChangeLog 921 SHA256 97eec6abeae846958a1af38bd198ef1d136f9d18516cf63c19bae1f7733eb596 SHA512 8854ed1c91733b9a4b28c986df7047b3e948ee927a6f57b61d996ceb719c02451954a316d1faa65b0a0c1e6234eabfbfe160916a7870cbd3c865aa1449c83906 WHIRLPOOL 32d921a966d0ba282992f7d63f1d6d71ea2155ee12461342dc2c884796034f0ddf51b15c720715d5b9e0f7272b5e80eac227adbd1d9af2e2e17227a28792cd3f
+MISC metadata.xml 521 SHA256 572476dc37a896b247d7e9c3ef69768638163c68acc62b688d4e209e752b78b2 SHA512 0297e2666ee4160cac06638090286762af8957794b417740a004d6b4faaa370cb05f8dd299631bc712dcc2bff05e492653560663aa449e958126488ab364c2f5 WHIRLPOOL e12bb181d8c7cd1d30d4d765586717d027610640f45414bfa76089d8483b21ddc7812b93d48cfea54fd0c3ad60f21a42f2e26571aa2911082a26398553237ff7
diff --git a/media-gfx/opencolorio/files/opencolorio-documentation-gen.patch b/media-gfx/opencolorio/files/opencolorio-documentation-gen.patch
index 283282232e9b..172d50d1d6dd 100644
--- a/media-gfx/opencolorio/files/opencolorio-documentation-gen.patch
+++ b/media-gfx/opencolorio/files/opencolorio-documentation-gen.patch
@@ -1,5 +1,5 @@
---- docs/CMakeLists.txt.orig	2012-08-18 17:21:23.833556790 +0400
-+++ docs/CMakeLists.txt	2012-08-18 17:22:44.968559366 +0400
+--- docs/CMakeLists.txt.orig	2012-11-26 11:05:55.000000000 +0400
++++ docs/CMakeLists.txt	2012-11-26 11:07:42.622459004 +0400
 @@ -1,62 +1,3 @@
 -
 -###############################################################################
@@ -72,7 +72,7 @@
      DEPENDS
          OpenColorIO
          PyOpenColorIO
-@@ -93,19 +34,15 @@
+@@ -93,19 +34,17 @@
      COMMENT "Building html docs"
      SOURCES ${DOCFILES})
  
@@ -85,16 +85,18 @@
 +        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html
          PATTERN .git EXCLUDE)
  
++if(OCIO_BUILD_PDF_DOCS)
++
  find_package(LATEX)
  if(PDFLATEX_COMPILER)
      
      add_custom_target(latex
 -        COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-+        COMMAND PYTHONPATH=sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
++        COMMAND PYTHONPATH= sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
          DEPENDS
              OpenColorIO
              ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -115,7 +52,6 @@
+@@ -115,7 +54,6 @@
              ${RSTDOC_OUTPUT}
          COMMENT "Building latex doc"
          SOURCES ${DOCFILES})
@@ -102,7 +104,7 @@
      
      add_custom_target(pdf ALL
          COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
-@@ -125,6 +61,6 @@
+@@ -125,6 +63,8 @@
      add_dependencies(pdf latex)
      
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
@@ -110,3 +112,5 @@
 +            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P})
      
  endif()
++
++endif()
diff --git a/media-gfx/opencolorio/metadata.xml b/media-gfx/opencolorio/metadata.xml
index 6e27fe9a4988..723c8e0ff93b 100644
--- a/media-gfx/opencolorio/metadata.xml
+++ b/media-gfx/opencolorio/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription>
+	<use>
+		<flag name="pdf">Install extra documentation in PDF format</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/opencolorio/opencolorio-1.0.7.ebuild b/media-gfx/opencolorio/opencolorio-1.0.7.ebuild
index a3d559fd8b28..e5b56a21ddf7 100644
--- a/media-gfx/opencolorio/opencolorio-1.0.7.ebuild
+++ b/media-gfx/opencolorio/opencolorio-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/opencolorio-1.0.7.ebuild,v 1.2 2012/11/24 21:40:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/opencolorio-1.0.7.ebuild,v 1.3 2012/11/26 07:42:27 pinkbyte Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/imageworks/OpenColorIO/tarball/v${PV} \
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc opengl python sse2 test"
+IUSE="doc opengl pdf python sse2 test"
 
 RDEPEND="opengl? (
 		media-libs/lcms:2
@@ -29,7 +29,10 @@ RDEPEND="opengl? (
 	dev-libs/tinyxml
 	"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
+	doc? (
+		pdf? ( dev-python/sphinx[latex] )
+		!pdf? ( dev-python/sphinx )
+	)
 	"
 
 # Documentation building requires Python bindings building
@@ -53,7 +56,6 @@ src_configure() {
 	# Missing features:
 	# - Truelight and Nuke are not in portage for now, so their support are disabled
 	# - Java bindings was not tested, so disabled
-	# - Documentation PDF does not build properly ("automagic dependency on pdflatex")
 	# Notes:
 	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
 	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
@@ -66,6 +68,7 @@ src_configure() {
 		-DOCIO_BUILD_TRUELIGHT=OFF
 		$(cmake-utils_use doc OCIO_BUILD_DOCS)
 		$(cmake-utils_use opengl OCIO_BUILD_APPS)
+		$(cmake-utils_use pdf OCIO_BUILD_PDF_DOCS)
 		$(cmake-utils_use python OCIO_BUILD_PYGLUE)
 		$(cmake-utils_use sse2 OCIO_USE_SSE)
 		$(cmake-utils_use test OCIO_BUILD_TESTS)