From 115255f6a3c2be422680710b5d6ba4226c3383a6 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 15 Jun 2010 21:28:52 +0000
Subject: merged trunk r2528 into us_maker branch

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2530 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 us_maker_edition/dists/gentoo/readme.txt           |  2 +-
 .../dists/gentoo/ultrastardx-1.1.0.ebuild          | 68 ++++++++++++++++++++++
 .../dists/gentoo/ultrastardx-1.1_beta.ebuild       | 68 ----------------------
 3 files changed, 69 insertions(+), 69 deletions(-)
 create mode 100644 us_maker_edition/dists/gentoo/ultrastardx-1.1.0.ebuild
 delete mode 100644 us_maker_edition/dists/gentoo/ultrastardx-1.1_beta.ebuild

(limited to 'us_maker_edition/dists')

diff --git a/us_maker_edition/dists/gentoo/readme.txt b/us_maker_edition/dists/gentoo/readme.txt
index 982d42c9..99517f84 100644
--- a/us_maker_edition/dists/gentoo/readme.txt
+++ b/us_maker_edition/dists/gentoo/readme.txt
@@ -3,7 +3,7 @@
 ---------------------------------------
 This directory contains two ebuilds for UltraStar Deluxe
 - ultrastardx-9999.ebuild: a live ebuild using SVN sources
-- ultrastardx-1.1_beta.ebuild: a snapshot ebuild that might be appended to the official portage someday (Note: at the moment there is no source snapshot for USDX so this will not work)
+- ultrastardx-1.1.ebuild: a snapshot ebuild that might be appended to the official portage someday
 
 ---------------------------------------
 2. Create a portage overlay
diff --git a/us_maker_edition/dists/gentoo/ultrastardx-1.1.0.ebuild b/us_maker_edition/dists/gentoo/ultrastardx-1.1.0.ebuild
new file mode 100644
index 00000000..7170fcdb
--- /dev/null
+++ b/us_maker_edition/dists/gentoo/ultrastardx-1.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils games
+
+SONGS_PKG=USDX-SongPackage
+SONGS_VER=01
+
+DESCRIPTION="An open-source karaoke game"
+HOMEPAGE="http://www.ultrastardeluxe.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
+	songs? ( mirror://sourceforge/${PN}/${SONGS_PKG}-${SONGS_VER}.zip )"
+
+LICENSE="GPL-2
+	songs? (
+		CCPL-Attribution-ShareAlike-NonCommercial-2.5
+		CCPL-Attribution-NonCommercial-NoDerivs-2.5
+	)"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="projectm debug songs"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/freetype
+	media-libs/libpng
+	=media-libs/portaudio-19*
+	media-video/ffmpeg
+	dev-db/sqlite
+	projectm? ( media-libs/libprojectm )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-lang/fpc-2.2.0"
+
+S=${WORKDIR}/${P}-src
+
+pkg_setup() {
+    games_pkg_setup
+    built_with_use media-libs/libsdl opengl \
+        || die "You need to compile media-libs/libsdl with USE=opengl."
+}
+
+src_compile() {
+	egamesconf \
+		$(use_with projectm libprojectM) \
+		$(use_enable debug) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use songs; then
+		insinto "${GAMES_DATADIR}"/${PN}/songs
+		doins -r ${WORKDIR}/Songs/* || die "doins songs failed"
+	fi
+
+	dodoc AUTHORS.txt ChangeLog.german.txt ChangeLog.txt README.txt
+
+	doicon icons/${PN}-icon.svg
+	make_desktop_entry ${PN} "UltraStar Deluxe"
+
+	prepgamesdirs
+}
diff --git a/us_maker_edition/dists/gentoo/ultrastardx-1.1_beta.ebuild b/us_maker_edition/dists/gentoo/ultrastardx-1.1_beta.ebuild
deleted file mode 100644
index 7170fcdb..00000000
--- a/us_maker_edition/dists/gentoo/ultrastardx-1.1_beta.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-inherit eutils games
-
-SONGS_PKG=USDX-SongPackage
-SONGS_VER=01
-
-DESCRIPTION="An open-source karaoke game"
-HOMEPAGE="http://www.ultrastardeluxe.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
-	songs? ( mirror://sourceforge/${PN}/${SONGS_PKG}-${SONGS_VER}.zip )"
-
-LICENSE="GPL-2
-	songs? (
-		CCPL-Attribution-ShareAlike-NonCommercial-2.5
-		CCPL-Attribution-NonCommercial-NoDerivs-2.5
-	)"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="projectm debug songs"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/freetype
-	media-libs/libpng
-	=media-libs/portaudio-19*
-	media-video/ffmpeg
-	dev-db/sqlite
-	projectm? ( media-libs/libprojectm )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-lang/fpc-2.2.0"
-
-S=${WORKDIR}/${P}-src
-
-pkg_setup() {
-    games_pkg_setup
-    built_with_use media-libs/libsdl opengl \
-        || die "You need to compile media-libs/libsdl with USE=opengl."
-}
-
-src_compile() {
-	egamesconf \
-		$(use_with projectm libprojectM) \
-		$(use_enable debug) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use songs; then
-		insinto "${GAMES_DATADIR}"/${PN}/songs
-		doins -r ${WORKDIR}/Songs/* || die "doins songs failed"
-	fi
-
-	dodoc AUTHORS.txt ChangeLog.german.txt ChangeLog.txt README.txt
-
-	doicon icons/${PN}-icon.svg
-	make_desktop_entry ${PN} "UltraStar Deluxe"
-
-	prepgamesdirs
-}
-- 
cgit v1.2.3