Fix ebuild by games herd standards, thanks to Mr_Bones_

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

3 files changed, 27 insertions, 21 deletions

diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
index 2b1859be22e6..be7480165556 100644
--- a/games-fps/doomsday/ChangeLog
+++ b/games-fps/doomsday/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/doomsday
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.43 2012/05/30 10:45:21 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.44 2012/05/30 16:25:36 maksbotan Exp $
+
+  30 May 2012; Maxim Koltsov <maksbotan@gentoo.org> doomsday-1.9.8.ebuild,
+  files/doomsday-1.9.8-2to3.patch:
+  Fix ebuild by games herd standards, thanks to Mr_Bones_
 
   30 May 2012; Maxim Koltsov <maksbotan@gentoo.org> doomsday-1.9.8.ebuild,
   files/doomsday-1.9.8-2to3.patch:
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 23d37b671128..67112c1c4f25 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -3,23 +3,23 @@ Hash: SHA1
 
 AUX doomsday-1.9.0_beta69-png15.patch 5042 RMD160 249fb6f153b01632c5d41c0b52ce9d0d84f57520 SHA1 adc25a193b07d6a13fb861d0d6bf77ecb4c46f3b SHA256 0a406daa9afafffca641be96a7f153635655b5611d7747daaf67ca2f2a943d07
 AUX doomsday-1.9.0_beta69-underlink.patch 386 RMD160 4dc1504b2da9e0aba061cffc348b5b414c02a2b9 SHA1 19c6b6d3e1ebabd3dbb2c92876d7c7786ddb2c45 SHA256 b774ef4cdad497668728668ec49b46b17c90a399cce5949337e8c0756cdfe0b7
-AUX doomsday-1.9.8-2to3.patch 12524 RMD160 54cc1d4cc88f3b7014f1570a395c4e792fb3d438 SHA1 7facc262d0e7f54fc1293814fd551890277382dc SHA256 a978dfc2c35ad50dfeeb8f1162e1cd8bab5466fd093c630dcbe86a0046f3fce8
+AUX doomsday-1.9.8-2to3.patch 12524 RMD160 f6db8120efcd2b12e810889366178017a75fbf39 SHA1 d9d4c48823e8ea641c4e60667ea116c33b5b7ae7 SHA256 01b554d28ce83b1f37cbb191349beb70577c54d64c16550e6357e1ef237f5061
 AUX doomsday-1.9.8-openal-link.patch 4100 RMD160 8c4b72e600cfa285ddaaf52fc696494320212a5d SHA1 92efe901c45ef6e4ff44471b867879e5ed48dd1f SHA256 61b75a8c3bc299dcbf23c887ea3f5799c12f80e94bdb0924d58e02e222563d5a
 AUX wrapper 136 RMD160 9eb253537d5e2b443cf0807401b86a7526ae3e4e SHA1 2cb84a8feca8d213ecf0ac92d3bfa36282d293c1 SHA256 64b959cfeb77bd778f16768c0ee509cd128eb855fa4acd8e7c37046c5885dbc8
 DIST deng-1.9.0-beta6.9.tar.gz 6085833 RMD160 e91a4bc76b39da9e2e51925e03154ffcb128fea9 SHA1 e1f7d64b1b60eef2659bc4636fbe41a0abf6a6ce SHA256 3553f6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af
 DIST doomsday-1.9.8.tar.gz 7048039 RMD160 41ad7f106b4de5ed4ca9b38894bb7b3103efc3af SHA1 e149ab138009bdb7a5cd8d9a187a91b1e8e4c13b SHA256 5401e5d58d197c287f7bc1318ee8429f27a76792ae6f2471c12d10281a569474
 EBUILD doomsday-1.9.0_beta69.ebuild 2264 RMD160 57c5e354e01efd62838fee18b41639309335916c SHA1 e558e286fb4ff9f744254daf7b5b8ee8280ef4a0 SHA256 5ba265d19c0868cebf7a53b32585babbc0fa99bbe29b3686da5c7fda5f227469
-EBUILD doomsday-1.9.8.ebuild 3619 RMD160 3252e79401bf1be87523e7691fd80be371f2ed17 SHA1 415fb757aec3232cd79ae6985e61b91c1552c97f SHA256 2f8468f81eb24e8d18d4904011474d36d76e4eb920a617d7202de4671abca2b6
-MISC ChangeLog 6787 RMD160 142f1ecdce5e4963e394b401cee459fef89ce80e SHA1 043c3b39bb5d3891ef3b70a5021c356caf2c6141 SHA256 4475cbe4ae750f5a738ae9e142e99e68f725a5e1b3598cf7cb4fd88bcba96f2b
+EBUILD doomsday-1.9.8.ebuild 3659 RMD160 85f42fcb0acf0dab9a22068c18ef0a29aa935361 SHA1 74f7db9cfb02f82d72d5b249635360ae82832557 SHA256 658edef547368a8e5b90fa0202215a25ec6ad5eea636e7a67edb2182250293d3
+MISC ChangeLog 6956 RMD160 37c092d160350aa73a3cf14d1599c3e3634c3142 SHA1 fd80736173fbe6f2f50e37f04a1eb7986a51b032 SHA256 f8ad74d7742b03c31621f3d4a26e389b32e2313f4b0335d04cf09423758f8cef
 MISC metadata.xml 718 RMD160 28e5d9cbc6c1cc8775dd782ad39de771387f12a6 SHA1 5507160cdcd4555c86b22bf1492bce620b65d0d2 SHA256 0d8702a3ad1afd41e3315663411c97c3cf7a4faf2892f69785c2c497e7a694cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPxfpeAAoJEAmJmMX429reC0oH/1xQJyGPUFcgopD779+RVMpr
