version bump; clean old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 85 insertions, 91 deletions

diff --git a/games-fps/ezquake-bin/ChangeLog b/games-fps/ezquake-bin/ChangeLog
index 1bcb19cea6f7..5a40ae61faf0 100644
--- a/games-fps/ezquake-bin/ChangeLog
+++ b/games-fps/ezquake-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/ezquake-bin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ezquake-bin/ChangeLog,v 1.13 2013/02/05 08:58:54 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ezquake-bin/ChangeLog,v 1.14 2014/07/01 15:56:38 mr_bones_ Exp $
+
+*ezquake-bin-2.2 (01 Jul 2014)
+
+  01 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> +ezquake-bin-2.2.ebuild,
+  -ezquake-bin-1.9.ebuild:
+  version bump; clean old
 
   05 Feb 2013; Tupone Alfredo <tupone@gentoo.org> ezquake-bin-1.9.3.ebuild:
   Use QA_PREBUILT. Bug #454986 by Diego
@@ -58,4 +64,3 @@
   +ezquake-bin-1517.ebuild:
   Initial import. Ebuild by Patryk Rzadzinski <rzadzins@wit.edu.pl> and
   modified by me. Closing bug #130823.
-
diff --git a/games-fps/ezquake-bin/Manifest b/games-fps/ezquake-bin/Manifest
index 0fe7d20a7014..81f15ac07ae6 100644
--- a/games-fps/ezquake-bin/Manifest
+++ b/games-fps/ezquake-bin/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST ezquake_linux-x86_1.9.3.tar.gz 19230315 SHA256 a0a9c4f2cc0444f5a404b387fa33c933b826acf0ffe81fd5415e7cba93b24196 SHA512 c362b0103fa4beb578fec5653b4b9196d0202a00c662e3e001615c07041968daa7bd8edf194e310ac8501d01768b2bda79e250830733fb4dd56cb1517844d79f WHIRLPOOL a744edaf4f8ed46907dfd7c4bc58b399e955ca89929dbf83fc129caa8ec5abaeb25c96b79ad6929db96f712f3ce45d2425634b0c809207dbe4afd24e2d3cd710
-DIST ezquake_linux-x86_1.9.tar.gz 19193980 SHA256 2e65c1632bedbf8382870d79ba7dc1ee76d2371e03943da9cd57f2c4e5ac1dcb
-DIST ezquake_linux-x86_64.1.9.3.tar.gz 18624824 SHA256 3697482c2c8299ed02aef9d39d263f7d91ab783026cd9489beb28fe9566acacf
-DIST ezquake_security_1.8.2.zip 846404 SHA256 8ab7ac98069a2dbcb67c963abca63f9dcf9fd663c1aa788d592599e30f45943a
+DIST ezquake_linux-x86_64.1.9.3.tar.gz 18624824 SHA256 3697482c2c8299ed02aef9d39d263f7d91ab783026cd9489beb28fe9566acacf SHA512 4c2f5060bbf08ca3b9583d4c3502e69bf6d503efd0e14df9d5fe54e1e8ac1c5ca0b920c3748e4a8e1f86c60d6e5809977352636d4758fd9cb3934cea03b1138f WHIRLPOOL d8c4886c4340c144d1f7358acc99cfb5b908044502331b761352bae81f6a2d1648e21fa3557a908d3147e1f1761e3bdfec14e60f1a3beed66283790f430452eb
+DIST ezquake_linux32_2.2.tar.gz 1685934 SHA256 655e8ec60c619ab5d1435882436296b88fc279c2963f01dd277f34939336c067 SHA512 2a42b43a0b4ad75c22c58bb53f8161eec1460cac3b841ccf2593e0cb803c4ef5cee23f939f859eb6d95409a01c4ccc3eabae108eac6c1cb850f9c5c3445bf5ab WHIRLPOOL f10b874bcbb37c084c3ae17ad2c410968f7ccd5bb9551e4d7ea13cafa91fe9601d4fe9435caed3739a11bc15c4a8ac949afb4aad2c79a04165e8c1ae2bf4dc76
+DIST ezquake_linux64_2.2.tar.gz 1804397 SHA256 b7735c680403678955f7d04a51265d216fb787fbdb343628b69418bfdb5c7203 SHA512 c1f1772971980a7b349da6c6eea5643591d5bc81a939b28e50651c5773d8372277fb6bc9a5681c59e8273ca6250fa712c3b76db488bf521dd3675aabd5e1af8e WHIRLPOOL 9fa74efcdd4acb489d6ccac0ab77b4b2732d07bb27f369100cb23bbfbd9bf0c72e62fb09ade0c3f042939435b69164a4629dd17ab6fc0b6eee3d1651f3579439
 EBUILD ezquake-bin-1.9.3.ebuild 2032 SHA256 b9c375b68b143f28b256cc1a8bc00db9b52e0a61bfcc31c58de4871a8c00226f SHA512 f2f83f7e458298b5e9887d13883eec4f5620837a65e94a5026c288dfca6dcc03d2759f983dca202e203184cc6492658ea4f14d5355efdcc1b078b37542613c0e WHIRLPOOL 59f69241dd611c54debf348671dc42d44bc9fc9f59ed5278617d3f1c8dc3af0de9c5901b0a430b3c3afceb9f4e48be105a7d40b286f3bb30ba64d3f59cb7abe8
