From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SDBKf-0000TX-3J for garchives@archives.gentoo.org; Thu, 29 Mar 2012 09:07:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62DE8E0D40; Thu, 29 Mar 2012 09:07:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 23DB7E0D40 for ; Thu, 29 Mar 2012 09:07:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4558D1B401D for ; Thu, 29 Mar 2012 09:07:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0BF6FE5402 for ; Thu, 29 Mar 2012 09:07:30 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1332885527.8fbb6bf05b4682333c44cd57e3f47b09413ad75f.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/ X-VCS-Repository: proj/sci X-VCS-Files: media-gfx/brlcad/ChangeLog media-gfx/brlcad/brlcad-9999.ebuild media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch media-gfx/brlcad/files/brlcad-9999-cmake.patch X-VCS-Directories: media-gfx/brlcad/files/ media-gfx/brlcad/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8fbb6bf05b4682333c44cd57e3f47b09413ad75f X-VCS-Branch: master Date: Thu, 29 Mar 2012 09:07:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 55e298b5-92c3-49f9-9d1f-916943e65837 X-Archives-Hash: a3396f8dab885cc82b26a3510ed62e69 commit: 8fbb6bf05b4682333c44cd57e3f47b09413ad75f Author: Dongxu Li gmail com> AuthorDate: Tue Mar 27 21:58:47 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Mar 27 21:58:47 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D8fbb6bf0 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 $ =20 -*brlcad-7.20.2 (15 Jul 2011) +*brlcad-7.20.4 (27 Mar 2012) + + 27 Mar 2012; Dongxu Li brlcad-9999.ebuild +fi= les/brlcad-7.20.4-cmake.patch: + added missing patch for 7.20.4 =20 12 Feb 2012; Dongxu Li -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/brlca= d-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=3D"${RDEPEND} =20 BRLCAD_DIR=3D"${EPREFIX}/usr/${PN}" =20 -src_prepare() { - epatch "${FILESDIR}/${P}-cmake.patch" -} - src_configure() { filter-flags -std=3Dc++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/b= rlcad/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)