version bump

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 175 insertions, 2 deletions

diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index 2d8bc8b549d8..cf6036b9e939 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/quakeforge
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.33 2012/11/21 21:16:52 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.34 2013/02/02 00:07:44 hasufell Exp $
+
+*quakeforge-0.7.2 (02 Feb 2013)
+
+  02 Feb 2013; Julian Ospald <hasufell@gentoo.org> +quakeforge-0.7.2.ebuild,
+  +files/quakeforge-0.7.2-gentoo.patch:
+  version bump
 
 *quakeforge-0.7.0 (21 Nov 2012)
 
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch b/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
new file mode 100644
index 000000000000..396d7322b453
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
@@ -0,0 +1,33 @@
+--- nq/source/Makefile.am.old	2012-11-18 16:57:56.658388682 +0100
++++ nq/source/Makefile.am	2012-11-18 16:58:11.470268607 +0100
+@@ -138,7 +138,7 @@
+ nq_x11_SOURCES= 	sys_unix.c
+ nq_x11_LDADD=		$(nq_x11_libs) \
+ 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
+-			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS)
++			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) -ldl
+ nq_x11_LDFLAGS= 	$(common_ldflags)
+ nq_x11_DEPENDENCIES=	$(nq_x11_libs)
+ 
+--- qw/source/Makefile.am.old	2012-11-18 17:10:59.148172332 +0100
++++ qw/source/Makefile.am	2012-11-18 17:11:55.866876762 +0100
+@@ -168,7 +168,7 @@
+ qw_client_x11_SOURCES=	cl_sys_unix.c
+ qw_client_x11_LDADD= $(qw_client_x11_libs) \
+ 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
+-			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS)
++			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) -ldl
+ qw_client_x11_LDFLAGS=	$(common_ldflags)
+ qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
+ 
+--- tools/qwaq/Makefile.am.old	2012-11-18 17:15:16.024714317 +0100
++++ tools/qwaq/Makefile.am	2012-11-18 17:15:41.955749660 +0100
+@@ -38,7 +38,7 @@
+ qwaq_x11_SOURCES=qwaq.c qwaq-bi.c
+ qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
+ 				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
+-				$(X_EXTRA_LIBS) $(X_SHM_LIB)
++				$(X_EXTRA_LIBS) $(X_SHM_LIB) -ldl
+ qwaq_x11_LDFLAGS=
+ qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
+ 
diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index ce353d9b3c75..141c222baa27 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -26,4 +26,8 @@ Other things we're doing include merging the two code trees, adding
 features, and improving the OpenGL renderer. And QuakeForge is still the 
 most portable source tree based on the id Software code.
 </longdescription>
+<use>
+	<flag name="wildmidi">enable libWildMidi support</flag>
+	<flag name="xdg">enable XDG support</flag>
+</use>
 </pkgmetadata>
diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
new file mode 100644
index 000000000000..229f872b1de2
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.7.2.ebuild,v 1.1 2013/02/02 00:07:45 hasufell Exp $
+
+EAPI=5
+inherit base eutils autotools games
+
+DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine"
+HOMEPAGE="http://www.quakeforge.net/"
+SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cdinstall debug fbcon flac sdl svga X ncurses png vorbis zlib ipv6 xv dga alsa oss xdg wildmidi"
+RESTRICT="userpriv"
+
+RDEPEND="
+	media-libs/libsamplerate
+	net-misc/curl
+	virtual/opengl
+	png? ( media-libs/libpng:0 )
+	flac? ( media-libs/flac )
+	sdl? ( media-libs/libsdl )
+	svga? ( media-libs/svgalib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+	)
+	ncurses? ( sys-libs/ncurses )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+	xv? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+	)
+	dga? ( x11-libs/libXxf86dga )
+	alsa? ( media-libs/alsa-lib )
+	wildmidi? ( media-sound/wildmidi )"
+DEPEND="${RDEPEND}
+	cdinstall? ( games-fps/quake1-data )
+	>=sys-devel/bison-2.6
+	sys-devel/flex
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	local debugopts
+	use debug \
+		&& debugopts="--enable-debug --disable-optimize --enable-profile" \
+		|| debugopts="--disable-debug --disable-profile"
+
+	local clients=${QF_CLIENTS}
+	use fbcon && clients="${clients},fbdev"
+	use sdl && clients="${clients},sdl"
+	use svga && clients="${clients},svga"
+	use X && clients="${clients},x11"
+	[ "${clients:0:1}" == "," ] && clients=${clients:1}
+
+	local servers=${QF_SERVERS:-master,nq,qw,qtv}
+
+	local tools=${QF_TOOLS:-all}
+
+	local svgaconf	# use old school way for broken conf opts
+	use svga \
+		&& svgaconf="--with-svga=/usr" \
+		|| svgaconf="--without-svga"
+
+	addpredict "$(games_get_libdir)"
+	egamesconf \
+		--enable-dependency-tracking \
+		$(use_enable ncurses curses) \
+		$(use_enable vorbis) \
+		$(use_enable png) \
+		$(use_enable zlib) \
+		$(use_with ipv6) \
+		$(use_with fbcon fbdev) \
+		${svgaconf} \
+		$(use_with X x) \
+		$(use_enable xv vidmode) \
+		$(use_enable dga) \
+		$(use_enable sdl) \
+		--disable-xmms \
+		$(use_enable alsa) \
+		$(use_enable flac) \
+		$(use_enable oss) \
+		$(use_enable xdg) \
+		$(use_enable wildmidi) \
+		--enable-sound \
+		--disable-optimize \
+		--disable-Werror \
+		${debugopts} \
+		--with-global-cfg="${GAMES_SYSCONFDIR}"/quakeforge.conf \
+		--with-sharepath="${GAMES_DATADIR}"/quake1 \
+		--with-clients=${clients} \
+		--with-servers=${servers} \
+		--with-tools=${tools}
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	mv "${D}/${GAMES_PREFIX}"/include "${D}"/usr/ || die
+	dodoc ChangeLog NEWS TODO
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	# same warning used in quake1 / quakeforge / nprquake-sdl
+	games_pkg_postinst
+	echo
+	elog "Before you can play, you must make sure"
+	elog "${PN} can find your Quake .pak files"
+	elog
+	elog "You have 2 choices to do this"
+	elog "1 Copy pak*.pak files to ${GAMES_DATADIR}/quake1/id1"
+	elog "2 Symlink pak*.pak files in ${GAMES_DATADIR}/quake1/id1"
+	elog
+	elog "Example:"
+	elog "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/"
+	elog "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak ${GAMES_DATADIR}/quake1/id1/pak0.pak"
+	elog
+	elog "You only need pak0.pak to play the demo version,"
+	elog "the others are needed for registered version"
+}