media-gfx/brlcad: removed old version

4 files changed, 7 insertions, 102 deletions

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index a360494c6..5094a8a79 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,8 +4,11 @@
 
 *brlcad-7.20.2 (15 Jul 2011)
 
-  11 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
-  Fixed building error
+  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
+
+  11 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-7.20.4.ebuild:
+  fixed as-needed filtering
 
   5 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
   Use system libraries
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
index 84659e302..85d73fe59 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1,2 +1 @@
-DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca
 DIST brlcad-7.20.4.tar.gz 70674938 SHA256 ee6210890f9f2115613b40dc25af95091dc700b5cc1ae390758a62b64854b65e SHA512 ac75675af04bfad444f66c0597aae6738883f49a92b775e1324d981968671adb8ac2a9aec921135498be84d4f6724741a2eeab7c3b3da64add2b20681f87dfdd WHIRLPOOL 8ba8093428c8aeb281538dd0a17c871dd8500affc118e524b0b12356d5dec082db3b136af7f80b524ad25fab6e49b3590dd9ef1f8e1310936ef106d53ee33a29
diff --git a/media-gfx/brlcad/brlcad-7.20.2.ebuild b/media-gfx/brlcad/brlcad-7.20.2.ebuild
deleted file mode 100644
index f5540894d..000000000
--- a/media-gfx/brlcad/brlcad-7.20.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.1 2011/04/18 22:47:37 dilfridge Exp $
-
-EAPI=3
-inherit eutils java-pkg-opt-2
-
-DESCRIPTION="Constructive solid geometry modeling system"
-HOMEPAGE="http://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
-	sys-libs/zlib
-	>=sci-libs/tnt-3
-	sci-libs/jama
-	=dev-tcltk/itcl-3.4*
-	=dev-tcltk/itk-3.4*
-	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
-	java? ( >=virtual/jdk-1.5 )
-	doc? ( dev-libs/libxslt )"
-
-BRLCAD_DIR="${EPREFIX}/usr/${PN}"
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-7.18.4-libpng15.patch"
-}
-
-src_configure() {
-	local myconf="--without-jdk"
-	use java &&	myconf="--with-jdk=$(java-config -O)"
-
-	econf \
-		--disable-strict-build \
-		--prefix="${BRLCAD_DIR}" \
-		--datadir="${BRLCAD_DIR}/share" \
-		--mandir="${BRLCAD_DIR}/man" \
-		--disable-almost-everything \
-		--disable-regex-build \
-		--disable-png-build \
-		--disable-zlib-build \
-		--disable-urt-build \
-		--disable-tcl-build \
-		--disable-tk-build \
-		--disable-itcl-build \
-		--disable-tkimg-build \
-		--disable-jove-build \
-		--disable-tnt-install \
-		--disable-iwidgets-install \
-		--enable-opennurbs-build \
-		--with-ldflags="-L${EPREFIX}/usr/$(get_libdir)/itcl3.4 -L${EPREFIX}/usr/$(get_libdir)/itk3.4" \
-		--with-x \
-		--with-x11 \
-		$(use_enable debug) \
-		$(use_enable debug optimization) \
-		$(use_enable debug runtime-debug) \
-		$(use_enable debug verbose) \
-		$(use_enable debug warnings) \
-		$(use_enable debug progress) \
-		$(use_enable doc documentation) \
-		$(use_enable examples models-install) \
-		$(use_enable smp parallel) \
-		$(use_with opengl ogl) \
-		${myconf}
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	if use benchmarks; then
-		emake benchmark || die "emake benchmark failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	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 || die
-	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.20.4.ebuild b/media-gfx/brlcad/brlcad-7.20.4.ebuild
index f150a459c..aa057a6f9 100644
--- a/media-gfx/brlcad/brlcad-7.20.4.ebuild
+++ b/media-gfx/brlcad/brlcad-7.20.4.ebuild
@@ -45,12 +45,12 @@ DEPEND="${RDEPEND}
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-9999-cmake.patch"
+	epatch "${FILESDIR}/${P}-cmake.patch"
 }
 
 src_configure() {
 filter-flags -std=c++0x
-filter-ldflags -Wl,--as-needed
+append-ldflags $(no-as-needed)
 	if use Debug; then
 		CMAKE_BUILD_TYPE=Debug
 		else