[gentoo-commits] proj/sci:master commit in: sci-visualization/forge/, sci-visualization/forge/files/

["Marius Brehler" <marbre@linux.sungazer.de>]

commit:     dabd3e0a64af370f970c6855d1c9b8bad0c5cfd8
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Nov 28 18:19:15 2015 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Nov 28 18:19:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=dabd3e0a

sci-visualization/forge: Drop old

Package-Manager: portage-2.2.20.1

 sci-visualization/forge/ChangeLog                  |  4 ++
 .../forge/files/forge-3.1-find-glm.patch           | 32 ---------------
 sci-visualization/forge/forge-3.1.ebuild           | 47 ----------------------
 3 files changed, 4 insertions(+), 79 deletions(-)

diff --git a/sci-visualization/forge/ChangeLog b/sci-visualization/forge/ChangeLog
index abee051..1a510cb 100644
--- a/sci-visualization/forge/ChangeLog
+++ b/sci-visualization/forge/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  28 Nov 2015; Marius Brehler <marbre@linux.sungazer.de>
+  -files/forge-3.1-find-glm.patch, -forge-3.1.ebuild:
+  sci-visualization/forge: Drop old
+
 *forge-3.2.0 (24 Nov 2015)
 
   24 Nov 2015; Marius Brehler <marbre@linux.sungazer.de> +forge-3.2.0.ebuild:

diff --git a/sci-visualization/forge/files/forge-3.1-find-glm.patch b/sci-visualization/forge/files/forge-3.1-find-glm.patch
deleted file mode 100644
index d353539..0000000
--- a/sci-visualization/forge/files/forge-3.1-find-glm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 25f7da5af693288f56897f772fbb6f89ab710197 Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marius.brehler@tu-dortmund.de>
-Date: Wed, 16 Sep 2015 17:37:56 +0200
-Subject: [PATCH] find_package GLM or glm (>=glm-0.9.7.0). Fixes #49.
-
----
- src/CMakeLists.txt | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5681e32..87cb3b0 100755
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,7 +1,14 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
- 
- IF(USE_SYSTEM_GLM)
--    FIND_PACKAGE(GLM REQUIRED)
-+    # Prior to GLM 0.9.7.0, the package is found by the FindGLM.cmake module.
-+    # This was removed with GLM 0.9.7.0, instead a glm-config.cmake configuration
-+    # file is provided. Therefore, both FIND_PACKAGE calls are necessary.
-+    FIND_PACKAGE(GLM QUIET)
-+    FIND_PACKAGE(glm QUIET)
-+    IF(NOT glm_FOUND AND NOT GLM_FOUND)
-+        MESSAGE(FATAL_ERROR "GLM Not Found")
-+    ENDIF()
- ELSE(USE_SYSTEM_GLM)
-     INCLUDE("${CMAKE_MODULE_PATH}/build_glm.cmake")
- ENDIF(USE_SYSTEM_GLM)
--- 
-2.4.6
-

diff --git a/sci-visualization/forge/forge-3.1.ebuild b/sci-visualization/forge/forge-3.1.ebuild
deleted file mode 100644
index e01494d..0000000
--- a/sci-visualization/forge/forge-3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="High Performance Visualizations for ArrayFire"
-HOMEPAGE="http://www.arrayfire.com/"
-SRC_URI="https://github.com/arrayfire/${PN}/archive/af${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	media-libs/glew
-	>=media-libs/glfw-3.1.1
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	>=media-libs/glm-0.9.7.1
-	virtual/opengl
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-af${PV}"
-
-PATCHES=( "${FILESDIR}/${P}"-find-glm.patch )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
-			die "Compilation with gcc older than 4.7 is not supported."
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-	   $(cmake-utils_use_build examples EXAMPLES)
-	   -DUSE_SYSTEM_GLM=ON
-	   -DUSE_SYSTEM_FREETYPE=ON
-	)
-	cmake-utils_src_configure
-}