Adapt to recent changes on cmake_utils eclass (closing bug #263510) and remove forced rpath

(Portage version: 2.2_rc26/cvs/Linux x86_64)

3 files changed, 14 insertions, 37 deletions

diff --git a/media-libs/lasi/ChangeLog b/media-libs/lasi/ChangeLog
index 932cf341987b..ae123558d4d6 100644
--- a/media-libs/lasi/ChangeLog
+++ b/media-libs/lasi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/lasi
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.3 2008/11/04 17:49:58 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.4 2009/03/25 12:55:19 bicatali Exp $
+
+  25 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> -lasi-1.1.0.ebuild,
+  lasi-1.1.0-r1.ebuild:
+  Adapt to recent changes on cmake_utils eclass (closing bug #263510) and
+  remove forced rpath
 
 *lasi-1.1.0-r1 (04 Nov 2008)
 
diff --git a/media-libs/lasi/lasi-1.1.0-r1.ebuild b/media-libs/lasi/lasi-1.1.0-r1.ebuild
index f98f95ba1bb0..87f9c5326359 100644
--- a/media-libs/lasi/lasi-1.1.0-r1.ebuild
+++ b/media-libs/lasi/lasi-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.0-r1.ebuild,v 1.1 2008/11/04 17:49:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.0-r1.ebuild,v 1.2 2009/03/25 12:55:19 bicatali Exp $
 
 EAPI=2
 inherit eutils cmake-utils
@@ -43,6 +43,10 @@ src_prepare() {
 }
 
 src_configure() {
-	use doc || mycmakeargs="${mycmakeargs} -DDOXYGEN_EXECUTABLE="
+	CMAKE_BUILD_TYPE=None
+	mycmakeargs="${mycmakeargs}
+		 -DCMAKE_SKIP_RPATH=OFF
+		 -DUSE_RPATH=OFF"
+		use doc || mycmakeargs="${mycmakeargs} -DDOXYGEN_EXECUTABLE="
 	cmake-utils_src_configure
 }
diff --git a/media-libs/lasi/lasi-1.1.0.ebuild b/media-libs/lasi/lasi-1.1.0.ebuild
deleted file mode 100644
index 30713c10b22e..000000000000
--- a/media-libs/lasi/lasi-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.0.ebuild,v 1.2 2008/10/25 22:35:28 pvdabeel Exp $
-
-inherit eutils cmake-utils multilib
-
-MY_PN="libLASi"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C++ library for postscript stream output"
-HOMEPAGE="http://www.unifont.org/lasi/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS NEWS NOTES README"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "s:\/lib$:\/$(get_libdir):" \
-		-i cmake/modules/instdirs.cmake \
-		|| die "Failed to fix cmake files for multilib."
-}