version bump - ebuild submitted by Stephen Bridges via bug #350194

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 140 insertions, 13 deletions

diff --git a/games-roguelike/angband/ChangeLog b/games-roguelike/angband/ChangeLog
index ecc2c4f5d6da..e17c100d8e2f 100644
--- a/games-roguelike/angband/ChangeLog
+++ b/games-roguelike/angband/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-roguelike/angband
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/ChangeLog,v 1.34 2010/08/12 03:55:45 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/ChangeLog,v 1.35 2011/01/16 02:07:27 mr_bones_ Exp $
+
+  16 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +angband-3.2.0.ebuild, +files/angband-3.2.0-array.patch:
+  version bump - ebuild submitted by Stephen Bridges via bug #350194
+
+*angband-3.2.0 (31 Dec 2010)
+
+  31 Dec 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +angband-3.2.0.ebuild, +files/angband-3.2.0-array.patch:
+  version bump (bug #350194)
 
   12 Aug 2010; Joseph Jezak <josejx@gentoo.org> angband-3.1.2_p2.ebuild:
   Marked ppc stable for bug #315301.
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 70963b8866f5..73308a0b9c94 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX angband-3.0.9e-gentoo.patch 3349 RMD160 770d8a0e0fa7967dd074bb79ffebaedeacea6086 SHA1 337ce071276597606d7f13d9404c7c020470ff4b SHA256 4aa86d71ff7e496c76c7bc0fdd93c94939f81b0a1461b8e030a9202f14ce639f
+AUX angband-3.2.0-array.patch 514 RMD160 a1f9eea08769eaf5ae58d19b52d6e81d70ea739d SHA1 b0d7df9a1c5a8375640cb5ecaa48b281bac0df70 SHA256 22cee07c3868ae165dcf02501431d38956fcac72e2e755fff25ec05684668ede
 DIST angband-3.0.9e.tar.gz 2333086 RMD160 140f6f77c0fd678f4406c78520b175f13f249d33 SHA1 c282a49f5517161393fc118a9c740bc162e04162 SHA256 011af7377a4cb9dba8ec19af649d96fd2cddf9d9102109c2326e6905c9206097
 DIST angband-3.1.2v2-src.tar.gz 3546493 RMD160 8fca8f1efe6a71e0ffa78e491c01cf08f43cf2d8 SHA1 e6426c2d6054502a20e255dd07f49cbe6dd547a2 SHA256 352401555bafa5e0f8a26dd1bfb598d024abc85c51c34ca407aed85d94dd801b
+DIST angband-3.2.0.tar.gz 4931059 RMD160 98f296ad79f3996cf61b05ff0378796ba5bddfed SHA1 e63b7f2425303fdbc6933e2b0d34adc48824541f SHA256 43ba8df50109b2c4c2533242ba26228b730430eb9d8f26e4fece91fd3bdd7fc9
 EBUILD angband-3.0.9e.ebuild 1506 RMD160 dd0079ad10363910b4f6ed330f5acf2720a899c2 SHA1 88a3d8dbd7a6d1450f63a20f598496942ab7ff81 SHA256 0c49b894ffca9a75004487dfe911d4d4ac886408afdf42526a3575b6f24649b0
 EBUILD angband-3.1.2_p2.ebuild 2637 RMD160 4dfa32fea9a97b59139444add8c96798a4cc289e SHA1 8aa0af781ae59c8879da2e3de25b3dbedc176502 SHA256 16b4fc0f0457a5676468b4951d18513a42d124a73e198bef870d180ff486d8b8
-MISC ChangeLog 4651 RMD160 88da3c3e9a69091024c6a895632b166731ba3798 SHA1 4a4be7133cb5b7a2961a04d3f6b7945394e72300 SHA256 f350817a830b89e73cf209c013d9425161552891e304ea5882229968a0396b1a
+EBUILD angband-3.2.0.ebuild 2920 RMD160 835c679596b361405971d0ba41b8342fcb43189c SHA1 94b3007fcf0558ddc66e4b77ef2d0d671d93dcbc SHA256 3e53060c849b999e49d108f533d8872b0b4e043940cba48739d9acab23ac7f0f
+MISC ChangeLog 5012 RMD160 4bc4d7f8afea4a8a4ab6a90b84d57b0566e62ad9 SHA1 f785496c5373ccd7b8e5c4ad781e61697e77a163 SHA256 feb0a30e19abc77cc0ebf6e0640099ae2c9487dada9d2a4be3124e0273d03ffa
 MISC metadata.xml 228 RMD160 caf249fa1b9dc3ca792b451ad54869a809f2da6a SHA1 641b504373030c50afd14db9482f01b111a75dc3 SHA256 82862f0e444b920d358b225084911a03058e8d38cd80328d83777f61ef924adc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxjcHQACgkQcsIHjyDViGQWzACgrceuYwyE8D4jm0Xx/CwIs0Mf
-q6YAoI13kjKx5US+nTdAUqqQIIvqUUns
-=oJkq
------END PGP SIGNATURE-----
diff --git a/games-roguelike/angband/angband-3.2.0.ebuild b/games-roguelike/angband/angband-3.2.0.ebuild
new file mode 100644
index 000000000000..3f6ff2de7a8d
--- /dev/null
+++ b/games-roguelike/angband/angband-3.2.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/angband-3.2.0.ebuild,v 1.1 2011/01/16 02:07:31 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools eutils versionator games
+
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P=${P/_p/v}
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
+HOMEPAGE="http://rephial.org/"
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk ncurses sdl +sound X"
+
+RDEPEND="gtk? ( gnome-base/libglade
+	   x11-libs/pango
+	   x11-libs/gtk+:2
+	   dev-libs/glib:2 )
+	X? ( x11-libs/libSM
+		 x11-libs/libX11 )
+	!ncurses? ( !X? ( !sdl? ( !gtk? ( sys-libs/ncurses ) ) ) )
+	sdl? ( media-libs/libsdl[video,X]
+		media-libs/sdl-ttf
+		media-libs/sdl-image
+		sound? ( media-libs/sdl-mixer
+			media-libs/libsdl[audio] ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-array.patch
+	# The 3.2.0 tarball as of writing is dirty and has object files
+	# in it that foul the build process.  Find is quicker than configuring
+	# twice.
+	find "${S}" -name '*.o' -exec rm -f '{}' +
+	eautoreconf || die
+}
+
+src_configure() {
+	local myconf
+
+	if use sdl; then
+		myconf="$(use_enable sound sdl-mixer)"
+	else
+		myconf="--disable-sdl-mixer"
+	fi
+
+	egamesconf \
+		--bindir="${GAMES_BINDIR}" \
+		--with-configpath="${GAMES_SYSCONFDIR}/${PN}" \
+		--with-libpath="${GAMES_DATADIR}/${PN}" \
+		--with-varpath="${GAMES_STATEDIR}/${PN}" \
+		--with-private-dirs \
+		$(use_enable X x11) \
+		$(use_enable gtk) \
+		$(use_enable sdl) \
+		$(use_enable ncurses curses) \
+		$( use !gtk && use !sdl && use !ncurses && use !X && \
+			echo --enable-curses) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Edit files are now system config files in Angband, but
+	# users will be hidden from applying updates by default
+	echo "CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/edit/\"" \
+		> "${T}"/99${PN}
+	doenvd "${T}"/99${PN} || die
+
+	dodoc changes.txt faq.txt readme.txt thanks.txt || die
+
+	# Create desktop entries if required.
+	ICON_LOC="${GAMES_DATADIR}/${PN}/xtra/icon/att-32.png"
+	if use X; then
+		make_desktop_entry "angband -mx11" "Angband (X11)" "${ICON_LOC}" || die
+	fi
+
+	if use sdl; then
+		make_desktop_entry "angband -msdl" "Angband (SDL)" "${ICON_LOC}" || die
+	fi
+
+	if use gtk; then
+		make_desktop_entry "angband -mgtk" "Angband (GTK)" "${ICON_LOC}" || die
+	fi
+
+	use ncurses || rm -rf "${D}${GAMES_DATADIR}/${PN}/xtra/graf"
+	use sound || rm -rf "${D}${GAMES_DATADIR}/${PN}/xtra/sound"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	echo
+	elog "Angband now uses private savefiles instead of system-wide ones"
+	elog "This version of Angband is not compatible with the save files"
+	elog "of previous versions"
+	echo
+
+	games_pkg_postinst
+}
diff --git a/games-roguelike/angband/files/angband-3.2.0-array.patch b/games-roguelike/angband/files/angband-3.2.0-array.patch
new file mode 100644
index 000000000000..3638a76c5169
--- /dev/null
+++ b/games-roguelike/angband/files/angband-3.2.0-array.patch
@@ -0,0 +1,15 @@
+--- src/init2.c.orig	2010-12-31 12:47:48.270293037 -0500
++++ src/init2.c	2010-12-31 12:50:20.368081626 -0500
+@@ -2719,10 +2719,10 @@
+ 	if (sval < 0)
+ 		return PARSE_ERROR_UNRECOGNISED_SVAL;
+ 
+-	for (i = 0; i <= MAX_START_ITEMS; i++)
++	for (i = 0; i < MAX_START_ITEMS; i++)
+ 		if (!c->start_items[i].min)
+ 			break;
+-	if (i > MAX_START_ITEMS)
++	if (i >= MAX_START_ITEMS)
+ 		return PARSE_ERROR_TOO_MANY_ENTRIES;
+ 	c->start_items[i].kind = objkind_get(tval, sval);
+ 	c->start_items[i].min = parser_getuint(p, "min");