simplify REQUIRED_USE

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

2 files changed, 77 insertions, 65 deletions

diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
index 89d54d6b5126..e6932687de77 100644
--- a/games-fps/doomsday/ChangeLog
+++ b/games-fps/doomsday/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/doomsday
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.52 2013/07/17 15:08:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.53 2013/07/19 18:00:24 hasufell Exp $
+
+  19 Jul 2013; Julian Ospald <hasufell@gentoo.org> doomsday-1.10.2.ebuild:
+  simplify REQUIRED_USE
 
 *doomsday-1.10.2 (17 Jul 2013)
 
diff --git a/games-fps/doomsday/doomsday-1.10.2.ebuild b/games-fps/doomsday/doomsday-1.10.2.ebuild
index 704593984cdb..7ffcf87d89ee 100644
--- a/games-fps/doomsday/doomsday-1.10.2.ebuild
+++ b/games-fps/doomsday/doomsday-1.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.10.2.ebuild,v 1.1 2013/07/17 15:08:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.10.2.ebuild,v 1.2 2013/07/19 18:00:24 hasufell Exp $
 
 # TODO: fmod support broken (deng_fmod)
 
@@ -17,9 +17,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
-REQUIRED_USE="snowberry? ( ${PYTHON_REQUIRED_USE} !dedicated )
-	demo? ( doom ) freedoom? ( doom ) resources? ( doom )
-	doom? ( !dedicated )"
+REQUIRED_USE="snowberry? ( ${PYTHON_REQUIRED_USE} )
+	demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
 
 DEPEND="
 	dev-qt/qtcore:4
@@ -36,17 +35,21 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/libXrandr
 		x11-libs/libXxf86vm
+		snowberry? ( ${PYTHON_DEPS} )
 	)
 	fluidsynth? ( media-sound/fluidsynth )
 	openal? ( media-libs/openal )
-	snowberry? ( ${PYTHON_DEPS} )
 	tools? ( sys-libs/ncurses )"
 RDEPEND="${DEPEND}
-	snowberry? ( dev-python/wxpython )"
+	!dedicated? (
+		snowberry? ( dev-python/wxpython )
+	)"
 PDEPEND="
-	demo? ( games-fps/doom-data )
-	freedoom? ( games-fps/freedoom )
-	resources? ( games-fps/doomsday-resources )"
+	!dedicated? (
+		demo? ( games-fps/doom-data )
+		freedoom? ( games-fps/freedoom )
+		resources? ( games-fps/doomsday-resources )
+	)"
 
 S=${S}/${PN}
 
@@ -63,11 +66,18 @@ src_prepare() {
 	sed -i \
 		-e "/^DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
 		config_unix.pri || die
+
 	echo "CONFIG += nostrip" > config_user.pri
 	echo "PREFIX=/usr/games" >> config_user.pri
-	use snowberry &&
-		echo "CONFIG += deng_snowberry" >> config_user.pri || \
+
+	if use dedicated ; then
+		echo "CONFIG += deng_noclient" >> config_user.pri
 		echo "CONFIG += deng_nosnowberry" >> config_user.pri
+	else
+		use snowberry &&
+			echo "CONFIG += deng_snowberry" >> config_user.pri || \
+			echo "CONFIG += deng_nosnowberry" >> config_user.pri
+	fi
 
 	use fluidsynth &&
 		echo "CONFIG += deng_fluidsynth" >> config_user.pri
@@ -75,9 +85,6 @@ src_prepare() {
 	use tools ||
 		echo "CONFIG += deng_notools" >> config_user.pri
 
-	use dedicated &&
-		echo "CONFIG += deng_noclient" >> config_user.pri
-
 	if use openal; then
 		echo "CONFIG += deng_openal" >> config_user.pri
 		sed -i \
@@ -110,61 +117,63 @@ src_install() {
 	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
 	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom
 
-	if use snowberry; then
-		python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
-
-		installmodules() {
-			# relocate snowberry module directory recursively into site-packages
-			python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
-			# hack around improper path handling
-			sed -i \
-				-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
-				"${D}"/"${GAMES_BINDIR}"/launch-doomsday-${EPYTHON} || die
-		}
-		python_foreach_impl installmodules
-		# remove old module dir
-		rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
-
-		make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
-		doicon ../snowberry/graphics/snowberry.png
-	fi
-
-	if use doom; then
-		local res_arg
-		if use resources; then
-			res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
+	if use !dedicated ; then
+		if use snowberry ; then
+			python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
+
+			installmodules() {
+				# relocate snowberry module directory recursively into site-packages
+				python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
+				# hack around improper path handling
+				sed -i \
+					-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
+					"${D}"/"${GAMES_BINDIR}"/launch-doomsday-${EPYTHON} || die
+			}
+			python_foreach_impl installmodules
+			# remove old module dir
+			rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
+
+			make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
+			doicon ../snowberry/graphics/snowberry.png
 		fi
 
-		doicon ../snowberry/graphics/orb-doom.png
-		doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
-		elog "Created jdoom launcher. To play Doom place your doom.wad to"
-		elog "\"${GAMES_DATADIR}\"/doom-data"
-		elog
-
-		if use demo; then
-			doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
-				"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
-		fi
-		if use freedoom; then
-			doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
-				"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
+		if use doom; then
+			local res_arg
+			if use resources; then
+				res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
+			fi
+
+			doicon ../snowberry/graphics/orb-doom.png
+			doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
+			elog "Created jdoom launcher. To play Doom place your doom.wad to"
+			elog "\"${GAMES_DATADIR}\"/doom-data"
+			elog
+
+			if use demo; then
+				doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
+					"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
+			fi
+			if use freedoom; then
+				doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
+					"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
+			fi
 		fi
-	fi
-	if use hexen; then
-		doicon ../snowberry/graphics/orb-hexen.png
-		doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
+		if use hexen; then
+			doicon ../snowberry/graphics/orb-hexen.png
+			doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
 
-		elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
-		elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
-		elog
-	fi
-	if use heretic; then
-		doicon ../snowberry/graphics/orb-heretic.png
-		doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
+			elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
+			elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
+			elog
+		fi
+		if use heretic; then
+			doicon ../snowberry/graphics/orb-heretic.png
+			doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
 
-		elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
-		elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
-		elog
+			elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
+			elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
+			elog
+		fi
 	fi
 
 	prepgamesdirs