old

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

8 files changed, 12 insertions, 282 deletions

diff --git a/media-libs/openimageio/ChangeLog b/media-libs/openimageio/ChangeLog
index 3202c16ee3fc..342d45783fc5 100644
--- a/media-libs/openimageio/ChangeLog
+++ b/media-libs/openimageio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/openimageio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.5 2012/08/02 17:55:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.6 2012/08/02 17:58:56 ssuominen Exp $
+
+  02 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -openimageio-0.10.2.ebuild, -files/openimageio-0.10.2-libpng15.patch,
+  -files/openimageio-0.10.2-multilib.patch, -openimageio-0.10.5.ebuild,
+  -files/openimageio-0.10.5+boost-1.50.patch, -openimageio-1.0.7-r1.ebuild,
+  metadata.xml:
+  old
 
 *openimageio-1.0.8 (02 Aug 2012)
 
diff --git a/media-libs/openimageio/files/openimageio-0.10.2-libpng15.patch b/media-libs/openimageio/files/openimageio-0.10.2-libpng15.patch
deleted file mode 100644
index 97375d5fbb7b..000000000000
--- a/media-libs/openimageio/files/openimageio-0.10.2-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ico.imageio/icooutput.cpp
-+++ ico.imageio/icooutput.cpp
-@@ -32,6 +32,8 @@
- #include <cstdlib>
- #include <cmath>
- 
-+#include <zlib.h> /* Z_BEST_COMPRESSION */
-+
- #include "ico.h"
- #include "../png.imageio/png_pvt.h"
- 
diff --git a/media-libs/openimageio/files/openimageio-0.10.2-multilib.patch b/media-libs/openimageio/files/openimageio-0.10.2-multilib.patch
deleted file mode 100644
index 3ca4faa6829e..000000000000
--- a/media-libs/openimageio/files/openimageio-0.10.2-multilib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -91,11 +91,11 @@
- 
- # Exec Install Locations
- set (BINDIR   "${CMAKE_INSTALL_PREFIX}/bin")
--set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib")
-+set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
- set (PYLIBDIR "${CMAKE_INSTALL_PREFIX}/python")
- if (EXEC_INSTALL_PREFIX)
-     set (BINDIR   "${EXEC_INSTALL_PREFIX}/bin")
--    set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib")
-+    set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-     set (PYLIBDIR "${EXEC_INSTALL_PREFIX}/python")
- endif ()
- 
diff --git a/media-libs/openimageio/files/openimageio-0.10.5+boost-1.50.patch b/media-libs/openimageio/files/openimageio-0.10.5+boost-1.50.patch
deleted file mode 100644
index 94ae0ddc8784..000000000000
--- a/media-libs/openimageio/files/openimageio-0.10.5+boost-1.50.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/iv/imageviewer.cpp.old	2012-07-01 12:17:57.138829803 +0200
-+++ src/iv/imageviewer.cpp	2012-07-01 12:21:31.543823577 +0200
-@@ -1352,8 +1352,8 @@
- compName (IvImage *first, IvImage *second)
- {
- #if BOOST_FILESYSTEM_VERSION == 3
--    std::string firstFile = boost::filesystem3::path(first->name()).leaf().string();
--    std::string secondFile = boost::filesystem3::path(second->name()).leaf().string();
-+    std::string firstFile = boost::filesystem::path(first->name()).leaf().string();
-+    std::string secondFile = boost::filesystem::path(second->name()).leaf().string();
- #else
-     std::string firstFile = boost::filesystem::path(first->name()).leaf();
-     std::string secondFile = boost::filesystem::path(second->name()).leaf();
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 31f8bdb7ccf8..6fd0761f8740 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
-  <use>
-    <flag name="tbb">
-      Use <pkg>dev-cpp/tbb</pkg> for threading.
-    </flag>
-
-    <flag name="opencv">
-      Add support for <pkg>media-libs/opencv</pkg> based algorithms.
-    </flag>
-  </use>
+	<herd>graphics</herd>
+	<use>
+		<flag name='tbb'>Use <pkg>dev-cpp/tbb</pkg> for threading.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/openimageio/openimageio-0.10.2.ebuild b/media-libs/openimageio/openimageio-0.10.2.ebuild
deleted file mode 100644
index 8450c449b34d..000000000000
--- a/media-libs/openimageio/openimageio-0.10.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-0.10.2.ebuild,v 1.1 2011/10/15 22:18:46 ssuominen Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-
-inherit cmake-utils eutils python
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="http://sites.google.com/site/openimageio/ http://github.com/OpenImageIO"
-SRC_URI="http://github.com/OpenImageIO/oiio/tarball/Release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	media-libs/glew
-	media-libs/ilmbase
-	media-libs/jasper
-	media-libs/libpng
-	media-libs/openexr
-	media-libs/tiff
-	sci-libs/hdf5
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	virtual/opengl
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-opengl:4"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	mv OpenImageIO-* "${WORKDIR}"/${P}
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-multilib.patch
-
-	sed -i \
-		-e '/^add_subdirectory (doc)/d' \
-		-e "/PYLIBDIR/s:\${CMAKE_INSTALL_PREFIX}/python:$(python_get_sitedir):" \
-		CMakeLists.txt || die
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc ../{CHANGES,CREDITS,README} doc/CLA-{CORPORATE,INDIVIDUAL}
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/openimageio.pdf
-}
diff --git a/media-libs/openimageio/openimageio-0.10.5.ebuild b/media-libs/openimageio/openimageio-0.10.5.ebuild
deleted file mode 100644
index 4550bd615a98..000000000000
--- a/media-libs/openimageio/openimageio-0.10.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-0.10.5.ebuild,v 1.1 2012/02/22 18:47:37 ssuominen Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-
-inherit cmake-utils eutils python
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="http://sites.google.com/site/openimageio/ http://github.com/OpenImageIO"
-SRC_URI="http://github.com/OpenImageIO/oiio/tarball/Release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	media-libs/glew
-	media-libs/ilmbase
-	media-libs/jasper
-	media-libs/libpng
-	media-libs/openexr
-	media-libs/tiff
-	sci-libs/hdf5
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	virtual/opengl
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-opengl:4"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	mv OpenImageIO-* "${WORKDIR}"/${P}
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.10.2-libpng15.patch \
-		"${FILESDIR}"/${PN}-0.10.2-multilib.patch
-
-	sed -i \
-		-e '/^add_subdirectory (doc)/d' \
-		-e "/PYLIBDIR/s:\${CMAKE_INSTALL_PREFIX}/python:$(python_get_sitedir):" \
-		CMakeLists.txt || die
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc ../{CHANGES,CREDITS,README} doc/CLA-{CORPORATE,INDIVIDUAL}
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/openimageio.pdf
-}
diff --git a/media-libs/openimageio/openimageio-1.0.7-r1.ebuild b/media-libs/openimageio/openimageio-1.0.7-r1.ebuild
deleted file mode 100644
index 36d2af97d760..000000000000
--- a/media-libs/openimageio/openimageio-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.0.7-r1.ebuild,v 1.1 2012/07/21 14:22:43 flameeyes Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.7"
-
-inherit cmake-utils eutils python multilib
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="http://sites.google.com/site/openimageio/ http://github.com/OpenImageIO"
-SRC_URI="http://github.com/OpenImageIO/oiio/tarball/Release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python opengl qt4 tbb jpeg2k opencv"
-
-RDEPEND="dev-libs/boost[python?]
-	media-libs/glew
-	media-libs/ilmbase
-	media-libs/libpng
-	media-libs/openexr
-	media-libs/tiff
-	sci-libs/hdf5
-	sys-libs/zlib
-	virtual/jpeg
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4
-	)
-	tbb? ( dev-cpp/tbb )
-	jpeg2k? ( media-libs/openjpeg )
-	opencv? ( media-libs/opencv )
-	dev-libs/pugixml"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-hpkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv OpenImageIO-* "${WORKDIR}"/${P}
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.10.2-libpng15.patch
-
-	# remove bundled code to make it build
-	# https://github.com/OpenImageIO/oiio/issues/403
-	rm */pugixml* || die
-
-	# fix man page building
-	# https://github.com/OpenImageIO/oiio/issues/404
-	use qt4 || sed -i -e '/cli_tools/s:iv ::' doc/CMakeLists.txt
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-		-DBUILDSTATIC=OFF
-		-DLINKSTATIC=OFF
-		$(cmake-utils_use_use opengl)
-		$(cmake-utils_use_use qt4 QT)
-		$(cmake-utils_use_use tbb)
-		$(cmake-utils_use_use python)
-		$(use python && echo -DPYLIB_INSTALL_DIR=$(python_get_sitedir))
-		-DUSE_FIELD3D=OFF # missing in Portage
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		-DUSE_OCIO=OFF # missing in portage
-		$(cmake-utils_use_use opencv)
-		-DUSE_EXTERNAL_PUGIXML=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc ../{CHANGES,CREDITS,README} doc/CLA-{CORPORATE,INDIVIDUAL}
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/openimageio.pdf
-}