diff options
| -rw-r--r-- | games-arcade/ultrastar-ng/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/ultrastar-ng/Manifest | 8 | ||||
| -rw-r--r-- | games-arcade/ultrastar-ng/metadata.xml | 4 | ||||
| -rw-r--r-- | games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild | 33 |
4 files changed, 25 insertions, 28 deletions
diff --git a/games-arcade/ultrastar-ng/ChangeLog b/games-arcade/ultrastar-ng/ChangeLog index 32df12020383..d0711a8a7992 100644 --- a/games-arcade/ultrastar-ng/ChangeLog +++ b/games-arcade/ultrastar-ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/ultrastar-ng -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ChangeLog,v 1.5 2008/02/09 21:43:14 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ChangeLog,v 1.6 2009/02/09 18:38:01 mr_bones_ Exp $ + + 09 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml, + ultrastar-ng-0.2.1-r1.ebuild: + EAPI=2; use-based deps; songs version bump 09 Feb 2008; Michael Sterrett <mr_bones_@gentoo.org> -ultrastar-ng-0.1.4.ebuild, -ultrastar-ng-0.2.1.ebuild, diff --git a/games-arcade/ultrastar-ng/Manifest b/games-arcade/ultrastar-ng/Manifest index 1671561c05d9..7e6095c84a5d 100644 --- a/games-arcade/ultrastar-ng/Manifest +++ b/games-arcade/ultrastar-ng/Manifest @@ -1,5 +1,5 @@ DIST UltraStar-ng-0.2.1.tar.gz 1687366 RMD160 6ab305e67eabda09951a0e459798c7a66e11d801 SHA1 d0a2bfd8622825ea9f0f7694cdaf1d5f78c50dae SHA256 a93daad488c07217512fbf6a2f5ded39cf71664736dd3a33a725241838554d6d -DIST ultrastar-songs-1.tar.bz2 6595544 RMD160 ba7521cdb0edc4cdc34deb45380ca98c4d7d8267 SHA1 4b52bb0a11f9d4008e1208c356ffa075033c4236 SHA256 6efe78f8fa66e7fc7a980136cefe9569e080cb154e981f578505944fc88b016c -EBUILD ultrastar-ng-0.2.1-r1.ebuild 2288 RMD160 f4993183d665386857a4fa2c4e8d4931775f94eb SHA1 db0e1d91dc15d11493c92b821e06055dedc41153 SHA256 973cf94195c646ad4a74cb215f961424f0d398e743912347f8e9c7307f9220ba -MISC ChangeLog 1142 RMD160 6670d7b5b6e3c593e3ee555e052c0e418917d942 SHA1 720d90bbb1c6ee6b614942b681e55d6757666e55 SHA256 a87e00d0487c3954906c9e175a97aba4bb98d7adc54bfe29cae8adec7bee95bd -MISC metadata.xml 385 RMD160 dc56a6ab761ce486f945d0528b998b7eef25f739 SHA1 bf8550e09e5b7e2fcfa6993c8120f2a97ecb25f3 SHA256 2cd081003605d3551a50d0823a0ea14e9251c1fea69c06ef8f06cff37970d559 +DIST ultrastar-songs-2.tar.bz2 15571726 RMD160 9b4eea4862728ad1fbfc1e5d462f4afd4d6e89fc SHA1 25d2392775bfa27f48cd201eebb6e3eb2c96c3b2 SHA256 645b460367df95697756a1ed02e01593e9aa3e77a4ce6ef1b9f334c37b1c6a03 +EBUILD ultrastar-ng-0.2.1-r1.ebuild 2113 RMD160 cf7c53a001737e0dc6c4294a5b0e70c3e182818d SHA1 2dcae4b4eed208e6a5e0e002e9c0236f364b9e8e SHA256 fabc3a347dfd5a8db6fd3f6854ce7ca81c50efe30c797ae07eebfcf7a0879fec +MISC ChangeLog 1289 RMD160 323213fd1494d81cb2876ab17751cc335100a9ae SHA1 02f9230a2fac8d0e64978dc144f90ade3559e3c3 SHA256 2c028d025f9bc09abbf97040e63ed17749e50ff98fe7e0328a24fdc47cb7cfac +MISC metadata.xml 381 RMD160 2aa3b651d0c921334a985cabb9a8c147ac439044 SHA1 cf288d5c9e6e1716a3902f1edfac8c17b8d74c79 SHA256 830b30f0b8d2f1c0a5f0f9aaf4d96961928c8fca77505cfaf2fc685be75e8056 diff --git a/games-arcade/ultrastar-ng/metadata.xml b/games-arcade/ultrastar-ng/metadata.xml index e9131ecb6160..3471d6abf080 100644 --- a/games-arcade/ultrastar-ng/metadata.xml +++ b/games-arcade/ultrastar-ng/metadata.xml @@ -6,7 +6,7 @@ UltraStar-ng : The free Linux karaoke game </longdescription> <use> - <flag name="novideo">Disable smpeg video support</flag> - <flag name="songs">Build with few demo songs</flag> + <flag name="video">Enable smpeg video support</flag> + <flag name="songs">Install a few demo songs</flag> </use> </pkgmetadata> diff --git a/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild b/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild index 5abc53ff4f96..a5cab825822b 100644 --- a/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild +++ b/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild,v 1.5 2008/02/09 21:43:14 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild,v 1.6 2009/02/09 18:38:01 mr_bones_ Exp $ +EAPI=2 inherit eutils games MY_PN=UltraStar-ng MY_P=${MY_PN}-${PV} SONGS_PN=ultrastar-songs -SONGS_P=${SONGS_PN}-1 +SONGS_P=${SONGS_PN}-2 DESCRIPTION="SingStar GPL clone" HOMEPAGE="http://sourceforge.net/projects/ultrastar-ng/" @@ -21,12 +22,13 @@ LICENSE="GPL-2 )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="novideo opengl xine debug alsa gstreamer portaudio songs" +IUSE="+video opengl xine debug alsa gstreamer portaudio +songs" RDEPEND="gnome-base/librsvg >=dev-libs/boost-1.34 x11-libs/pango - media-libs/sdl-image + media-libs/libsdl[opengl?] + media-libs/sdl-image[jpeg,png] media-libs/sdl-gfx xine? ( media-libs/xine-lib ) !xine? ( media-libs/gstreamer ) @@ -37,26 +39,19 @@ RDEPEND="gnome-base/librsvg alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) gstreamer? ( >=media-libs/gstreamer-0.10 ) - !novideo? ( media-libs/smpeg )" + video? ( media-libs/smpeg )" DEPEND="${RDEPEND} dev-util/pkgconfig" S=${WORKDIR}/${MY_P} -pkg_setup() { - games_pkg_setup - if use opengl && ! built_with_use media-libs/libsdl opengl ; then - eerror "opengl flag set, but libsdl wasn't build with opengl support" - fi -} - -src_compile() { +src_configure() { local myconf - if use novideo; then - myconf="--with-video=disable" - else + if use video; then myconf="--with-video=smpeg" + else + myconf="--with-video=disable" fi if use opengl; then myconf="$myconf --with-graphic-driver=opengl" @@ -74,9 +69,7 @@ src_compile() { $(use_enable debug) \ $(use_enable portaudio record-portaudio) \ $(use_enable gstreamer record-gst) \ - $(use_enable alsa record-alsa) \ - || die - emake || die "emake failed" + $(use_enable alsa record-alsa) } src_install() { |