say no to pointless rev bumps

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

4 files changed, 10 insertions, 100 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/Manifest b/games-puzzle/neverball/Manifest
index 37a94e5c815b..560568a7aa3c 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX neverball-1.5.4-libpng.patch 711 SHA256 509a5e96988b4444a12621eb7bd38ed7ab2b047acf4f2c291132ae7bb9a33b0f SHA512 7c0a2d23234c1978f5998c3770e87658cc331af324b46c37ca57829fa712f1e535548e6da43ded5bce31604d701bbedb085cba65821146a6feff48568ff58e5d WHIRLPOOL 7e5a4db1b871e7f068a19fd75bd360af582180bfda666b4540d1fce71a06c15ad9138bfeeb9ffbd468261628d4ceafacdf93f859982a440986d9cf1119fb3593
 AUX neverball-1.5.4-lm.patch 1362 SHA256 f9e5859e9617225c901ea90397fd73a7b078fae26b2b82fe616ec32105d6b4b8 SHA512 9405ca5189a96e997092bc830b579c1577a95c89c06f4e8f7aa2e216a392ece6091e0ebc3ced90e1826a83326f2be887c9391e06478169a83bde768281331d12 WHIRLPOOL 9b28e780078768b131d98ba5501f23d5af68dd25c0ba8bf84738d689a18efc714dd131515c62bbee101a45537849996647a93f754400d5db81b2fbf3c0a35207
 AUX neverball-1.5.4-underlink.patch 358 SHA256 9b523317f88d5ccd1333c5eb23aa6fc929702dcbac32e5391d90afd82e4365a7 SHA512 d07c956677580f5ed365ed1dd7a8885e1e0969736aa9231445cef9449954682d48a3eb85fbf7885379a1c2da09e4754f6b04b4d0f88fa878264e0ba56a38ad85 WHIRLPOOL 128a0927411046718ee9799253d3f17cc493c8d8ba7d07a92d6b1b0c87033ec90da860abc0c94090fd0e9a8d51da7a01570296c4d1786ee57689b8bc2f8310c8
 DIST neverball-1.5.4.tar.gz 26767623 SHA256 ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6 SHA512 ffc0473ea3882edb84f190aa696c2e5fa1a38ea50f73bc144a3b694fd80c71a8d9936aa34f8bbd096523493849d428928a6efd2650c6da4c9962e0355d3cb9c2 WHIRLPOOL c0e6731ee28eb8ac987d5ca98ecbd93fb7d091060e2da51c6fe69043f05fe7d5f8179e62183f946e40b2f734a8041ab35ae1fdd4024e5ff6e25ab8633853e1f4
-EBUILD neverball-1.5.4-r1.ebuild 2191 SHA256 cd93faadc8e630ddb81d6253b133c9874104f52ed7789a6b960bbd393078c329 SHA512 d06aeedea053c72f7a4a54bc69ff583faee87e4f1614e8dc4ade9aae0beacd0916f7858d1f916f681eaee25e4a7fc199f0684926700a98878e4024a48136d70c WHIRLPOOL 50e11f49f619b34df270346bece720f7be67d2836754d8b66534ea3ba223133193b791c8ce2f8910a3355a297cd0242b432b03e47db3b3579ada149fda6b04bc
-EBUILD neverball-1.5.4.ebuild 2156 SHA256 507007540719c544c7fc4e18e5220d8f29670b6204c65e3b9f17323f53b23d65 SHA512 11943b16deafcbf301bbd4496fa70da7a7c584c76c5ffea60bbe7b9b30111ec0f66617647d5e1c75f68006fd33f7c4482e52986a3e9ef68496968234a9f710b0 WHIRLPOOL 03d94703047a85437ef64e54358567308054932908fcc6ed5e9b1c0caaa89bc835debd1642a43bf707a285a380d77f4a56a716d128b05f6e3186f5c4c6576e61
-MISC ChangeLog 6379 SHA256 e8ee1b985ad731847ddc0e6d4c92745f5c83775f2ae129f63698b23ff0a50506 SHA512 feba0fedf100daa9c95a7dd575d16efec4962c205a80bc78f31fefb8384992b38cafb0cac24f1f8f1a781090caec5cfe11917ca2d1abb45a2792c80c9de47870 WHIRLPOOL d83b685fdcd86b84137876721fe489c988dbf5c90c4777d76b6c098dabeb7c51af31069f105601fb7b9ff7610e6d2fb26f12312b60ba0cfb6197a32f9d716faa
+EBUILD neverball-1.5.4.ebuild 2188 SHA256 45e76b45640b486ff0a604502a7cca841263dff388194ade8e9d94b82713c49a SHA512 f8196f5c33b9e83ef7f96f89aab10997d8fb1b57160388f76912f223c7c50fa7e8c19eb174f4116d495269f70991bf524566b90673101f322c44b7efee0bcc65 WHIRLPOOL 43650cfd150a359a1da8e663567fe270b00b9594983b02d75c712a69ee475b79c2a51f9e4d74d52aafb4e1108ea8e362019d88c7ff99cfa8242ddc84c6c55524
+MISC ChangeLog 6524 SHA256 b587f3892c07b279a21cb3c2bd100016de6e724af23781564ee4bd2446654722 SHA512 1bb51f7d8d13c5eab2a2c52ff7024a394504ac684caeed23ad0b86413aeb97c8182160bc3add0889c26df3451d324a0c7c2ae6094f37c3426f62609d058ca2c5 WHIRLPOOL f88c132bb73f37faa4e629471dde49b6c4d022000a10c6a2197c2a2ef58b7c1c653a3da156992b226c8dec7166822e93b2a9221153233a3a00b0199cc4aa0863
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlJYPh0ACgkQcaHudmEf86oT3gCeMKXLE7FNRYYmhw7ZhJVLATUt
-WHAAnRk0DeA+ySRqh/3hP3hlA+3AWKyC
-=xZ6m
------END PGP SIGNATURE-----
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() {