Build for amd64. Bug #165523

Package-Manager: portage-2.1.2.9

5 files changed, 176 insertions, 9 deletions

diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index 3f8a96efe355..ddc06ab34dae 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/quakeforge
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.16 2007/03/12 15:05:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.17 2007/07/08 22:36:21 tupone Exp $
+
+*quakeforge-0.5.5-r2 (08 Jul 2007)
+
+  08 Jul 2007; Tupone Alfredo <tupone@gentoo.org>
+  +files/quakeforge-0.5.5-amd64.patch, +quakeforge-0.5.5-r2.ebuild:
+  Build for amd64. Bug #165523 by Luke-Jr
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> quakeforge-0.5.5.ebuild,
   quakeforge-0.5.5-r1.ebuild:
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 73e178fae319..32b6c0cb56c9 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -5,6 +5,10 @@ AUX 0.5.5-ipv6.patch 302 RMD160 7e1255c42df1c6c6ee59e87fa034324bfe2a83b5 SHA1 d2
 MD5 7c7c8315f5a4a12c1c7009e0e5a674ea files/0.5.5-ipv6.patch 302
 RMD160 7e1255c42df1c6c6ee59e87fa034324bfe2a83b5 files/0.5.5-ipv6.patch 302
 SHA256 8b473c335e6dc191e4aae7e7ada09ea5fc6d649e1132bb6230c1427fa0692e7a files/0.5.5-ipv6.patch 302
+AUX quakeforge-0.5.5-amd64.patch 617 RMD160 1a0f3fedc34dfdecb2a3d07d235a7e2a25e0a2f2 SHA1 9b61c7f8f7230b6af083a0d10da7292e92148226 SHA256 75b8e2d329a620f131fbf01ff81211a4985c65e0a1166ccecd618e59b0bfba2a
+MD5 b8b8f0cc784b32c3d1877a3a2a66213f files/quakeforge-0.5.5-amd64.patch 617
+RMD160 1a0f3fedc34dfdecb2a3d07d235a7e2a25e0a2f2 files/quakeforge-0.5.5-amd64.patch 617
+SHA256 75b8e2d329a620f131fbf01ff81211a4985c65e0a1166ccecd618e59b0bfba2a files/quakeforge-0.5.5-amd64.patch 617
 AUX quakeforge-0.5.5-gcc41.patch 11887 RMD160 927ccee1af7ce986317c5a865dd67caf1bb2f489 SHA1 e57ad56650cbc80de3b8abfe58127a0ded0f0be5 SHA256 a8409922b14d1690f3a0f58a7961371944f1c96798f5e5f85ee8247ea1bab20d
 MD5 84da17ca227ffe373c5870acf6fc5135 files/quakeforge-0.5.5-gcc41.patch 11887
 RMD160 927ccee1af7ce986317c5a865dd67caf1bb2f489 files/quakeforge-0.5.5-gcc41.patch 11887
@@ -18,14 +22,18 @@ EBUILD quakeforge-0.5.5-r1.ebuild 3885 RMD160 bfd04f68e6f335ffa3a827a64a98e7107c
 MD5 25c1ae3d84bcdefbad28cb7fadd3ff7e quakeforge-0.5.5-r1.ebuild 3885
 RMD160 bfd04f68e6f335ffa3a827a64a98e7107c29e842 quakeforge-0.5.5-r1.ebuild 3885
 SHA256 b67bcd021f619f93c42c5212152d1227ded4af4f3b6e9fbb442a05d870590627 quakeforge-0.5.5-r1.ebuild 3885