-EBUILD ezquake-bin-1.9.ebuild 2258 SHA256 cf7b546b2103ca88915480b922638446ee4b05da001ca9e25b45002f691f8dac SHA512 ae673fd3548c0d9fea4772f1f4ec0fafa125b4e2784acd7d1a88cbeba65b193343c1beab1c2c1391775d5862e3e08781fa9675e54de942dbafc6fdf0a22d6c61 WHIRLPOOL ba35130380d062e3ae751e5a9cf8d1b3036d6980c64f3e289227a2a8b7e6962e71f08438243970afa5fd7edc26f018104c25f5b755ceda43a8c094dd691d1ad7
-MISC ChangeLog 2122 SHA256 664a21db4721fee23b7cbdb7cc45af12b8205caa19a7bf330a959373ba567594 SHA512 3ce3ae292277345f10d47e89ac73e13eb97ba7771f8ab55d922b228e8653f94f8e4fdc039e7178c900aa7ac31b86aac53b1ea9f369e7ed81052ae2c039459d93 WHIRLPOOL 8a27c5ffa8d99cef30c7abc1943930261c042e13e596162bdf556ac59f4db5747403d20b1699a11fb7edd28066bda511b355eea29fe33bff3c8e46dfaf29b7c0
+EBUILD ezquake-bin-2.2.ebuild 2070 SHA256 2024bb7f656d327630e81a5276326242e1b7b3133fb60b9ae01de88272be2587 SHA512 fd57f85182a02e94b0c1d8fccc9786f725107d659f7dbe3b1a7dc2b84290d29f4eadc0092e74ce37898b4c248cee26f15d746b3318c7da1c2b0bc5a6dd48211f WHIRLPOOL f6f30179582d9768426f75f129f25b1fd5011f3d4d14a41f3fadaab7e3d822ee68a2d7d2af1727c9b86ef7e359ab25d60b960ce45c96ef68e8c209543f2f8eeb
+MISC ChangeLog 2290 SHA256 3a05826f41c0deb2fe0dd53355b6a4dc8953346118377137fe3cf5abfed0f5c4 SHA512 49057605461335c868e9eddfefec48f65c5bf21e0921cd47d445981b679f7077886bcf13cf02c8eeadb194c690b1c97bcbbfda3c3ff9f4ed8d6b1afc2083e589 WHIRLPOOL 90806ea55a1fc8d465181736cdf3291e05d0c450654dff4e776afa4fe5ab1b1c96165d96d1ddca686d69506e4b74dc8f9c036590049b80b59044fbe46feac771
 MISC metadata.xml 262 SHA256 320a0c4f589e44eb15acbe7baae2408c1aaf3b8513567c88de342e28f5dfb9af SHA512 b8db495cf65129c8dc708000759e7c100c51fe610bbc76143ffed176129301c4984b77f45a67bbe263eb461679615944268fd8f72261e2f1042520e0c42aa9c1 WHIRLPOOL 65b064019e864c5417bb08d7d14f815fdef76e43e14b3537e8d707c6ad9fdb85d95f501caf363dcd0de328a8bf4d73e3f9e5d25f2bc262371149b345e29e71d9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlEQydQACgkQIY77eQFFFC2heQCfbD0M2KWhV9/obYM48/jm8n47
