Install into the correct libdir, bug #273308

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 23 insertions, 62 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/Manifest b/dev-games/physfs/Manifest
index b09757dd4511..b7fa30d01c13 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,11 +1,18 @@
-AUX physfs-2.0.0-gcc44.patch 445 RMD160 ca7cba70181ee1526c16628d38deb55fc774ffe6 SHA1 fa387bf3655c2916ad010a0652518788c80d10cb SHA256 986d1db14250d3e9652009e5ae63279af494f781daac31339f07e4bc25e614ac
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST physfs-1.0.1.tar.gz 539978 RMD160 3a3fc6f66b397fe966e5aa661e3aa415055ef3b1 SHA1 48803ceb60b44a4d3b7511b7a2d66a020d86e95a SHA256 cbe80331ca69429231c072f0234791331ed0a9e42e65f3c88f297ec75615869a
 DIST physfs-1.0.2.tar.gz 649980 RMD160 6487174150179681d68a0d41cab5923fb04f1997 SHA1 d1e6470b9af4f73b6da4f7d65928551425b1cf4e SHA256 87aff3cbf756d4a22ceba41eae4b0484c3a96b8c6c12ec0ddcf38006995414f6
-DIST physfs-1.1.1.tar.gz 345054 RMD160 f0d9e2340bd65be527bf97c3c3a6a660c6505eff SHA1 7d167955732415b61dd93dae1b2419e98cd6419a SHA256 994b65066657d49002509c9d84a9b0d2f5c0c1dab0457e9fe21ffa40f2205f63
 DIST physfs-2.0.0.tar.gz 671421 RMD160 ee2174f7196ff66b16df3bcd4b1c2946f20b088b SHA1 3cfa291a82f2b0cf15b205efcf8bf53c0b54c92c SHA256 cbdfaf484d26c2c5d5673aabf8a3f1e0afdcbbd0a99865ba226e9368f3c5501c
 EBUILD physfs-1.0.1.ebuild 801 RMD160 22ffb9b8d20c274f80c330be002047ed85298dc3 SHA1 849bcc00414e0928df069f36d6472970d219b4af SHA256 7fd86a108691a1964d0c87053734667dc9eb1044d7aff28152ac881684c962d1
 EBUILD physfs-1.0.2.ebuild 852 RMD160 9a262205e13cba806e95378622b0fe955b23df27 SHA1 e21718c283af11d05dd59c6db3056f7790d58936 SHA256 23ee51deae684c8ef2567a5a6c8f3cbe921e49e7d752a27ab71cf670c152b1c5
-EBUILD physfs-1.1.1.ebuild 923 RMD160 fdc10df4655e10168a3ff61522cca52981867bb5 SHA1 771410dcf5fd0e755bbdc5565190f8a4b2c1f21c SHA256 4a17bd8b89dc26c4691a171529fa8adf0e0069eb1b31b8f70c120cd6f47533c2
-EBUILD physfs-2.0.0.ebuild 1447 RMD160 78c863f49c59f05664846eba8f08957f89c23dc4 SHA1 3c4092cf651906ffc8d9fc8dac5c44c0c52f6091 SHA256 a5b3481fbf64091fb21c0cce980d3a82f2feccb844e68d6db632d726a240eba0
-MISC ChangeLog 3080 RMD160 f318f153336941f99450f12942d734c058c344ae SHA1 71fae9118dff0d8a87feb452f5ddc693020c5677 SHA256 e26daba1dace45748d62a5e9f866be42edf181ecfb65e3be4e1f10bf7799e145
+EBUILD physfs-2.0.0.ebuild 1517 RMD160 7ef5edd7a82cd9d8d3d1e1ef9ead1b577dd4f278 SHA1 4121ff026605aae2cdfeae9c3775d4a31beff143 SHA256 57c95f1725527f751fea896a84abd33662721d68187855b92582fa98d65293b8
+MISC ChangeLog 3195 RMD160 865cfcd3ec5758980314bc88c97e78eddeb79f1c SHA1 947c42ca6f008da06449f5decf785deaa758a3c8 SHA256 a332138edab3334afeb93d696d21dfceeaf2cffee832b643ee9ca51ef55fa9a0
 MISC metadata.xml 1718 RMD160 62db4b498b9d04313f8a0dc57a7aa42f9ebaa34d SHA1 e1e680968ab72efcde1a2b7acd0867bff26e28ab SHA256 0af45d6f542f0a73024327df7f900e21c2916a88eb128755cc4d49c390fa99ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkouaPcACgkQdz7hIScOURHSnQCg2QU+0UYcd1Tmtv8BsXTeidix
+PSoAnAivLicB7i1LMYogUO2iWKj8LIba
+=dSiE
+-----END PGP SIGNATURE-----
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*
 }