From d2de7a56a8c93983fc319464052e7f8dd37b5464 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 25 Apr 2011 02:45:24 +0000 Subject: Don't install libs into /usr/lib6464 (bug #364741) Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64 --- dev-games/physfs/ChangeLog | 9 ++++- dev-games/physfs/Manifest | 24 +++++++++++-- dev-games/physfs/physfs-2.0.2-r1.ebuild | 60 ++++++++++++++++++++++++++++++++ dev-games/physfs/physfs-2.0.2.ebuild | 61 --------------------------------- 4 files changed, 90 insertions(+), 64 deletions(-) create mode 100644 dev-games/physfs/physfs-2.0.2-r1.ebuild delete mode 100644 dev-games/physfs/physfs-2.0.2.ebuild (limited to 'dev-games') diff --git a/dev-games/physfs/ChangeLog b/dev-games/physfs/ChangeLog index d38de868494b..8267158f940e 100644 --- a/dev-games/physfs/ChangeLog +++ b/dev-games/physfs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-games/physfs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/ChangeLog,v 1.38 2011/04/24 16:20:00 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/ChangeLog,v 1.39 2011/04/25 02:45:24 polynomial-c Exp $ + +*physfs-2.0.2-r1 (25 Apr 2011) + + 25 Apr 2011; Lars Wendler -physfs-2.0.2.ebuild, + +physfs-2.0.2-r1.ebuild: + Non-maintainer commit: Don't install libs into /usr/lib6464. Thanks to Nick + Bowler for reporting this in bug #364741. *physfs-2.0.2 (24 Apr 2011) diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest index f91779e5817a..be2f414754eb 100644 --- a/dev-games/physfs/Manifest +++ b/dev-games/physfs/Manifest @@ -1,6 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + DIST physfs-2.0.1.tar.gz 671467 RMD160 b6f9b839e2d6fa8b01077daae2386a44f541df99 SHA1 1e291e8717ce3bb921b74416ec7cbcf212efcaa1 SHA256 1ee9891d9d34db4bcf78ae31f321fdb948c12e233ca04c690cae032968dbf45d DIST physfs-2.0.2.tar.gz 671700 RMD160 9e45775c353e7b6fe0510d55063af9ddf1b7f678 SHA1 2d3d3cc819ad26542d34451f44050b85635344d0 SHA256 ae296d3148228e03fd56cc9ea58af02f87dcbb1fadef125c18b709ab37f0bc09 EBUILD physfs-2.0.1.ebuild 1550 RMD160 ce355d9595294900167844280178ad63e52eb824 SHA1 9afb884de67661d8b2f37efa05c14b7962f31a77 SHA256 0055bae177ef15c984d926f04ccfd5295e0a5141e868efab4ad5db74a5960dc4 -EBUILD physfs-2.0.2.ebuild 1560 RMD160 b166f8a8ce4e1afb3599cf7d934d00fb470f83a5 SHA1 2a2555af93abc929df9955593d02b41e4657cea1 SHA256 d4fe541cf0f7da5024308a56c73bbbd1ae635aad114ff7b2fa6cb1b8e4c5832d -MISC ChangeLog 4780 RMD160 ede49753c40dfaac7cb7ae6e988e373b76f97c1e SHA1 ab6c936e1bb8370118ab6fbeb33f85ad7246f068 SHA256 4e70fadb448cd8d1223ac2eb9c394b874fe66e9294db510f0afb3312decce86a +EBUILD physfs-2.0.2-r1.ebuild 1520 RMD160 85aefba1dfc224fbe1ff8e8f9fca4fe1690cb2d5 SHA1 2ed22c7cb859580d3e090578a49e1decf58b7e19 SHA256 2272cdecca7840edace02d6843a2ce6a1e3a1bf437024e7e7818194f7b958a7b +MISC ChangeLog 5041 RMD160 1b02e3f5fd6b0415b8fbd3bc3dafee96d0d4724e SHA1 1afbdb0c9a7ac861ce06a19448f83d2a1b943b8a SHA256 9e492749eaa01bc2dab9eb30bb45cf5ada8bd0b6e47bb304ced6402560131495 MISC metadata.xml 1718 RMD160 62db4b498b9d04313f8a0dc57a7aa42f9ebaa34d SHA1 e1e680968ab72efcde1a2b7acd0867bff26e28ab SHA256 0af45d6f542f0a73024327df7f900e21c2916a88eb128755cc4d49c390fa99ca +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBCgAGBQJNtOBKAAoJEPiazRVxLXTFsNYP/1oTRubYNQhyPCdfHgx8eeXu +DMNRdBqPd+1i1ZvptZBFrTv1PKlns1R81ySCKrNazUXEO7i4mnqF0+Fg4Wd2qZAo +LRm3jYOW7OkT2IkgJQJKZgJp2x6ofgTPEiXKsJQecU+sDqfaZcb+9KgSoOyvt6h8 +212zbCEVoF3lO5MHrlWhru4wNNchM5sFgAmkSMfbzqoTkYUaFaWEpzEZMdSDuP2n +WaJ7s73V5RYEjjsYl+7PebjuTqsqcrDZ7zcBZtYZBXnuwAvGKXNpQnzIYTnnADMP +oY/xHhJvShrMUGFjsAS2Vbr5DS8sruT3WCmERbMnVTLwmbVOdW3heUl/moLVEDn+ +ps4IbTx9ck6nfD8s/agGiuVD2hkYyR7jiJnBLn441sioO4oeJLCo/o37KDaKEKDT +nF6s0Bg9KdrG9DwsXDEgu2PxzlPmu62AUGlJLT+eVBlm4Z9uL7is00GVlLmM3CJ+ +WZ4nrMoWcwOV5wqF0bHLyd74xaHLgDqcVWd4E6rVUYlSEPOWNZtiAz/7mxSBqWBR +u0RvhPhFnssRV8skWWOyDGPyMy6EPRTvaXFYHUkl9IkAwYmiSCChtwKcI/BTQpfH +OrieZmJqFjEu3qh7LCFnuY2s5xH1fg4wZWlNKp3+m/uwPvFcprfNSB/73LdGG9Uj +7jlAVpNcxHj0jwdWParH +=s1p/ +-----END PGP SIGNATURE----- diff --git a/dev-games/physfs/physfs-2.0.2-r1.ebuild b/dev-games/physfs/physfs-2.0.2-r1.ebuild new file mode 100644 index 000000000000..e4bbfaa98dca --- /dev/null +++ b/dev-games/physfs/physfs-2.0.2-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/physfs-2.0.2-r1.ebuild,v 1.1 2011/04/25 02:45:24 polynomial-c Exp $ + +EAPI=2 +inherit cmake-utils + +DESCRIPTION="Abstraction layer for filesystem and archive access" +HOMEPAGE="http://icculus.org/physfs/" +SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="doc grp hog mvl qpak static-libs wad +zip" + +RDEPEND="" +DEPEND="doc? ( app-doc/doxygen )" + +src_prepare() { + sed -i \ + -e 's:-Werror::' \ + CMakeLists.txt \ + || die "sed failed" + # make sure these libs aren't used + rm -rf lzma zlib* +} + +src_configure() { + local mycmakeargs=" + -DPHYSFS_ARCHIVE_7Z=OFF + -DPHYSFS_BUILD_SHARED=ON + -DPHYSFS_BUILD_TEST=OFF + -DPHYSFS_BUILD_WX_TEST=OFF + -DPHYSFS_INTERNAL_ZLIB=OFF + $(cmake-utils_use static-libs PHYSFS_BUILD_STATIC) + $(cmake-utils_use grp PHYSFS_ARCHIVE_GRP) + $(cmake-utils_use hog PHYSFS_ARCHIVE_HOG) + $(cmake-utils_use mvl PHYSFS_ARCHIVE_MVL) + $(cmake-utils_use wad PHYSFS_ARCHIVE_WAD) + $(cmake-utils_use qpak PHYSFS_ARCHIVE_QPAK) + $(cmake-utils_use zip PHYSFS_ARCHIVE_ZIP)" + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc ; then + doxygen || die "doxygen failed" + fi +} + +src_install() { + local DOCS="CHANGELOG.txt CREDITS.txt TODO.txt" + local HTML_DOCS=$(use doc && echo docs/html/*) + + cmake-utils_src_install +} diff --git a/dev-games/physfs/physfs-2.0.2.ebuild b/dev-games/physfs/physfs-2.0.2.ebuild deleted file mode 100644 index 41aca920a1cf..000000000000 --- a/dev-games/physfs/physfs-2.0.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/physfs/physfs-2.0.2.ebuild,v 1.1 2011/04/24 16:20:00 mr_bones_ Exp $ - -EAPI=2 -inherit cmake-utils - -DESCRIPTION="Abstraction layer for filesystem and archive access" -HOMEPAGE="http://icculus.org/physfs/" -SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="doc grp hog mvl qpak static-libs wad +zip" - -RDEPEND="" -DEPEND="doc? ( app-doc/doxygen )" - -src_prepare() { - 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* -} - -src_configure() { - local mycmakeargs=" - -DPHYSFS_ARCHIVE_7Z=OFF - -DPHYSFS_BUILD_SHARED=ON - -DPHYSFS_BUILD_TEST=OFF - -DPHYSFS_BUILD_WX_TEST=OFF - -DPHYSFS_INTERNAL_ZLIB=OFF - $(cmake-utils_use static-libs PHYSFS_BUILD_STATIC) - $(cmake-utils_use grp PHYSFS_ARCHIVE_GRP) - $(cmake-utils_use hog PHYSFS_ARCHIVE_HOG) - $(cmake-utils_use mvl PHYSFS_ARCHIVE_MVL) - $(cmake-utils_use wad PHYSFS_ARCHIVE_WAD) - $(cmake-utils_use qpak PHYSFS_ARCHIVE_QPAK) - $(cmake-utils_use zip PHYSFS_ARCHIVE_ZIP)" - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc ; then - doxygen || die "doxygen failed" - fi -} - -src_install() { - local DOCS="CHANGELOG.txt CREDITS.txt TODO.txt" - local HTML_DOCS=$(use doc && echo docs/html/*) - - cmake-utils_src_install -} -- cgit v1.2.3-65-gdbad