commit:     eb19c6f94c499ba8cead0fbcc6ab238e6f221b78
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jan 24 11:30:48 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 11:36:04 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=eb19c6f9

media-gfx/brlcad: version bump 7.32.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 media-gfx/brlcad/brlcad-7.22.0.ebuild              | 110 ---------------------
 media-gfx/brlcad/brlcad-7.24.0.ebuild              | 110 ---------------------
 .../{brlcad-7.24.2.ebuild => brlcad-7.32.0.ebuild} |  56 ++++++-----
 media-gfx/brlcad/brlcad-9999.ebuild                |  58 ++++++-----
 .../brlcad/files/brlcad-7.18.4-libpng15.patch      |  42 --------
 media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch   |  20 ----
 media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch   |  13 ---
 7 files changed, 61 insertions(+), 348 deletions(-)

diff --git a/media-gfx/brlcad/brlcad-7.22.0.ebuild 
b/media-gfx/brlcad/brlcad-7.22.0.ebuild
deleted file mode 100644
index 2ffb45045..000000000
--- a/media-gfx/brlcad/brlcad-7.22.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils java-pkg-2 flag-o-matic
-
-DESCRIPTION="Constructive solid geometry modeling system"
-HOMEPAGE="https://brlcad.org/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmarks debug doc examples java opengl smp"
-
-RDEPEND="media-libs/libpng:0
-       sys-libs/zlib
-       >=sci-libs/tnt-3
-       sci-libs/jama
-       <dev-lang/tcl-8.6:0
-       <dev-lang/tk-8.6:0
-       <dev-tcltk/itcl-4.0
-       <dev-tcltk/itk-4.0
-       dev-tcltk/iwidgets
-       dev-tcltk/tkimg
-       dev-tcltk/tkpng
-       sys-libs/libtermcap-compat
-       media-libs/urt
-       x11-libs/libXt
-       x11-libs/libXi
-       java? ( >=virtual/jre-1.5:* )
-       "
-
-DEPEND="${RDEPEND}
-       sys-devel/bison
-       sys-devel/flex
-       dev-tcltk/tktable
-       >=virtual/jre-1.5:*
-       doc? (
-               dev-libs/libxslt
-               app-doc/doxygen
-       )"
-
-BRLCAD_DIR="${EPREFIX}/usr/${PN}"
-
-#src_prepare() {
-#      epatch "${FILESDIR}/${P}-cmake.patch"
-#}
-
-src_configure() {
-filter-flags -std=c++0x
-       if use Debug; then
-               CMAKE_BUILD_TYPE=Debug
-               else
-               CMAKE_BUILD_TYPE=Release
-               fi
-       local mycmakeargs=(
-               -DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
-               -DBRLCAD_ENABLE_STRICT=OFF
-               -DBRLCAD-ENABLE_STRICT=OFF
-               -DBRLCAD-ENABLE_COMPILER_WARNINGS=OFF
-               -DBRLCAD_FLAGS_OPTIMIZATION=ON
-               -DBRLCAD_ENABLE_X11=ON
-               -DBRLCAD_BUNDLED_LIBS=AUTO
-               )
-
-                       # use flag triggered options
-       if use debug; then
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
-       else
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
-       fi
-       mycmakeargs+=(
-               $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL)
-#experimental RTGL support
-       #       $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL)
-               $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT)
-               $(cmake-utils_use smp BRLCAD_ENABLE_SMP)
-       #       $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER)
-               $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN)
-               $(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS)
-                       )
-       cmake-utils_src_configure
-}
-
-src_compile() {
-       cmake-utils_src_compile
-}
-
-src_test() {
-       cmake-utils_src_test
-       #emake check || die "emake check failed"
-       if use benchmarks; then
-               emake benchmark
-       fi
-}
-
-src_install() {
-       cmake-utils_src_install
-       rm -f 
"${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING}
-       dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
-       echo "PATH=\"${BRLCAD_DIR}/bin\"" >  99brlcad
-       echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
-       doenvd 99brlcad
-       newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png 
brlcad.png
-       make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
-}