+EBUILD quakeforge-0.5.5-r2.ebuild 3929 RMD160 28e87af878bc7b87f994b188cd07b3b6d200a7ee SHA1 83a0c50ee94a6d9a48c65861f43b63dec10bd97e SHA256 6cadb9dbe236ff8d198f5aa54e96366dde3dee30c8f8ebe5a9b3e299dd788d23
+MD5 58f62f047d03ccfa7a24896cfe5e345e quakeforge-0.5.5-r2.ebuild 3929
+RMD160 28e87af878bc7b87f994b188cd07b3b6d200a7ee quakeforge-0.5.5-r2.ebuild 3929
+SHA256 6cadb9dbe236ff8d198f5aa54e96366dde3dee30c8f8ebe5a9b3e299dd788d23 quakeforge-0.5.5-r2.ebuild 3929
 EBUILD quakeforge-0.5.5.ebuild 3824 RMD160 3e31953bb06ccf99dc689df9d77e3c96df428a15 SHA1 4e6d3f484c7b7e7f73dd81295924ed199b61cd8f SHA256 7b76aba9d103af95cde80517b1db56565652ec2260f358c3a62bbbccc01b5905
 MD5 929cea509fe7619714b2fc4cb06ea13c quakeforge-0.5.5.ebuild 3824
 RMD160 3e31953bb06ccf99dc689df9d77e3c96df428a15 quakeforge-0.5.5.ebuild 3824
 SHA256 7b76aba9d103af95cde80517b1db56565652ec2260f358c3a62bbbccc01b5905 quakeforge-0.5.5.ebuild 3824
-MISC ChangeLog 3223 RMD160 1105ecc10a7e66a3d2c72f55fbf5368ce8be41af SHA1 2e3a5b7b629d3843abc46077330e3da6a5e4a548 SHA256 4336bd3951473d6a593efda516787eebbcec4a732d71635a764d4b0a3be9ad08
-MD5 563a6f8cbc6998c816e9d94106255b79 ChangeLog 3223
-RMD160 1105ecc10a7e66a3d2c72f55fbf5368ce8be41af ChangeLog 3223
-SHA256 4336bd3951473d6a593efda516787eebbcec4a732d71635a764d4b0a3be9ad08 ChangeLog 3223
+MISC ChangeLog 3420 RMD160 194bf2f4103dad7f685311a70f08e0b0a893287d SHA1 c7beafe2470af1a06d0d212808108e77b4ed3357 SHA256 cce38c5bca6b1b0acd346b4f363a7376ddb927ce5780f5821711f97e90c1c461
+MD5 49b6439711e4e903c60425264535473a ChangeLog 3420
+RMD160 194bf2f4103dad7f685311a70f08e0b0a893287d ChangeLog 3420
+SHA256 cce38c5bca6b1b0acd346b4f363a7376ddb927ce5780f5821711f97e90c1c461 ChangeLog 3420
 MISC metadata.xml 1396 RMD160 b7e31184f0351596c32f9014e0c0b6b9a31ad4f1 SHA1 2ff09d93c6d3c1a1f5947ad4039d9160d9b0df48 SHA256 21be4035c9338cf0635afcaf8b23e1a0e98affcabbddd47f6a7663b2afa0d2bb
 MD5 9f8e89d5bb6023c22bd6e5868bd72257 metadata.xml 1396
 RMD160 b7e31184f0351596c32f9014e0c0b6b9a31ad4f1 metadata.xml 1396
@@ -36,10 +44,13 @@ SHA256 f756f5e7c5537b16c33fa21f6f68c997e00c6a724e074d483423256a0805ab97 files/di
 MD5 8e0ded9bacd00a5ada85e067ec836730 files/digest-quakeforge-0.5.5-r1 256
 RMD160 08c8b29e2db4c3a9a9445ae0b6b1f9fcfe3a5a78 files/digest-quakeforge-0.5.5-r1 256
 SHA256 f756f5e7c5537b16c33fa21f6f68c997e00c6a724e074d483423256a0805ab97 files/digest-quakeforge-0.5.5-r1 256
