version bump (bug #299406) with development from Widget and ssuominen

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

4 files changed, 115 insertions, 4 deletions

diff --git a/games-roguelike/angband/ChangeLog b/games-roguelike/angband/ChangeLog
index dcfd6227975c..e90e7917c756 100644
--- a/games-roguelike/angband/ChangeLog
+++ b/games-roguelike/angband/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2010/01/07 22:04:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/ChangeLog,v 1.30 2010/02/16 22:25:13 mr_bones_ Exp $
+
+*angband-3.1.2_p2 (16 Feb 2010)
+
+  16 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +angband-3.1.2_p2.ebuild:
+  version bump (bug #299406) with development from Widget and ssuominen
 
   07 Jan 2010; Joseph Jezak <josejx@gentoo.org> angband-3.0.9e.ebuild:
   Marked ppc stable for bug #294528.
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 398695a2f53a..b714115f187e 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,5 +1,7 @@
 AUX angband-3.0.9e-gentoo.patch 3349 RMD160 770d8a0e0fa7967dd074bb79ffebaedeacea6086 SHA1 337ce071276597606d7f13d9404c7c020470ff4b SHA256 4aa86d71ff7e496c76c7bc0fdd93c94939f81b0a1461b8e030a9202f14ce639f
 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
 EBUILD angband-3.0.9e.ebuild 1506 RMD160 dd0079ad10363910b4f6ed330f5acf2720a899c2 SHA1 88a3d8dbd7a6d1450f63a20f598496942ab7ff81 SHA256 0c49b894ffca9a75004487dfe911d4d4ac886408afdf42526a3575b6f24649b0
-MISC ChangeLog 4048 RMD160 aac00e470d73db54efc38534d3927e5a81e51d68 SHA1 eb47517331e56f0f4e995263b20dad39c851138c SHA256 97216d8a34988b017994c1bb7b9a17e1d64f0a97841346b5ae460355f6f4790a
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+EBUILD angband-3.1.2_p2.ebuild 2643 RMD160 3167a4756ead548d14cc21ccff0246ceb1a66fb1 SHA1 c526938dba1ba5b5d7379695fb5605402aef8815 SHA256 301441feb4fa4f9a242b192f619bd777f9c4699cc0f2e43be6b14fb73a14c96c
+MISC ChangeLog 4240 RMD160 6293a373cb99cc0cfea2c52a3e1d584312e88425 SHA1 1a1a0475e365557588da9f788d35cae1cafa1a75 SHA256 83839713fd0eae5512bd491ac36afc2dedcd36ba82c806574d6b1954b36a1a7f
+MISC metadata.xml 228 RMD160 caf249fa1b9dc3ca792b451ad54869a809f2da6a SHA1 641b504373030c50afd14db9482f01b111a75dc3 SHA256 82862f0e444b920d358b225084911a03058e8d38cd80328d83777f61ef924adc
diff --git a/games-roguelike/angband/angband-3.1.2_p2.ebuild b/games-roguelike/angband/angband-3.1.2_p2.ebuild
new file mode 100644
index 000000000000..5e0cef5052f1
--- /dev/null
+++ b/games-roguelike/angband/angband-3.1.2_p2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/angband-3.1.2_p2.ebuild,v 1.1 2010/02/16 22:25:13 mr_bones_ Exp $
+
+EAPI=2
+inherit 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}-src.tar.gz"
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~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_configure() {
+	local myconf
+
+	if use sdl; then
+		myconf="$(use_enable sound sdl-mixer)"
+	else
+		myconf="--disable-sdl-mixer"
+	fi
+
+	econf \
+		--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/metadata.xml b/games-roguelike/angband/metadata.xml
index d3c2cc926f0b..b8e6986601e2 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>games</herd>
+	<use>
+		<flag name='sound'>Enable and install sounds</flag>
+	</use>
 </pkgmetadata>