media-gfx/aqsis: remove last rited package

diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest
deleted file mode 100644 (file)
index e5ea2ee..0000000
--- a/media-gfx/aqsis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aqsis-1.8.2.tar.gz 5669285 BLAKE2B 1ac1ad7837812f8484634d39545df413e9b0916fb5cf8e0ef8506ec9a10395d8cf6ff303b5735634c161db9bf147785a2a087f10a63789886b58f982d36629bf SHA512 b571f9cfa46c0f1e659b054835698fe90f4d9bf43bea54caea257ac0b9d1d65fca68a0ea874772d18c98194630e13528acefb0e852ef398f353b1d1bb545cecc

diff --git a/media-gfx/aqsis/aqsis-1.8.2.ebuild b/media-gfx/aqsis/aqsis-1.8.2.ebuild
deleted file mode 100644 (file)
index 18ee7fc..0000000
--- a/media-gfx/aqsis/aqsis-1.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="Open source RenderMan-compliant 3D rendering solution"
-HOMEPAGE="http://www.aqsis.org"
-SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="png qt4"
-
-# OpenEXR currently can not be optional dependency, despite build system options
-RDEPEND="
-       dev-libs/boost:=
-       dev-libs/tinyxml
-       media-libs/tiff:0
-       sys-libs/zlib
-       media-libs/openexr:=
-       png? ( media-libs/libpng:0= )
-       qt4? ( dev-qt/qtgui:4 )
-"
-
-DEPEND="${RDEPEND}
-       dev-libs/libxslt
-       sys-devel/bison
-       sys-devel/flex
-"
-
-DOCS=( AUTHORS INSTALL README )
-
-PATCHES=(
-       "${FILESDIR}/${P}-openexr-compat.patch"
-       "${FILESDIR}/${P}-unbundle-tinyxml.patch"
-       "${FILESDIR}/${P}-pfto-boost-1.59.patch"
-       "${FILESDIR}/${P}-boost-join-moc.patch"
-       "${FILESDIR}/${P}-gcc6.patch"
-)
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use png AQSIS_USE_PNG)
-               $(cmake-utils_use qt4 AQSIS_USE_QT)
-               -DAQSIS_ENABLE_DOCS=OFF
-               -DAQSIS_USE_EXTERNAL_TINYXML=ON
-               -DAQSIS_USE_OPENEXR=ON
-               -DAQSIS_USE_RPATH=OFF
-               -DLIBDIR="$(get_libdir)"
-               -DSYSCONFDIR="/etc"
-       )
-       cmake-utils_src_configure
-}
-
-src_install() {
-       newdoc "release-notes/1.8/summary-1.8.0.txt" ReleaseNotes
-       cmake-utils_src_install
-}

diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch b/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch
deleted file mode 100644 (file)
index ce579d1..0000000
--- a/media-gfx/aqsis/files/aqsis-1.8.2-boost-join-moc.patch
+++ /dev/null
@@ -1,568 +0,0 @@
-Add include guards to all boost includes, as qt's moc trips
-over nested BOOST_JOIN macros:
-* /usr/lib64/qt4/bin/moc @/var/tmp/portage/media-gfx/aqsis-1.8.2/work/aqsis-1.8.2_build/tools/piqsl/moc_piqsl_ui.cxx_parameters
-* /usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
-See also: https://bugs.gentoo.org/show_bug.cgi?id=574560
-
---- aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp
-+++ aqsis-1.8.2/tools/piqsl/piqsl_ui.cpp
-@@ -42,7 +42,9 @@
- #include <QtGui/QPainter>
- #include <QtGui/QImage>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/thread.hpp>
-+#endif
- 
- #include <aqsis/version.h>
- #include <aqsis/math/math.h>
---- aqsis-1.8.2/tools/piqsl/piqsl_ui.h
-+++ aqsis-1.8.2/tools/piqsl/piqsl_ui.h
-@@ -37,7 +37,9 @@
- 
- #include <QtGui/QStyledItemDelegate>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include "image.h"
- 
---- aqsis-1.8.2/tools/piqsl/displayserverimage.cpp
-+++ aqsis-1.8.2/tools/piqsl/displayserverimage.cpp
-@@ -39,11 +39,13 @@
- #include      <map>
- #include      <algorithm>
- 
-+#ifndef Q_MOC_RUN
- #include      <boost/archive/iterators/base64_from_binary.hpp>
- #include      <boost/archive/iterators/transform_width.hpp>
- #include      <boost/archive/iterators/insert_linebreaks.hpp>
- #include      <boost/format.hpp>
- #include      <boost/filesystem.hpp>
-+#endif
- 
- #include      "displayserverimage.h"
- 
---- aqsis-1.8.2/tools/piqsl/image.cpp
-+++ aqsis-1.8.2/tools/piqsl/image.cpp
-@@ -38,7 +38,9 @@
- 
- #include <float.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/format.hpp>
-+#endif
- 
- #include <aqsis/version.h>
- #include <aqsis/util/logging.h>
---- aqsis-1.8.2/tools/piqsl/image.h
-+++ aqsis-1.8.2/tools/piqsl/image.h
-@@ -46,10 +46,12 @@
- #include <QtCore/QObject>
- #include <QtGui/QImage>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
- #include <boost/shared_array.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/thread/mutex.hpp>
-+#endif
- 
- #include "tinyxml.h"
- 
---- aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp
-+++ aqsis-1.8.2/tools/piqsl/imagelistmodel.cpp
-@@ -37,11 +37,13 @@
- #include <QtCore/QSocketNotifier>
- #include <QtGui/QMessageBox>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/thread/mutex.hpp>
- #include <boost/archive/iterators/binary_from_base64.hpp>
- #include <boost/archive/iterators/transform_width.hpp>
- #include <boost/archive/iterators/remove_whitespace.hpp>
- #include <boost/version.hpp>
-+#endif
- 
- 
- #include "displayserverimage.h"
---- aqsis-1.8.2/tools/piqsl/imagelistmodel.h
-+++ aqsis-1.8.2/tools/piqsl/imagelistmodel.h
-@@ -33,8 +33,10 @@
- 
- #include <QtCore/QAbstractListModel>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
- #include <boost/thread/thread.hpp>
-+#endif
- 
- #include <aqsis/util/socket.h>
- #include "image.h"
---- aqsis-1.8.2/include/aqsis/core/interfacefwd.h
-+++ aqsis-1.8.2/include/aqsis/core/interfacefwd.h
-@@ -13,7 +13,9 @@
- #ifndef       ___interfacefwd_Loaded___
- #define       ___interfacefwd_Loaded___
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- namespace Aqsis {
- 
---- aqsis-1.8.2/include/aqsis/core/ioptions.h
-+++ aqsis-1.8.2/include/aqsis/core/ioptions.h
-@@ -29,7 +29,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/filesystem/path.hpp>
-+#endif
- 
- #include <aqsis/riutil/primvartype.h>
- #include <aqsis/ri/ritypes.h>
---- aqsis-1.8.2/include/aqsis/core/irenderer.h
-+++ aqsis-1.8.2/include/aqsis/core/irenderer.h
-@@ -14,7 +14,9 @@
- #include <iosfwd>
- #include <string>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/function.hpp>
-+#endif
- 
- #include <aqsis/math/matrix.h>
- #include <aqsis/core/itransform.h>
---- aqsis-1.8.2/include/aqsis/core/isurface.h
-+++ aqsis-1.8.2/include/aqsis/core/isurface.h
-@@ -12,7 +12,10 @@
- #define       ___isurface_Loaded___
- 
- #include      <vector>
-+
-+#ifndef Q_MOC_RUN
- #include      <boost/shared_ptr.hpp>
-+#endif
- 
- #include      <aqsis/aqsis.h>
- #include      <aqsis/math/matrix.h>
---- aqsis-1.8.2/include/aqsis/core/itransform.h
-+++ aqsis-1.8.2/include/aqsis/core/itransform.h
-@@ -12,7 +12,10 @@
- #define       ___itransform_Loaded___
- 
- #include      <aqsis/aqsis.h>
-+
-+#ifndef Q_MOC_RUN
- #include      <boost/shared_ptr.hpp>
-+#endif
- 
- namespace Aqsis {
- 
---- aqsis-1.8.2/include/aqsis/math/math.h
-+++ aqsis-1.8.2/include/aqsis/math/math.h
-@@ -30,8 +30,10 @@
- #include <cmath>
- #include <limits>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/utility/enable_if.hpp>
- #include <boost/type_traits/arithmetic_traits.hpp>
-+#endif
- 
- namespace Aqsis {
- // These inline functions are intended to eventually replace all the old macros
---- aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h
-+++ aqsis-1.8.2/include/aqsis/riutil/ricxxutil.h
-@@ -48,7 +48,9 @@
- #include <aqsis/riutil/interpclasscounts.h>
- #include <aqsis/util/exception.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/function.hpp>
-+#endif
- 
- namespace Aqsis {
- 
---- aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h
-+++ aqsis-1.8.2/include/aqsis/shadervm/ishaderexecenv.h
-@@ -28,7 +28,9 @@
- 
- #include      <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include      <boost/shared_ptr.hpp>
-+#endif
- 
- #include      <aqsis/shadervm/ishaderdata.h>
- #include      <aqsis/math/vector3d.h>
---- aqsis-1.8.2/include/aqsis/shadervm/ishader.h
-+++ aqsis-1.8.2/include/aqsis/shadervm/ishader.h
-@@ -19,7 +19,9 @@
- #include      <vector>
- #include      <iosfwd>
- 
-+#ifndef Q_MOC_RUN
- #include      <boost/shared_ptr.hpp>
-+#endif
- 
- #include      <aqsis/core/interfacefwd.h>
- #include      <aqsis/riutil/primvartype.h>
---- aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/channellist.h
-@@ -43,7 +43,9 @@
- #include <iosfwd>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/format.hpp>
-+#endif
- 
- #include <aqsis/tex/buffers/channelinfo.h>
- #include <aqsis/tex/texexception.h>
---- aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/mixedimagebuffer.h
-@@ -45,9 +45,11 @@
- #include <string>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_array.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/utility.hpp>
-+#endif
- 
- #include <aqsis/math/math.h>
- #include <aqsis/tex/buffers/channellist.h>
---- aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/texturebuffer.h
-@@ -42,7 +42,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_array.hpp>
-+#endif
- 
- #include <aqsis/tex/buffers/channellist.h>
- #include <aqsis/tex/buffers/samplevector.h>
---- aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h
-+++ aqsis-1.8.2/include/aqsis/tex/buffers/tilearray.h
-@@ -43,10 +43,12 @@
- 
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/intrusive_ptr.hpp>
- #include <boost/scoped_ptr.hpp>
- #include <boost/scoped_array.hpp>
- #include <boost/noncopyable.hpp>
-+#endif
- 
- //#include <aqsis/util/memorysentry.h>
- #include <aqsis/tex/io/itiledtexinputfile.h>
---- aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/ienvironmentsampler.h
-@@ -40,7 +40,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/tex/filtering/samplequad.h>
- #include <aqsis/tex/filtering/texturesampleoptions.h>
---- aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/iocclusionsampler.h
-@@ -40,7 +40,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/math/matrix.h>
- #include <aqsis/tex/filtering/samplequad.h>
---- aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/ishadowsampler.h
-@@ -40,7 +40,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/math/matrix.h>
- #include <aqsis/tex/filtering/samplequad.h>
---- aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturecache.h
-@@ -40,8 +40,10 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/function.hpp>
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- namespace Aqsis {
- 
---- aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h
-+++ aqsis-1.8.2/include/aqsis/tex/filtering/itexturesampler.h
-@@ -40,7 +40,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/tex/filtering/samplequad.h>
- #include <aqsis/tex/filtering/texturesampleoptions.h>
---- aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h
-+++ aqsis-1.8.2/include/aqsis/tex/io/itiledtexinputfile.h
-@@ -40,7 +40,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/util/file.h>
- #include <aqsis/tex/io/imagefiletype.h>
---- aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h
-+++ aqsis-1.8.2/include/aqsis/tex/io/texfileheader.h
-@@ -44,8 +44,10 @@
- #include <iostream>
- #include <map>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/any.hpp>
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/tex/io/texfileattributes.h>
- 
---- aqsis-1.8.2/include/aqsis/util/autobuffer.h
-+++ aqsis-1.8.2/include/aqsis/util/autobuffer.h
-@@ -41,7 +41,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_array.hpp>
-+#endif
- 
- namespace Aqsis {
- 
---- aqsis-1.8.2/include/aqsis/util/enum.h
-+++ aqsis-1.8.2/include/aqsis/util/enum.h
-@@ -122,7 +122,9 @@
- #include <string>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/static_assert.hpp>
-+#endif
- 
- #include <aqsis/util/sstring.h> // for CqString::hash()
- 
---- aqsis-1.8.2/include/aqsis/util/execute.h
-+++ aqsis-1.8.2/include/aqsis/util/execute.h
-@@ -30,7 +30,9 @@
- 
- #include <aqsis/aqsis.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/function.hpp>
-+#endif
- 
- #include <string>
- #include <vector>
---- aqsis-1.8.2/include/aqsis/util/file.h
-+++ aqsis-1.8.2/include/aqsis/util/file.h
-@@ -32,8 +32,10 @@
- 
- #include <string>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/filesystem/path.hpp>
- #include <boost/tokenizer.hpp>
-+#endif
- 
- namespace Aqsis {
- 
---- aqsis-1.8.2/include/aqsis/util/popen.h
-+++ aqsis-1.8.2/include/aqsis/util/popen.h
-@@ -41,9 +41,11 @@
- #include <string>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/iostreams/concepts.hpp>
- #include <boost/iostreams/stream.hpp>
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #ifndef AQSIS_POPEN_H_INCLUDED
- #define AQSIS_POPEN_H_INCLUDED
---- aqsis-1.8.2/include/aqsis/util/socket.h
-+++ aqsis-1.8.2/include/aqsis/util/socket.h
-@@ -32,7 +32,9 @@
- 
- #include <sstream>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/utility.hpp>
-+#endif
- 
- #ifdef AQSIS_SYSTEM_WIN32
- #     include <winsock2.h>
---- aqsis-1.8.2/include/aqsis/util/timer.h
-+++ aqsis-1.8.2/include/aqsis/util/timer.h
-@@ -39,8 +39,10 @@
- #include <ctime>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
- #include <boost/timer.hpp>
-+#endif
- 
- namespace Aqsis {
- 
---- aqsis-1.8.2/tools/aqsl/aqsl.cpp
-+++ aqsis-1.8.2/tools/aqsl/aqsl.cpp
-@@ -36,7 +36,10 @@
- #include      <cstring>
- #include      <string>
- #include      <vector>
-+
-+#ifndef Q_MOC_RUN
- #include      <boost/scoped_ptr.hpp>
-+#endif
- 
- #ifdef        AQSIS_SYSTEM_WIN32
- #include      "io.h"
---- aqsis-1.8.2/tools/displays/exr/d_exr.cpp
-+++ aqsis-1.8.2/tools/displays/exr/d_exr.cpp
-@@ -98,7 +98,9 @@
- 
- #include <assert.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- // Lower the warning level to eliminate unavoidable warnings from the OpenEXR headers.
- #if AQSIS_SYSTEM_WIN32 && (defined(AQSIS_COMPILER_MSVC6) || defined(AQSIS_COMPILER_MSVC7))
---- aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp
-+++ aqsis-1.8.2/tools/displays/piqsl/piqsldisplay.cpp
-@@ -33,10 +33,12 @@
- #include <map>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/archive/iterators/base64_from_binary.hpp>
- #include <boost/archive/iterators/transform_width.hpp>
- #include <boost/archive/iterators/insert_linebreaks.hpp>
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #ifdef AQSIS_SYSTEM_WIN32
-       #include <winsock2.h>
---- aqsis-1.8.2/tools/eqsl/eqsl.cpp
-+++ aqsis-1.8.2/tools/eqsl/eqsl.cpp
-@@ -55,9 +55,11 @@
- #include <QtGui/QStatusBar>
- #include <QtGui/QTabWidget>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/thread.hpp>
- #include <boost/regex.hpp>
- #include <boost/lexical_cast.hpp>
-+#endif
- 
- #include <aqsis/version.h>
- #include <aqsis/util/execute.h>
---- aqsis-1.8.2/tools/miqser/miqser.cpp
-+++ aqsis-1.8.2/tools/miqser/miqser.cpp
-@@ -44,7 +44,9 @@
- #include <cstring>
- #include <cstdlib>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/util/argparse.h>
- #include <aqsis/util/exception.h>
---- aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp
-+++ aqsis-1.8.2/tools/procedurals/hairgen/hair.cpp
-@@ -37,8 +37,10 @@
- #include <aqsis/math/math.h>
- #include <aqsis/math/matrix.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/tokenizer.hpp>
- #include <boost/algorithm/string/trim.hpp>
-+#endif
- 
- // project includes
- #include "primvar.h"
---- aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h
-+++ aqsis-1.8.2/tools/procedurals/hairgen/parenthairs.h
-@@ -35,7 +35,9 @@
- #include <vector>
- #include <iosfwd>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
- 
- #include "kdtree/kdtree2.hpp"
- #include "primvar.h"
---- aqsis-1.8.2/tools/procedurals/hairgen/primvar.h
-+++ aqsis-1.8.2/tools/procedurals/hairgen/primvar.h
-@@ -37,7 +37,9 @@
- #include <vector>
- #include <stdexcept>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- #include <aqsis/riutil/primvartoken.h>
- #include <aqsis/ri/ri.h>
---- aqsis-1.8.2/tools/ptview/ptview.cpp
-+++ aqsis-1.8.2/tools/ptview/ptview.cpp
-@@ -38,7 +38,9 @@
- #include <QtGui/QFileDialog>
- #include <QtGui/QColorDialog>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/program_options.hpp>
-+#endif
- 
- #define NOMINMAX
- #include <OpenEXR/ImathVec.h>
---- aqsis-1.8.2/tools/ptview/ptview.h
-+++ aqsis-1.8.2/tools/ptview/ptview.h
-@@ -33,8 +33,10 @@
- #include <cmath>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
- #include <boost/shared_array.hpp>
-+#endif
- 
- #include <QtGui/QMainWindow>
- #include <QtOpenGL/QGLWidget>

diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch b/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch
deleted file mode 100644 (file)
index c51f669..0000000
--- a/media-gfx/aqsis/files/aqsis-1.8.2-gcc6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d450f4aac8c107f82b18df7789afb52b502eaba0 Mon Sep 17 00:00:00 2001
-From: Hodorgasm <nsane457@gmail.com>
-Date: Mon, 19 Sep 2016 22:58:44 -0400
-Subject: [PATCH] Use "!file.fail()" instead of "file != NULL"
-
-Pre-C++11 defined an implicit cast from ifstream to "void *" and post C++11 replaced it with an explicit cast of ifstream to "bool".  Testing an ifstream with "!ifstream.fail()" should work regardless of the C++ dialect.
----
- libs/core/texturing_old/shadowmap_old.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/core/texturing_old/shadowmap_old.cpp b/libs/core/texturing_old/shadowmap_old.cpp
-index 1a22491..fbcac59 100644
---- a/libs/core/texturing_old/shadowmap_old.cpp
-+++ b/libs/core/texturing_old/shadowmap_old.cpp
-@@ -176,7 +176,7 @@ void CqShadowMapOld::LoadZFile()
-       {
-               std::ifstream file( m_strName.c_str(), std::ios::in | std::ios::binary );
- 
--              if ( file != NULL )
-+              if ( !file.fail() )
-               {
-                       // Save a file type and version marker
-                       TqPchar origHeader = tokenCast(ZFILE_HEADER);

diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch b/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch
deleted file mode 100644 (file)
index 155c93e..0000000
--- a/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libs/tex/io/exrinputfile.h.orig    2012-08-24 16:26:50.000000000 +0400
-+++ libs/tex/io/exrinputfile.h 2014-02-14 16:26:47.293497092 +0400
-@@ -48,10 +48,9 @@
- 
- #include <aqsis/tex/io/itexinputfile.h>
- 
-+#include <OpenEXR/ImfInputFile.h>
-+
- //------------------------------------------------------------------------------
--namespace Imf {
--      class InputFile;
--}
- 
- namespace Aqsis {
- 

diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch b/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch
deleted file mode 100644 (file)
index 621853e..0000000
--- a/media-gfx/aqsis/files/aqsis-1.8.2-pfto-boost-1.59.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Remove BOOST_MAKE_PFTO_WRAPPER macros, which were long deprecated
-and finally removed with boost-1.59.
-
-diff -aur package.pristine/tools/displays/piqsl/piqsldisplay.cpp package.new/tools/displays/piqsl/piqsldisplay.cpp
---- package.pristine/tools/displays/piqsl/piqsldisplay.cpp     2015-12-12 12:52:50.455773602 +0100
-+++ package.new/tools/displays/piqsl/piqsldisplay.cpp  2015-12-12 12:54:31.291661954 +0100
-@@ -450,8 +450,8 @@
- 
-       TiXmlElement* bucketDataXML = new TiXmlElement("BucketData");
-       std::stringstream base64Data;
--      std::copy(      base64_text(BOOST_MAKE_PFTO_WRAPPER(data)), 
--                              base64_text(BOOST_MAKE_PFTO_WRAPPER(data + bufferlength)), 
-+      std::copy(      base64_text(data), 
-+                              base64_text(data + bufferlength), 
-                               std::ostream_iterator<char>(base64Data));
-       TiXmlText* dataTextXML = new TiXmlText(base64Data.str());
-       dataTextXML->SetCDATA(true);
-diff -aur package.pristine/tools/piqsl/imagelistmodel.cpp package.new/tools/piqsl/imagelistmodel.cpp
---- package.pristine/tools/piqsl/imagelistmodel.cpp    2015-12-12 12:52:50.465773524 +0100
-+++ package.new/tools/piqsl/imagelistmodel.cpp 2015-12-12 12:53:26.088831765 +0100
-@@ -42,11 +42,6 @@
- #include <boost/archive/iterators/transform_width.hpp>
- #include <boost/archive/iterators/remove_whitespace.hpp>
- #include <boost/version.hpp>
--#if BOOST_VERSION < 103700
--#   include <boost/pfto.hpp>
--#else
--#   include <boost/serialization/pfto.hpp>
--#endif
- 
- 
- #include "displayserverimage.h"
-@@ -286,7 +281,7 @@
-                                 std::string data = dataText->Value();
-                                 std::vector<unsigned char> binaryData;
-                                 binaryData.reserve(count);
--                                base64_binary ti_begin = base64_binary(BOOST_MAKE_PFTO_WRAPPER(data.begin()));
-+                                base64_binary ti_begin = base64_binary(data.begin());
-                                 std::size_t padding = 2 - count % 3;
-                                 while(--count > 0)
-                                 {

diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch b/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch
deleted file mode 100644 (file)
index 158c96a..0000000
--- a/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- CMakeLists.txt.orig        2014-02-14 16:55:38.894647998 +0400
-+++ CMakeLists.txt     2014-02-14 16:56:14.017651059 +0400
-@@ -134,15 +134,15 @@
-       endif()
- endif()
- 
--## find tinyxml.  If not found we use the version distributed with the aqsis
--## source.
--#if(AQSIS_USE_EXTERNAL_TINYXML)
--#     find_package(TinyXML)
--#     if(NOT TINYXML_FOUND)
--#             message("** Cannot find external tinyxml library - using version included with the aqsis source.")
--#             set(AQSIS_USE_EXTERNAL_TINYXML OFF)
--#     endif()
--#endif()
-+# find tinyxml.  If not found we use the version distributed with the aqsis
-+# source.
-+if(AQSIS_USE_EXTERNAL_TINYXML)
-+      find_package(TinyXML)
-+      if(NOT AQSIS_TINYXML_FOUND)
-+              message("** Cannot find external tinyxml library - using version included with the aqsis source.")
-+              set(AQSIS_USE_EXTERNAL_TINYXML OFF)
-+      endif()
-+endif()
- 
- 
- #-------------------------------------------------------------------------------
-@@ -274,7 +274,9 @@
- )
- 
- # Thirdparty libs
--declare_subproject(thirdparty/tinyxml)
-+if(NOT AQSIS_USE_EXTERNAL_TINYXML)
-+      declare_subproject(thirdparty/tinyxml)
-+endif()
- declare_subproject(thirdparty/partio)
- declare_subproject(libs/pointrender)
- if(AQSIS_USE_PDIFF)
---- tools/piqsl/CMakeLists.txt.orig    2014-02-16 11:18:43.308699170 +0400
-+++ tools/piqsl/CMakeLists.txt 2014-02-16 11:18:52.620699981 +0400
-@@ -5,8 +5,6 @@
-     message(FATAL_ERROR "Piqsl requires boost thread and Qt4 to build")
- endif()
- 
--include_subproject(tinyxml)
--
- set(piqsl_hdrs
-     displayserverimage.h
-     image.h
---- tools/displays/piqsl/CMakeLists.txt.orig   2014-02-16 11:21:25.820713332 +0400
-+++ tools/displays/piqsl/CMakeLists.txt        2014-02-16 11:21:34.676714104 +0400
-@@ -1,5 +1,4 @@
- include_subproject(dspyutil)
--include_subproject(tinyxml)
- 
- aqsis_add_display(piqsl piqsldisplay.cpp ${dspyutil_srcs}
-       ${tinyxml_srcs} ${tinyxml_hdrs}

diff --git a/media-gfx/aqsis/metadata.xml b/media-gfx/aqsis/metadata.xml
deleted file mode 100644 (file)
index db7d814..0000000
--- a/media-gfx/aqsis/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer type="project">
-               <email>graphics@gentoo.org</email>
-               <name>Gentoo Graphics Project</name>
-       </maintainer>
-       <upstream>
-               <remote-id type="sourceforge">aqsis</remote-id>
-       </upstream>
-</pkgmetadata>