diff --git a/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.2.1-r1.exheres-0 b/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.2.1-r1.exheres-0
deleted file mode 100644
index 2592563c..00000000
--- a/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.2.1-r1.exheres-0
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2013-2014 Thomas Witt
-# Distributed under the terms of the GNU General Public License v2
-
-require cmake [ api=2 ]
-
-SUMMARY="High performance 3D graphics toolkit"
-DESCRIPTION="
-The OpenSceneGraph is an open source high performance 3D graphics toolkit,
-used by application developers in fields such as visual simulation, games,
-virtual reality, scientific visualization and modelling. Written entirely
-in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux,
-IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph
-is now well established as the world leading scene graph technology, used
-widely in the vis-sim, space, scientific, oil-gas, games and virtual reality
-industries.
-"
-HOMEPAGE="http://${PN}.org"
-DOWNLOADS="${HOMEPAGE}/downloads/developer_releases/${PNV}.zip"
-
-BUGS_TO="pyromaniac@exherbo.org"
-
-LICENCES="OpenSceneGraph"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-# TODO Some of these may be optional
-# TODO SDL gtkglxext
-DEPENDENCIES="
-    build:
-        app-arch/zip
-    build+run:
-        app-text/poppler[cairo]
-        dev-libs/boost
-        dev-libs/libxml2:*
-        gnome-desktop/librsvg:*
-        media-libs/freetype:*
-        media-libs/giflib:=
-        media-libs/jpeg:=[<9]
-        media-libs/libpng:=
-        media-libs/tiff
-        net-misc/curl
-        sys-libs/zlib
-        x11-dri/mesa
-        x11-libs/gtk+:2
-        x11-libs/qt:4[opengl]
-"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PNV}-giflib5-part1.patch
-    "${FILES}"/${PNV}-giflib5-part2.patch
-)
-
diff --git a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.2.1-giflib5-part1.patch b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.2.1-giflib5-part1.patch
deleted file mode 100644
index 0af7eb4b..00000000
--- a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.2.1-giflib5-part1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Source: https://github.com/openscenegraph/osg/commit/afb442fccd182cfe8608f43394af016f6723f97a
-Upstream: Fixed in trunk
-Reason: Fix build with giflib 5.0
-
-From afb442fccd182cfe8608f43394af016f6723f97a Mon Sep 17 00:00:00 2001
-From: Robert OSFIELD <robert.osfield@gmail.com>
-Date: Wed, 19 Nov 2014 17:10:21 +0000
-Subject: [PATCH] From Clement Boesch, "Fix remaining bit of Giflib5 usage"
-
-git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14485 16af8721-9629-0410-8352-f15c8da7e697
----
- src/osgPlugins/gif/ReaderWriterGIF.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/osgPlugins/gif/ReaderWriterGIF.cpp b/src/osgPlugins/gif/ReaderWriterGIF.cpp
-index 4b5cd22..12f46e1 100644
---- a/src/osgPlugins/gif/ReaderWriterGIF.cpp
-+++ b/src/osgPlugins/gif/ReaderWriterGIF.cpp
-@@ -560,7 +560,11 @@ GifImageStream** obj)
-     *width_ret = giffile->SWidth;
-     *height_ret = giffile->SHeight;
-     *numComponents_ret = 4;
-+#if (GIFLIB_MAJOR >= 5)
-+    DGifCloseFile(giffile, &Error);
-+#else
-     DGifCloseFile(giffile);
-+#endif
-     return buffer;
- }
- 
diff --git a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.2.1-giflib5-part2.patch b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.2.1-giflib5-part2.patch
deleted file mode 100644
index 3ed1df21..00000000
--- a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.2.1-giflib5-part2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: https://github.com/openscenegraph/osg/commit/18213bfb67d464715af618fd8c73549f749625b9
-Upstream: Fixed in trunk
-Reason: Fix build with giflib 5.0
-
-From 18213bfb67d464715af618fd8c73549f749625b9 Mon Sep 17 00:00:00 2001
-From: Robert OSFIELD <robert.osfield@gmail.com>
-Date: Thu, 20 Nov 2014 09:21:52 +0000
-Subject: [PATCH] From Pjotr Svetachov, fix for build breakage with giflib 5.0.
-
-git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14493 16af8721-9629-0410-8352-f15c8da7e697
----
- src/osgPlugins/gif/ReaderWriterGIF.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/osgPlugins/gif/ReaderWriterGIF.cpp b/src/osgPlugins/gif/ReaderWriterGIF.cpp
-index 12f46e1..6778894 100644
---- a/src/osgPlugins/gif/ReaderWriterGIF.cpp
-+++ b/src/osgPlugins/gif/ReaderWriterGIF.cpp
-@@ -560,7 +560,7 @@ GifImageStream** obj)
-     *width_ret = giffile->SWidth;
-     *height_ret = giffile->SHeight;
-     *numComponents_ret = 4;
--#if (GIFLIB_MAJOR >= 5)
-+#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0))
-     DGifCloseFile(giffile, &Error);
- #else
-     DGifCloseFile(giffile);