-XFBVFLAeONlfT0YLdjBMVy66+Ylx76Cxh82Ezxtf7/9QreN0q2KXvbVNivNaWa68
-vud6IwVyeWOuLf61oEzkiyqFWzJiXwCoTAUbh646TDty/Du2LLTHq+S+qegqupv/
-YojIqJF7DItIlc4ldyJcVve136Y8c4okPRHWAtYI+ZC+BPWgxbBRidsJEiCWObaC
-EPlNh4Cr+aQ2WDDFgCOS8ogQOM4AGCpqA+zCtbVahGAd5xmUxc8utRIUejC+NIf+
-GygRDN9M9r06xzOzkKJP4yv8JYy6SpTvEVwMApQ2UBE/UEpgLUl3urJIsxB8Ip0=
-=yxwy
+iQEcBAEBAgAGBQJPxkobAAoJEAmJmMX429reURMH+wUqZO07dN63y4TZekXcj/NN
+GaVcqetVzGY7DRPnWriUPb7LI2DSutsHg5dtmBFNh5sU9dpjog5BSZzy5BGMfZda
+Y1/Ls1g4VoS9S0EMJYyYfg52rZ97sfLrlFH/EElar2tkPxkqi4AUxJD6zafe51B5
+miuF5P8hvzYEDhaMVgVHiK3pPi5wffBgZSomKY4siK68zpVjzAPfQoMq4areAcK6
+c23ycJnAMDey2stsHpWhgbctCa7HQv4HBh6kf1e2M1+E8ZKfBW0Yna4yfYLsEAZ4
+qWN7Yynn6NVZaB4DM1wmmy+kmKsmIg9hqTt9CLFGEI7ZpBBzxq1hvYljpbCFr/s=
+=dNVd
 -----END PGP SIGNATURE-----
diff --git a/games-fps/doomsday/doomsday-1.9.8.ebuild b/games-fps/doomsday/doomsday-1.9.8.ebuild
index 4a299fa5fa76..794ec2e2f99d 100644
--- a/games-fps/doomsday/doomsday-1.9.8.ebuild
+++ b/games-fps/doomsday/doomsday-1.9.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.2 2012/05/30 10:45:21 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.3 2012/05/30 16:25:36 maksbotan Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="snowberry? 2"
 
-inherit python confutils eutils games qt4-r2
+inherit python confutils eutils qt4-r2 games
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="http://www.dengine.net/"
@@ -20,23 +20,21 @@ IUSE="openal snowberry +doom demo freedoom heretic hexen resources"
 DEPEND="
 	virtual/opengl
 	virtual/glu
-	media-libs/libsdl[joystick]
+	media-libs/libsdl[joystick,audio]
 	media-libs/sdl-mixer
 	media-libs/libpng
 	x11-libs/qt-opengl
 	x11-libs/qt-gui
 	net-misc/curl
-	openal? ( media-libs/openal )
-	"
-RDEPEND="${RDEPEND}
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
 	snowberry? ( dev-python/wxpython )"
 PDEPEND="
 	demo? ( games-fps/doom-data )
 	freedoom? ( games-fps/freedoom )
-	resources? ( games-fps/doomsday-resources )
-	"
+	resources? ( games-fps/doomsday-resources )"
 
-S="${S}"/${PN}
+S=${S}/${PN}
 
 REQUIRED_USE="demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
 PATCHES=( "${FILESDIR}"/${P}-2to3.patch )
@@ -56,7 +54,7 @@ src_prepare() {
 
 	if use openal; then
 		echo "CONFIG += deng_openal" >> config_user.pri
-		sed -i 's:\# Generic Unix.:LIBS += -lopenal:' doomsday/dep_openal.pri
+		sed -i 's:\# Generic Unix.:LIBS += -lopenal:' dep_openal.pri || die
 		epatch "${FILESDIR}"/${P}-openal-link.patch
 	fi
 
@@ -72,6 +70,10 @@ doom_make_wrapper() {
 	make_desktop_entry $name "${de_title}" ${icon}
 }
 
+src_configure() {
+	qt4-r2_src_configure
+}
+
 src_install() {
 	qt4-r2_src_install