diff --git a/media-gfx/brlcad/brlcad-7.24.0.ebuild 
b/media-gfx/brlcad/brlcad-7.24.0.ebuild
deleted file mode 100644
index 614abc387..000000000
--- a/media-gfx/brlcad/brlcad-7.24.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils java-pkg-2 flag-o-matic
-
-DESCRIPTION="Constructive solid geometry modeling system"
-HOMEPAGE="https://brlcad.org/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmarks debug doc examples java opengl smp"
-
-RDEPEND="media-libs/libpng:0
-       sys-libs/zlib
-       >=sci-libs/tnt-3
-       sci-libs/jama
-       <dev-lang/tcl-8.6:0
-       <dev-lang/tk-8.6:0
-       <dev-tcltk/itcl-4.0
-       <dev-tcltk/itk-4.0
-       dev-tcltk/iwidgets
-       dev-tcltk/tkimg
-       dev-tcltk/tkpng
-       sys-libs/libtermcap-compat
-       media-libs/urt
-       x11-libs/libXt
-       x11-libs/libXi
-       java? ( >=virtual/jre-1.5:* )
-       "
-
-DEPEND="${RDEPEND}
-       sys-devel/bison
-       sys-devel/flex
-       dev-tcltk/tktable
-       >=virtual/jre-1.5:*
-       doc? (
-               dev-libs/libxslt
-               app-doc/doxygen
-       )"
-
-BRLCAD_DIR="${EPREFIX}/usr/${PN}"
-
-#src_prepare() {
-#      epatch "${FILESDIR}/${P}-cmake.patch"
-#}
-
-src_configure() {
-filter-flags -std=c++0x
-       if use Debug; then
-               CMAKE_BUILD_TYPE=Debug
-               else
-               CMAKE_BUILD_TYPE=Release
-               fi
-       local mycmakeargs=(
-               -DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
-               -DBRLCAD_ENABLE_STRICT=NO
-               -DBRLCAD-ENABLE_COMPILER_WARNINGS=NO
-               -DBRLCAD_BUNDLED_LIBS=ON
-               -DBRLCAD_FLAGS_OPTIMIZATION=ON
-               -DBRLCAD_ENABLE_X11=ON
-               -DCMAKE_BUILD_TYPE=Release
-               )
-
-                       # use flag triggered options
-       if use debug; then
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
-       else
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
-       fi
-       mycmakeargs+=(
-               $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL)
-#experimental RTGL support
-       #       $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL)
-               $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT)
-               $(cmake-utils_use smp BRLCAD_ENABLE_SMP)
-       #       $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER)
-               $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN)
-               $(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS)
-                       )
-       cmake-utils_src_configure
-}
-
-src_compile() {
-       cmake-utils_src_compile
-}
-
-src_test() {
-       cmake-utils_src_test
-       #emake check || die "emake check failed"
-       if use benchmarks; then
-               emake benchmark
-       fi
-}
-
-src_install() {
-       cmake-utils_src_install
-       rm -f 
"${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING}
-       dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
-       echo "PATH=\"${BRLCAD_DIR}/bin\"" >  99brlcad
-       echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
-       doenvd 99brlcad
-       newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png 
brlcad.png
-       make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
-}

diff --git a/media-gfx/brlcad/brlcad-7.24.2.ebuild 
b/media-gfx/brlcad/brlcad-7.32.0.ebuild
similarity index 59%
rename from media-gfx/brlcad/brlcad-7.24.2.ebuild
rename to media-gfx/brlcad/brlcad-7.32.0.ebuild
index 1c07e1bcd..cdd501833 100644
--- a/media-gfx/brlcad/brlcad-7.24.2.ebuild
+++ b/media-gfx/brlcad/brlcad-7.32.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils java-pkg-2 flag-o-matic
+EAPI=7
+
+inherit cmake java-pkg-2 flag-o-matic
 
 DESCRIPTION="Constructive solid geometry modeling system"
 HOMEPAGE="https://brlcad.org/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/project/brlcad/BRL-CAD%20Source/${PV}/${P}.tar.gz";
 
 LICENSE="LGPL-2 BSD"
 SLOT="0"
@@ -15,7 +16,7 @@ IUSE="benchmarks debug doc examples java opengl smp"
 
 RDEPEND="
        java? (
-               >=virtual/jre-1.5:*
+               >=virtual/jre-1.7:*
        )
        "
 
