3 files changed, 8 insertions, 87 deletions
diff --git a/games-puzzle/neverball/ChangeLog b/games-puzzle/neverball/ChangeLog
index 07fc90a915e1..6b1360196ab2 100644
--- a/games-puzzle/neverball/ChangeLog
+++ b/games-puzzle/neverball/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/neverball
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/ChangeLog,v 1.45 2013/10/11 18:10:29 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/ChangeLog,v 1.46 2013/10/11 18:55:15 mr_bones_ Exp $
+
+  11 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -neverball-1.5.4-r1.ebuild, neverball-1.5.4.ebuild:
+  say no to pointless rev bumps
 
 *neverball-1.5.4-r1 (11 Oct 2013)
 
diff --git a/games-puzzle/neverball/neverball-1.5.4-r1.ebuild b/games-puzzle/neverball/neverball-1.5.4-r1.ebuild
deleted file mode 100644
index 83aed15fce2a..000000000000
--- a/games-puzzle/neverball/neverball-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/neverball-1.5.4-r1.ebuild,v 1.1 2013/10/11 18:10:29 slyfox Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
-HOMEPAGE="http://icculus.org/neverball/"
-SRC_URI="http://icculus.org/neverball/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-RESTRICT="test"
-
-RDEPEND="media-libs/libsdl[audio,joystick,opengl,video]
-	media-libs/sdl-ttf
-	media-libs/libpng:0
-	virtual/jpeg
-	media-libs/libvorbis
-	virtual/opengl
-	dev-games/physfs
-	media-fonts/dejavu
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	sed -i \
-		-e 's:mapc:neverball-mapc:g' \
-		-e 's:MAPC:NEVERBALL-MAPC:g' \
-		-e '1 s/ 1 / 6 /' \
-		dist/mapc.1 \
-		|| die "sed failed"
-	sed -i \
-		-e 's:-O2:$(E_CFLAGS):' \
-		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
-		Makefile \
-		|| die "sed failed"
-	epatch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-libpng.patch \
-		"${FILESDIR}"/${P}-lm.patch
-}
-
-src_compile() {
-	emake \
-		ENABLE_NLS=$(use nls && echo 1 || echo 0) \
-		E_CFLAGS="${CFLAGS}" \
-		LOCALEDIR=/usr/share/locale \
-		DATADIR="${GAMES_DATADIR}/${PN}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dogamesbin ${PN}-mapc neverball neverputt || die
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data/* || die
-	rm -f "${D}${GAMES_DATADIR}/${PN}"/ttf/DejaVuSans-Bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
-		"${GAMES_DATADIR}/${PN}"/ttf/DejaVuSans-Bold.ttf || die
-	if [[ -d locale ]] ; then
-		insinto /usr/share
-		doins -r locale || die
-	fi
-	dodoc CHANGES README || die
-
-	newicon dist/neverball_512.png neverball.png || die
-	newicon dist/neverputt_512.png neverputt.png || die
-	doman dist/*.6 || die
-	newman dist/mapc.1 neverball-mapc.6 || die
-	make_desktop_entry neverball Neverball || die
-	make_desktop_entry neverputt Neverputt neverputt || die
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "${P} will overwrite existing high-score files, so back them up if"
-	elog "you want to preserve your old scores and progress."
-}
diff --git a/games-puzzle/neverball/neverball-1.5.4.ebuild b/games-puzzle/neverball/neverball-1.5.4.ebuild
index 1b2f752e83f8..264ad6c99840 100644
--- a/games-puzzle/neverball/neverball-1.5.4.ebuild
+++ b/games-puzzle/neverball/neverball-1.5.4.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-puzzle/neverball/neverball-1.5.4.ebuild,v 1.7 2013/04/10 18:14:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/neverball-1.5.4.ebuild,v 1.8 2013/10/11 18:55:15 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -41,7 +41,8 @@ src_prepare() {
 		|| die "sed failed"
 	epatch \
 		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-libpng.patch
+		"${FILESDIR}"/${P}-libpng.patch \
+		"${FILESDIR}"/${P}-lm.patch
 }
 
 src_compile() {