EAPI=5; correct building against libsdl (bug #513940)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 13 insertions, 24 deletions

diff --git a/games-puzzle/bubble-chains/ChangeLog b/games-puzzle/bubble-chains/ChangeLog
index 754d12d47344..36ecb35dbaf8 100644
--- a/games-puzzle/bubble-chains/ChangeLog
+++ b/games-puzzle/bubble-chains/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/bubble-chains
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bubble-chains/ChangeLog,v 1.8 2014/05/15 16:49:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bubble-chains/ChangeLog,v 1.9 2014/06/20 07:57:20 mr_bones_ Exp $
+
+  20 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  bubble-chains-0.1.1.ebuild:
+  EAPI=5; correct building against libsdl (bug #513940)
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> bubble-chains-0.1.1.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-puzzle/bubble-chains/Manifest b/games-puzzle/bubble-chains/Manifest
index 0ae469d1192f..9be657401d25 100644
--- a/games-puzzle/bubble-chains/Manifest
+++ b/games-puzzle/bubble-chains/Manifest
@@ -1,21 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST chains-0.1.1-src.7z 3282431 SHA256 c1c487c51e8cba1640a49497debe5962f692e17df1272994c5dfaee9d6eb304f SHA512 2557974ccfa474329924684d859abae8555bdf7fc8e3264883ed0802255bd29ae486b8150b5ffd2d1b4176d0b8d98aec35f7717da4a6606a6c21026a41f1297c WHIRLPOOL bed7a7d1a64447715d47da432ee495fa5ae4d17ed99376182188398f6c846fa38c5666eac722fd60e7003d77660708809763f5f3466abefccee0b739e74bd69d
-EBUILD bubble-chains-0.1.1.ebuild 1071 SHA256 dcf92b9980c8cd3511f970911cb07d4662462d6077543ee089e2a24e7563f79b SHA512 3f67df495c418d1ea50f8bb992f766ee2e10ac4bfa1719a17c0008149032c251b116a5b546d0d98c13ba320e3d3cfcf0126944b1c1af27e5fb6c9317a0c86d9d WHIRLPOOL c30e528e15d626d7c1ac9788c14cc99574f9ee863e46a3c90d93a1e5033f36378ca50210d8979d5da3a5fd165d22f5a60c0b3d4e622691a8fc52cd137bd30044
-MISC ChangeLog 1298 SHA256 4dc119d4970a92d1f1c2899305099cc77c2fbfaea24c462da86d900858815d3e SHA512 b23d2491207f7434b964550c01b5becba1cc219dc57c71b46d491a65cb9bc497748fe372442f69a45a594aa2ab91737f26ecf222a7f2d965ef1f0b5253debd17 WHIRLPOOL c55c19645fc5b76bb338264814e565d7bae59e2299f7eae7a3e9fde283af16f8a95124c952762dfa92b45433aa5ec2d00cc958cbf0ce2150616325585f3a6c67
+EBUILD bubble-chains-0.1.1.ebuild 1146 SHA256 37ceb632395fca7a10e9ea522b516aba7c8158efe12664dba0637912960a1e7b SHA512 9dff6daeeb8046f8bcf603cf4cabaa6d61a91dc0b5e6f6eff5c8448d297d42288b97c0e46c6527925659e429c1b0a1be50b9a2177ea22a575d97298a9f265741 WHIRLPOOL ebf0e5b02095c8b9ac6d0b375b9a432287e78f90fbc5781df7c1bdd63899e2f62fcf61686b1ed542c0815d2cb7e2fa5d3bb25dd3fa25934cddef1245d52c3328
+MISC ChangeLog 1446 SHA256 f6fc16af0c9f49243dd6fc47e4ad27ac96c1a0718aabff0fc92b50517a2ee2db SHA512 023a27f33a27826f29c511723ebd29ab23ca5b437b97e2c04d0f23a6d161930c3bbbc3dea2c4cbd0d36460c873a75f127396fb9ef2afdd0279c3918488379a85 WHIRLPOOL 905f18abde70b0c8127fb0782ebf771940c21440f8b5ca052c8166ae67fac27089e366505ff1ca744afa4984eb14d58d13add8c6343932973fb228e73d897ea2
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQGcBAEBCAAGBQJTdPAeAAoJEJQzkH1pP7W41V4L/RPVfCiE7USzKKW0M/s6Blx3
-fI4ZPw0xk4CIQKPnDu3OtOg2hMMghtlmlxlXlwc1OSy6FvnT5GHbTfSgp4yJdoMy
-NPzsQrHupodS5fu+mb+/VNpN4s6l4LmR6CDHq/hlS0OtAvpWFvxT+gMnB9YAuZUQ
-H8QFqqzduRGHJdF8Q/5M9lmo06BAAiTS12mfx5qOfTrD4p7jyri5lvhKJHGkhwZN
-E+6uMspO0mmkpQV99mpQ7sVUKoqUpbkmfarNdgDy9WW+h41G2zhuRqwWTPWPRabH
-AptBe45wzWzA9ZDK/FxYdwkD8m92mwxUOH4MueXKSvSn0d9kZ9SLfU07Mu6MPk2q
-huD5dM2URTPnBLoAriblAnrHJVa+ED9QcWc4OTpmz6xPWtDHkWcUFRe0pfrrBIC/
-bp2WDl7aoHJCIc4/kR/h+6ltz0h8FpS9+WnbZ2rrFPFkCaWpKT59tttjLSTUUF1Z
-QopsIWC7jCXUue4ei06ztp/eD1c8Vy6WoGjpSYrzHw==
-=hhEB
------END PGP SIGNATURE-----
diff --git a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
index 656d49ba21fb..92fbc448a9f5 100644
--- a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
+++ b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild,v 1.6 2014/05/15 16:49:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild,v 1.7 2014/06/20 07:57:20 mr_bones_ Exp $
 
-EAPI=2
-inherit eutils qt4-r2 games
+EAPI=5
+inherit eutils flag-o-matic qt4-r2 games
 
 MY_P=${P/bubble-}-src
 
@@ -22,11 +22,13 @@ RDEPEND="x11-libs/libXrandr
 	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	app-arch/p7zip"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	append-cxxflags $(pkg-config sdl --cflags)
 	sed -i \
 		-e "s:/usr/local/bin:${GAMES_BINDIR}:g" \
 		-e "s:/usr/local/games:${GAMES_DATADIR}:g" \
@@ -39,7 +41,7 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die
+	emake INSTALL_ROOT="${D}" install
 	dodoc README
 	newicon images/img64_base.png ${PN}.png
 	make_desktop_entry chains "Bubble Chains"