@@ -34,7 +35,7 @@ DEPEND="${RDEPEND}
        x11-libs/libXi
        java? (
                sci-libs/jama
-               >=virtual/jre-1.5:*
+               >=virtual/jre-1.7:*
        )
        doc? (
                dev-libs/libxslt
@@ -44,7 +45,7 @@ DEPEND="${RDEPEND}
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
 src_prepare() {
-       epatch "${FILESDIR}/${P}-cmake.patch"
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -62,35 +63,34 @@ src_configure() {
                -DBRLCAD_FLAGS_OPTIMIZATION=ON
                -DBRLCAD_ENABLE_X11=ON
                -DBRLCAD_ENABLE_VERBOSE_PROGRESS=ON
-               )
+       )
 
-                       # use flag triggered options
+       # use flag triggered options
        if use debug; then
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
+               mycmakeargs+="-DCMAKE_BUILD_TYPE=Debug"
        else
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
+               mycmakeargs+="-DCMAKE_BUILD_TYPE=Release"
        fi
        mycmakeargs+=(
-               $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL)
-#experimental RTGL support
-#              $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL)
-               $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT)
-               $(cmake-utils_use smp BRLCAD_ENABLE_SMP)
-               $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER)
-               $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN)
-               )
-       cmake-utils_src_configure
+               $(usex opengl BRLCAD_ENABLE_OPENGL)
+               $(usex opengl BRLCAD_ENABLE_RTGL)
+               $(usex amd64 BRLCAD_ENABLE_64BIT)
+               $(usex smp BRLCAD_ENABLE_SMP)
+               $(usex java BRLCAD_ENABLE_RTSERVER)
+               $(usex examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+               $(usex doc BRLCAD_EXTRADOCS)
+               $(usex doc BRLCAD_EXTRADOCS_PDF)
+               $(usex doc BRLCAD_EXTRADOCS_MAN)
+       )
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 }
 
 src_test() {
-       cmake-utils_src_test
+       cmake_src_test
        emake check
        if use benchmarks; then
                emake benchmark
@@ -98,12 +98,14 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        rm -f 
"${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING}
        dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
        echo "PATH=\"${BRLCAD_DIR}/bin\"" >  99brlcad
        echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
        doenvd 99brlcad
-       newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png 
brlcad.png
-       make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
+       for size in 16,24,36,48,64,96,128,256; do
+               doicon misc/debian/${size}x${Size}/*
+       done
+       domenu misc/debian/*.desktop
 }

diff --git a/media-gfx/brlcad/brlcad-9999.ebuild 
b/media-gfx/brlcad/brlcad-9999.ebuild
index 6508d2465..eacc46b38 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils subversion java-pkg-2 flag-o-matic
+EAPI=7
+
+inherit cmake subversion java-pkg-2 flag-o-matic
 
 DESCRIPTION="Constructive solid geometry modeling system"
 HOMEPAGE="https://brlcad.org/";
@@ -15,7 +16,7 @@ IUSE="benchmarks debug doc examples java opengl smp"
 
 RDEPEND="
        java? (
-               >=virtual/jre-1.5:*
+               >=virtual/jre-1.7:*
        )
        "
 
@@ -34,7 +35,7 @@ DEPEND="${RDEPEND}
        x11-libs/libXi
        java? (
                sci-libs/jama
-               >=virtual/jre-1.5:*
+               >=virtual/jre-1.7:*
        )
        doc? (
                dev-libs/libxslt
@@ -43,6 +44,10 @@ DEPEND="${RDEPEND}
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
+src_prepare() {
+       cmake_src_prepare
+}
+
 src_configure() {
        append-cflags "-w"
        if use debug; then
@@ -58,48 +63,49 @@ src_configure() {
                -DBRLCAD_FLAGS_OPTIMIZATION=ON
                -DBRLCAD_ENABLE_X11=ON
                -DBRLCAD_ENABLE_VERBOSE_PROGRESS=ON
-               )
+       )
 
-                       # use flag triggered options
+       # use flag triggered options
        if use debug; then
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
+               mycmakeargs+="-DCMAKE_BUILD_TYPE=Debug"
        else
-               mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
+               mycmakeargs+="-DCMAKE_BUILD_TYPE=Release"
        fi
        mycmakeargs+=(
-               $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL)
-#experimental RTGL support
-#              $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL)
-               $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT)
-               $(cmake-utils_use smp BRLCAD_ENABLE_SMP)
-               $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER)
-               $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF)
-               $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN)
-               )
-       cmake-utils_src_configure
+               $(usex opengl BRLCAD_ENABLE_OPENGL)
+               $(usex opengl BRLCAD_ENABLE_RTGL)
+               $(usex amd64 BRLCAD_ENABLE_64BIT)
+               $(usex smp BRLCAD_ENABLE_SMP)
+               $(usex java BRLCAD_ENABLE_RTSERVER)
+               $(usex examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+               $(usex doc BRLCAD_EXTRADOCS)
+               $(usex doc BRLCAD_EXTRADOCS_PDF)
+               $(usex doc BRLCAD_EXTRADOCS_MAN)
+       )
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 }
 
 src_test() {
-       cmake-utils_src_test
-       #emake check || die "emake check failed"
+       cmake_src_test
+       emake check
        if use benchmarks; then
                emake benchmark
        fi
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        rm -f 
"${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING}
        dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
        echo "PATH=\"${BRLCAD_DIR}/bin\"" >  99brlcad
        echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
        doenvd 99brlcad
-       newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png 
brlcad.png
-       make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
+       for size in 16,24,36,48,64,96,128,256; do
+               doicon misc/debian/${size}x${Size}/*
+       done
+       domenu misc/debian/*.desktop
 }

diff --git a/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch 
b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
deleted file mode 100644
index e0d42d1e2..000000000
--- a/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://bugs.gentoo.org/378273
-
---- src/libged/png.c
-+++ src/libged/png.c
-@@ -30,6 +30,8 @@
- #include <string.h>
- #include "bio.h"
- 
-+#include <zlib.h> /* Z_BEST_COMPRESSION */
-+
- #include "png.h"
- #include "bu.h"
- #include "vmath.h"
---- src/fb/fb-png.c    2011-04-12 14:31:56.000000000 -0400
-+++ src/fb/fb-png.c.new        2011-09-19 13:18:08.000000000 -0400
-@@ -38,13 +38,13 @@
- #  include <unistd.h>
- #endif
- 
-+#include "zlib.h"
- #include "png.h"
- #include "bu.h"
- #include "fb.h"
- 
- #include "pkg.h"
- 
--
- /* in cmap-crunch.c */
- extern void cmap_crunch(RGBpixel (*scan_buf), int pixel_ct, ColorMap 
*colormap);
- 
---- src/util/pix-png.c 2011-04-12 14:34:24.000000000 -0400
-+++ src/util/pix-png.c.new     2011-09-19 13:18:59.000000000 -0400
-@@ -36,7 +36,8 @@
- #include "bio.h"
- 
- #include "zlib.h"
--#include "pngconf.h"
-+/* removed as png.h includes this and including it in the wrong order seems 
to cause bugs
-+#include "pngconf.h" */
- #include "png.h"
- 
- #include "bu.h"

diff --git a/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch 
b/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
deleted file mode 100644
index 1dd79c2da..000000000
--- a/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- brlcad-7.20.4/CMakeLists.txt       2012-02-11 22:21:21.407311510 -0500
-+++ brlcad-7.20.4/CMakeLists.txt       2012-02-11 22:21:33.220804265 -0500
-@@ -1394,7 +1394,7 @@
-       ENDFOREACH()
-       FOREACH(path_label ${PATH_LABELS})
-               SET(CURRENT_LABEL ${${path_label}_LABEL})
--              STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+              STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
-               WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
-                       SET(CURRENT_LABEL " ${CURRENT_LABEL}")
-                       STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
-@@ -1436,7 +1436,7 @@
-       ENDFOREACH()
-       FOREACH(setting_label ${SETTINGLABELS})
-               SET(CURRENT_LABEL ${${setting_label}_LABEL})
--              STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+              STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
-               WHILE(${SETTING_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
-                       SET(CURRENT_LABEL "${CURRENT_LABEL} ")
-                       STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)

diff --git a/media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch 
b/media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch
deleted file mode 100644
index 52d423d75..000000000
--- a/media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/misc/CMake/BRLCAD_CMakeFiles.cmake       2015-04-27 12:18:13.159285916 
-0400
-+++ b/misc/CMake/BRLCAD_CMakeFiles.cmake       2015-04-27 12:19:40.722856052 
-0400
-@@ -82,6 +82,10 @@
-       endif("${ITEM}" MATCHES "${TARGET_FLAG}")
-       endforeach(TARGET_FLAG ${FUZZY_TARGET_FLAGS})
- 
-+      if("${ITEM}" MATCHES "MODULE")
-+            set(CMAKEFILES_DO_TEST 0)
-+      endif("")
-+
-       # Handled target flags, proceeding with tests.
-       if(CMAKEFILES_DO_TEST)
-       get_filename_component(ITEM_PATH "${ITEM}" PATH)

Reply via email to