From: Michael Sterrett Date: Wed, 25 Feb 2015 21:13:29 +0000 (+0000) Subject: tidy boost stuff; add slot dep for libpng X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c57cc5468efcd84ecd1e63a6545c3a3c9e91159b;p=gentoo.git tidy boost stuff; add slot dep for libpng Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog index d76fd130d22c..80e5d7b2fff9 100644 --- a/games-puzzle/pingus/ChangeLog +++ b/games-puzzle/pingus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-puzzle/pingus # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.45 2015/02/22 21:13:05 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.46 2015/02/25 21:13:24 mr_bones_ Exp $ + + 25 Feb 2015; Michael Sterrett pingus-0.7.6.ebuild: + tidy boost stuff; add slot dep for libpng 22 Feb 2015; Tupone Alfredo pingus-0.7.6.ebuild: EAPI 5 diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest index bcd36c1d843f..4c41f64a2afc 100644 --- a/games-puzzle/pingus/Manifest +++ b/games-puzzle/pingus/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX pingus-0.7.6-gcc47.patch 1242 SHA256 918dcd8a1c2850af5a6b390d92fc0f4f8670a2e002fc15d01d171bbb97c095e5 SHA512 998aa2c9547fe82775442b8f234d07724642e342d7ccea724726c9210559b1cc8ea5e19d51c7d0bbf61b523cb83fa198596b25e6c6e1ce9882d75d73b9d67f68 WHIRLPOOL ccff5e8ee90a744c15852821a7ca62ea0603ac8fdb81069bb6936254c7d4aaf2b81b4432609c160ebc23ba6e08e5452c90054d092c7a3a6464ff18fc50aeab1e AUX pingus-0.7.6-noopengl.patch 388 SHA256 7b21454857240c46ee94e06cd18e80c6ffc390256764dde50d42c699fc942914 SHA512 431226d068ffdadf33cd1b73c86e2e2e43de3def166c42cd0592b58e0025f842f579bafa4532f45acf05f4490189d26c679a4b0bcf4f16818aea307b2efe5eb2 WHIRLPOOL 8b54118d4d226ebead2ffe3ffde119f3bd51b8b5e4b692ebac9d9934f880752825b5883b5a9ad34d1c29879883050204fb651891ba181be6b85c7440c90f7f9a DIST pingus-0.7.6.tar.bz2 12622268 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188 WHIRLPOOL 2c4bafef86c40fec3fcfc9ff4b298e72919c8309d475aa4aeb4d368927ac611801f416375108091d9f40bdb2703633765125f6f7ea361186f637e2d5234e53e2 -EBUILD pingus-0.7.6.ebuild 1739 SHA256 5878ea8aa010d781c3db12cb4a0ebe26d724fc60d38dfb883ee345158d6f33ad SHA512 495d4ed9df2107e2e5752047e1810326a390d528d1b974468bef7fdf4a23662f83d22e4bc1d5def1640b3fd38b84ce706cd44dc506e8b24331affe3839fec673 WHIRLPOOL bc3bc840df7964c9a699f56711cb39d91005658aedce59b65deaa978e4772f48b0d6014c23fa6eeaefabfdbfe6cd80fe31f18906bd6f2b574a0478c9c550790b -MISC ChangeLog 6708 SHA256 3ca100f7428320c6c0ac13254f886e045994b254cf23fc50488db5437b9009fe SHA512 178b3baa654aeeacf2abf9a7175343decbe17393d5969dae86ed1647cf678434f357bcab8a8ba42cf654334889ae29c28fc8115739fe9ecc7184db1a9d66b8ab WHIRLPOOL 2539425ae211e64e6a95c1bfbff66fa02a154aa74743fdec6224b1ea3bc568ef82ef2afcd05fea787a14aba3d6610a18295b56133ee84d31dee28e6806d769fd +EBUILD pingus-0.7.6.ebuild 1274 SHA256 4eea4975936fad05a47ce39b33542f5f6270f02585c286d0595a1b12b066a67f SHA512 4752fa48bcc0b76f58b2980889ec6350de06c23458542aee47b2081c8028cbf3ff91481549c094e93bbd01155570b935b30548a2ed45d7233b7dca3625fe334f WHIRLPOOL 51a25e5e30ab75f5455dd1a9fedd781db623e16ba938c590885af5a9204e159c193c075c4b13857b8b7a994f02c1e7079474296bd9943133ea0907fca3c946cf +MISC ChangeLog 6832 SHA256 9f20626f05ca44570c51b74e8f472b3b060ac88aa4ee193a12187cad64f9d26d SHA512 a8a134dc1d417b6cbb9c0bb88e146ef71968ab40a84c93f5aeed3b4a5758eef30f0bb6a1e5c5af7748cd55520cfa89431a41f96e17a98669744533baf0278821 WHIRLPOOL b50b989dd68846be6d019b087d76a056eeaaddf015ce3e9ffd256a03f77f9b142b1ab76c90a4e62b0354d6a704a6b3f1d32633c47e3d9434e934e0c4e88d82fc MISC metadata.xml 1189 SHA256 c02a8d6f3a2a59cba61fa4211958a44bd33939a0bf0f60ee50ec5a281a289735 SHA512 f31248604a926e748dc60847d396d2a0e774e40beaab4db473bc623a174629356dc6ab46b32ba6ea076739c3a211de26499e1f22fdceb18893a0026010992af0 WHIRLPOOL 9eaf792872ae21aedc43341a93ada3d8c42057b46b41b963cb2c48e7c87379afbe4f8a090904a9a6255dce61661405f8ae477baff0d7f68d318b072099ec1e68 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlTqRmIACgkQIY77eQFFFC0MgACfUmS9Xm/fpXROjrFz+WdVIl2Z -WbwAn0gz7pgek0z+nebh/ztIoGLYhtBY -=PPoV ------END PGP SIGNATURE----- diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild index 4fe0de5026d9..ef41687e8824 100644 --- a/games-puzzle/pingus/pingus-0.7.6.ebuild +++ b/games-puzzle/pingus/pingus-0.7.6.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.6.ebuild,v 1.10 2015/02/22 21:13:05 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.6.ebuild,v 1.11 2015/02/25 21:13:24 mr_bones_ Exp $ EAPI=5 -inherit eutils flag-o-matic scons-utils toolchain-funcs games +inherit eutils scons-utils toolchain-funcs games DESCRIPTION="free Lemmings clone" HOMEPAGE="http://pingus.seul.org/" @@ -14,31 +14,17 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="opengl music" -DEPEND="media-libs/libsdl[joystick,opengl?,video] +RDEPEND="media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) - media-libs/libpng + media-libs/libpng:0= dev-libs/boost" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig" src_prepare() { - # how do I hate boost? Let me count the ways... - local boost_ver=$(best_version ">=dev-libs/boost-1.36") - - boost_ver=${boost_ver/*boost-/} - boost_ver=${boost_ver%.*} - boost_ver=${boost_ver/./_} - - einfo "Using boost version ${boost_ver}" - append-cxxflags \ - -I/usr/include/boost-${boost_ver} - append-ldflags \ - -L/usr/$(get_libdir)/boost-${boost_ver} - export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}" - export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}" - strip-flags epatch \ "${FILESDIR}"/${P}-noopengl.patch \