-1DcAn1VQhzU6T0wY2YyHrpZ3E019o5yd
-=za6U
------END PGP SIGNATURE-----
diff --git a/games-fps/ezquake-bin/ezquake-bin-1.9.ebuild b/games-fps/ezquake-bin/ezquake-bin-1.9.ebuild
deleted file mode 100644
index c341707bcabe..000000000000
--- a/games-fps/ezquake-bin/ezquake-bin-1.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ezquake-bin/ezquake-bin-1.9.ebuild,v 1.1 2008/06/04 19:43:14 mr_bones_ Exp $
-
-inherit games
-
-MY_PN="${PN/-bin/}"
-SECURITY_PV=1.8.2
-DESCRIPTION="Quakeworld client with mqwcl functionality and many more features."
-HOMEPAGE="http://ezquake.sf.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${PV}.tar.gz
-	security? ( http://uttergrottan.localghost.net/${MY_PN}/security/${MY_PN}_security_${SECURITY_PV}.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-RESTRICT="strip"
-IUSE="cdinstall opengl security svga"
-
-QA_EXECSTACK_x86="${GAMES_PREFIX_OPT:1}/ezquake-bin/ezquake-gl.glx
-	${GAMES_PREFIX_OPT:1}/ezquake-bin/ezquake.x11
-	${GAMES_PREFIX_OPT:1}/ezquake-bin/ezquake.svga"
-QA_EXECSTACK_amd64="${GAMES_PREFIX_OPT:1}/ezquake-bin/ezquake-gl.glx
-	${GAMES_PREFIX_OPT:1}/ezquake-bin/ezquake.x11
-	${GAMES_PREFIX_OPT:1}/ezquake-bin/ezquake.svga"
-
-RDEPEND=">=dev-libs/expat-2.0
-	sys-libs/glibc
-	!svga? ( x11-libs/libXext )
-	svga? ( media-libs/svgalib )
-	opengl? ( virtual/opengl x11-libs/libXext )
-	cdinstall? ( games-fps/quake1-data )"
-DEPEND="${RDEPEND}
-	security? ( app-arch/zip )"
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-src_install() {
-	exeinto "${dir}"
-	insinto "${dir}"
-
-	local x BINS="ezquake.x11"
-	use svga && BINS="${BINS} ezquake.svga"
-	use opengl && BINS="${BINS} ezquake-gl.glx"
-
-	doexe ${BINS} || die "doexe"
-	if use security ; then
-		doexe "${MY_PN}-security.so" || die "doexe"
-	fi
-	doins -r ezquake qw || die "doins failed"
-
-	dosym "${GAMES_DATADIR}"/quake1/id1 "${dir}"/id1
-
-	for x in ${BINS}; do
-		games_make_wrapper ${x} ./${x} "${dir}" "${dir}"
-	done
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use !cdinstall; then
-		elog "NOTE that this client doesn't include .pak files. You *should*"
-		elog "enable \"cdinstall\" flag or install quake1-demodata."
-		elog "You can also copy the files from your Quake1 CD to"
-		elog "  ${dir}/quake1/id1 (all names lowercase)"
-		elog ""
-		elog "You may also want to check:"
-		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
-		elog " http://equake.quakeworld.nu - free package containing various files"
-	fi
-}
diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild
new file mode 100644
index 000000000000..5f305a13e48e
--- /dev/null
+++ b/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild,v 1.1 2014/07/01 15:56:38 mr_bones_ Exp $
+
+EAPI=5
+inherit games
+
+MY_FULL_PV=1.9.3
+MY_PN="${PN/-bin/}"
+DESCRIPTION="Quakeworld client with mqwcl functionality and many more features."
+HOMEPAGE="http://ezquake.sf.net/"
+SRC_URI="
+	amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz
+		mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz )
+	x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz
+		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip mirror"
+IUSE="cdinstall"
+
+DEPEND="cdinstall? ( games-fps/quake1-data )"
+RDEPEND="${DEPEND}
+		virtual/opengl
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm"
+
+S=${WORKDIR}/${MY_PN}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+
+QA_PREBUILT="${dir:1}/ezquake*"
+
+src_unpack() {
+	unpack ${A}
+	if use amd64; then
+		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}"
+		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx
+	else
+		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}"
+		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx
+	fi
+}
+
+src_install() {
+	exeinto "${dir}"
+	insinto "${dir}"
+
+	doexe ezquake-gl.glx
+	doins -r ezquake qw
+	dosym "${GAMES_DATADIR}"/quake1/id1 "${dir}"/id1
+	games_make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${dir}" "${dir}"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if ! use cdinstall; then
+		elog "NOTE that this client doesn't include .pak files. You *should*"
+		elog "enable \"cdinstall\" flag or install quake1-demodata with the symlink use flag."
+		elog "You can also copy the files from your Quake1 CD to"
+		elog "  ${dir}/quake1/id1 (all names lowercase)"
+		elog ""
+		elog "You may also want to check:"
+		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
+		elog " http://equake.quakeworld.nu - free package containing various files"
+	fi
+}