[gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/

["Justin Lecher" <jlec@gentoo.org>]

commit:     8fbb6bf05b4682333c44cd57e3f47b09413ad75f
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 27 21:58:47 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 21:58:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8fbb6bf0

media-gfx/brlcad: added missing patch

---
 media-gfx/brlcad/ChangeLog                       |    5 ++++-
 media-gfx/brlcad/brlcad-9999.ebuild              |    4 ----
 media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch |   20 ++++++++++++++++++++
 media-gfx/brlcad/files/brlcad-9999-cmake.patch   |   11 -----------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 5094a8a..a22b70a 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -2,7 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.3 2011/04/18 22:47:37 dilfridge Exp $
 
-*brlcad-7.20.2 (15 Jul 2011)
+*brlcad-7.20.4 (27 Mar 2012)
+
+  27 Mar 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild +files/brlcad-7.20.4-cmake.patch:
+  added missing patch for 7.20.4
 
   12 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> -brlcad-7.20.2.ebuild brlcad-7.20.4.ebuild:
   Removed 7.20.2 for building issues. Fixed 7.20.4 for as-needed

diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
index 1f841c2..e7cfb1c 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -44,10 +44,6 @@ DEPEND="${RDEPEND}
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cmake.patch"
-}
-
 src_configure() {
 filter-flags -std=c++0x
 	append-ldflags $(no-as-needed)

diff --git a/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
new file mode 100644
index 0000000..1dd79c2
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
@@ -0,0 +1,20 @@
+--- 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-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
deleted file mode 100644
index 17a63d6..0000000
--- a/media-gfx/brlcad/files/brlcad-9999-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- brlcad-9999/CMakeLists.txt	2012-02-11 11:37:28.287828624 -0500
-+++ brlcad-9999/CMakeLists.txt	2012-02-11 11:37:54.018158044 -0500
-@@ -1586,7 +1586,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)