Install into the correct libdir, bug #273308

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 11 insertions, 57 deletions

diff --git a/dev-games/physfs/ChangeLog b/dev-games/physfs/ChangeLog
index 6ae8b2475a8d..c3584e117fb4 100644
--- a/dev-games/physfs/ChangeLog
+++ b/dev-games/physfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-games/physfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/ChangeLog,v 1.22 2009/05/26 14:59:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/ChangeLog,v 1.23 2009/06/09 13:51:45 nyhm Exp $
+
+  09 Jun 2009; Tristan Heaven <nyhm@gentoo.org> physfs-2.0.0.ebuild:
+  Install into the correct libdir, bug #273308
 
   26 May 2009; Alfredo Tupone <tupone@gentoo.org>
   +files/physfs-2.0.0-gcc44.patch, physfs-2.0.0.ebuild:
diff --git a/dev-games/physfs/files/physfs-2.0.0-gcc44.patch b/dev-games/physfs/files/physfs-2.0.0-gcc44.patch
deleted file mode 100644
index 767eea5f40e9..000000000000
--- a/dev-games/physfs/files/physfs-2.0.0-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.old	2009-05-26 16:49:01.000000000 +0200
-+++ CMakeLists.txt	2009-05-26 16:49:16.000000000 +0200
-@@ -44,7 +44,7 @@
- # Add some gcc-specific command lines.
- IF(CMAKE_COMPILER_IS_GNUCC)
-     # Always build with debug symbols...you can strip it later.
--    ADD_DEFINITIONS(-g -pipe -Werror -fsigned-char)
-+    ADD_DEFINITIONS(-g -pipe -fsigned-char)
- 
-     # Stupid BeOS generates warnings in the system headers.
-     IF(NOT BEOS)
diff --git a/dev-games/physfs/physfs-1.1.1.ebuild b/dev-games/physfs/physfs-1.1.1.ebuild
deleted file mode 100644
index 24cba832c83a..000000000000
--- a/dev-games/physfs/physfs-1.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/physfs-1.1.1.ebuild,v 1.1 2007/08/27 00:54:43 mr_bones_ Exp $
-
-DESCRIPTION="abstraction layer for filesystems, useful for games"
-HOMEPAGE="http://icculus.org/physfs/"
-SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="-* ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/test_physfs/d' \
-		CMakeLists.txt \
-		|| die "sed failed"
-}
-
-src_compile() {
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .
-	emake || die
-	if use doc ; then
-		doxygen
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use doc ; then
-		dohtml -r docs/html
-	fi
-	dodoc CHANGELOG.txt CREDITS.txt TODO.txt
-}
diff --git a/dev-games/physfs/physfs-2.0.0.ebuild b/dev-games/physfs/physfs-2.0.0.ebuild
index 80fcc44f6ffa..fa337c09e39c 100644
--- a/dev-games/physfs/physfs-2.0.0.ebuild
+++ b/dev-games/physfs/physfs-2.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/physfs-2.0.0.ebuild,v 1.2 2009/05/26 14:59:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/physfs-2.0.0.ebuild,v 1.3 2009/06/09 13:51:45 nyhm Exp $
 
 EAPI=2
-inherit eutils cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="Abstraction layer for filesystem and archive access"
 HOMEPAGE="http://icculus.org/physfs/"
@@ -18,7 +18,11 @@ RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
+	sed -i \
+		-e 's:-Werror::' \
+		-e '/DESTINATION/s:lib:lib${LIB_SUFFIX}:' \
+		CMakeLists.txt \
+		|| die "sed failed"
 	# make sure these libs aren't used
 	rm -rf lzma zlib*
 }