+MD5 8e0ded9bacd00a5ada85e067ec836730 files/digest-quakeforge-0.5.5-r2 256
+RMD160 08c8b29e2db4c3a9a9445ae0b6b1f9fcfe3a5a78 files/digest-quakeforge-0.5.5-r2 256
+SHA256 f756f5e7c5537b16c33fa21f6f68c997e00c6a724e074d483423256a0805ab97 files/digest-quakeforge-0.5.5-r2 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGGoG0dz7hIScOURERAueYAKCPVI0+ls8ktVQf5FiSYpHru5Z0oACeMMHe
-8pLSUTnlSAZRKGncWVVUkZU=
-=8sCR
+iD8DBQFGkWbsRmMZkarFlIwRAu/fAKCvDQcLfZVrLSaPH4vGLXXlAUbHSgCgmLZz
+M66M+b/EIHfjwfFM8ccbGTs=
+=kLu5
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quakeforge/files/digest-quakeforge-0.5.5-r2 b/games-fps/quakeforge/files/digest-quakeforge-0.5.5-r2
new file mode 100644
index 000000000000..e2b268f899bc
--- /dev/null
+++ b/games-fps/quakeforge/files/digest-quakeforge-0.5.5-r2
@@ -0,0 +1,3 @@
+MD5 b750b491ce24135f1a4a1360029de3a2 quakeforge-0.5.5.tar.bz2 1954072
+RMD160 1caf8d7b272c9e588708ac39841d46aac2c5df79 quakeforge-0.5.5.tar.bz2 1954072
+SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a quakeforge-0.5.5.tar.bz2 1954072
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch
new file mode 100644
index 000000000000..ed33e45343fc
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch
@@ -0,0 +1,14 @@
+diff -Naur quakeforge-0.5.5/libs/video/renderer/sw/Makefile.in quakeforge-0.5.5-modified/libs/video/renderer/sw/Makefile.in
+--- quakeforge-0.5.5/libs/video/renderer/sw/Makefile.in	2004-05-02 16:52:12.000000000 -0400
++++ quakeforge-0.5.5-modified/libs/video/renderer/sw/Makefile.in	2007-06-24 22:29:59.000000000 -0400
+@@ -403,8 +403,8 @@
+ target_vendor = @target_vendor@
+ vid_libs = @vid_libs@
+ AUTOMAKE_OPTIONS = foreign
+-AM_CFLAGS = @PREFER_NON_PIC@
+-AM_CCASFLAGS = @PREFER_NON_PIC@
++AM_CFLAGS = -fPIC
++AM_CCASFLAGS = -fPIC
+ INCLUDES = -I$(top_srcdir)/include
+ @ASM_ARCH_FALSE@asm = 
+ @ASM_ARCH_TRUE@asm = libasm.la
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
new file mode 100644
index 000000000000..e333c5e1f25a
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.1 2007/07/08 22:36:21 tupone Exp $
+
+inherit 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 3dfx fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss"
+RESTRICT="userpriv"
+
+RDEPEND="3dfx? ( media-libs/glide-v3 )
+	opengl? ( virtual/opengl )
+	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 )"
+DEPEND="${RDEPEND}
+	cdinstall? ( games-fps/quake1-data )
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}"-ipv6.patch \
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-keys.patch \
+		"${FILESDIR}/${P}"-amd64.patch
+}
+
+src_compile() {
+	#i should do this at some point :x ... i guess if you disable all shared stuff
+	#and enable all the static options explicitly, static works ... (or so ive been told)
+	#if ! use static ; then
+	#	myconf="${myconf} --enable-shared=yes --enable-static=no"
+	#else
+	#	myconf="${myconf} --enable-shared=no --enable-static=yes"
+	#fi
+
+	local debugopts
+	use debug \
+		&& debugopts="--enable-debug --disable-optimize --enable-profile" \
+		|| debugopts="--disable-debug --disable-profile"
+
+	local clients=${QF_CLIENTS}
+	use 3dfx && clients="${clients},3dfx"
+	use fbcon && clients="${clients},fbdev"
+	use opengl && clients="${clients},glx"
+	use sdl && clients="${clients},sdl,sdl32"
+	use sdl && use opengl && clients="${clients},sgl"
+	use svga && clients="${clients},svga"
+	use X && clients="${clients},x11"
+	use X && use opengl && clients="${clients},wgl"
+	[ "${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 \
+		$(use_enable ncurses curses) \
+		$(use_enable vorbis) \
+		$(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 oss) \
+		--enable-sound \
+		--disable-optimize \
+		${debugopts} \
+		--with-global-cfg="${GAMES_SYSCONFDIR}"/quakeforge.conf \
+		--with-sharepath="${GAMES_DATADIR}"/quake1 \
+		--with-clients=${clients} \
+		--with-servers=${servers} \
+		--with-tools=${tools} \
+		|| die
+	make || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	mv "${D}/${GAMES_PREFIX}"/include "${D}"/usr/
+	dodoc ChangeLog NEWS TODO doc/*
+	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"
+}