EAPI=5; switch to LGP version of demo

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 21 insertions, 48 deletions

diff --git a/games-strategy/majesty-demo/ChangeLog b/games-strategy/majesty-demo/ChangeLog
index 9f90ebc2a532..309c5e5989d2 100644
--- a/games-strategy/majesty-demo/ChangeLog
+++ b/games-strategy/majesty-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/majesty-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.15 2014/10/13 15:44:00 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.16 2015/03/27 02:33:01 mr_bones_ Exp $
+
+  27 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  majesty-demo-1.0.0.ebuild:
+  EAPI=5; switch to LGP version of demo
 
   13 Oct 2014; Michał Górny <mgorny@gentoo.org> majesty-demo-1.0.0.ebuild:
   Support multilib providers for deps.
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
index f102fc7018cb..7c814fe3fbbd 100644
--- a/games-strategy/majesty-demo/Manifest
+++ b/games-strategy/majesty-demo/Manifest
@@ -1,26 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST majesty_demo.run 43170241 SHA256 3d3d1479dde2412804b8c5daa865584d77d5d60b861f2a042255e825decfbffe SHA512 67c74e3c11514649fbf1f2aadf529ce4ee62084c5825a2ec213c28ced6ec1d3ff6b6b2858f6f721c032160df794d62e4a73bcf9696ee4ebbb6ed29df1c024e31 WHIRLPOOL b8311ade80f6ed8c867806c68bfb378c7cd2a59c055df9363fe78c248564efbd110d3e31c229acecce3794f655f2abe4a531dd12f54e03e0f9d3e8e031627714
-EBUILD majesty-demo-1.0.0.ebuild 1589 SHA256 402503b2e6d389a14e04821e0129664a55f8f12350b815db6913d88016efef09 SHA512 8a57271cf5b5e67fcda18c797177fbed364e9d977c4f807265eb752397bacb6dc4ea66aada287efed1d594c2432ca520107ba1027f38da249e11cb323021cf93 WHIRLPOOL 043928dd16baa1cab5edd60885b910cb224b06e9bd4d7ae373e68a981f4a8ee507ed5b35c314a31ee9e24176b46f0059d02f84f3c908164535fac00a4f687e47
-MISC ChangeLog 2105 SHA256 014b0619df6411d6817a751307550f7e8a001afd7c5b23a23875130c5f3305c2 SHA512 6ccdc0fe5a3f3aa480fd9433dcab7d2f5f57d6ebe11a7ea5505f1ae77dc8b6f813be36e8a2e5d7a6abd3552d643c8eaf424cf7fdf2fe37998cb361a7d145a06f WHIRLPOOL 4cf18f8137e0fdb072a434d4b8f383ed308be5f9c52a478302b760ca8b1d15e0314b3efe8c3edb1e2226afc14c24c464616bc442ca50236c883e2797d567f442
+DIST majesty_demo.run 36582366 SHA256 453b2bfa0a2473810945c717563cc459fc2b2cdd713155272872b1d8ef695de9 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79 WHIRLPOOL 952027eb333098c156dd5e314a7694d40e6f9e57d0d3e97ad6edc9e2d2bdca31518e9354e074e3e27cebd607ce1b134df567926fde68679a6af083784e1896fb
+EBUILD majesty-demo-1.0.0.ebuild 1370 SHA256 5272965f518a2472b1db3c77adb5d09aaac6cc7f7751ad5fc14bd95f35d2516a SHA512 84539cfd1dadbf0ecf23260b772646019a031aa52fed0f7e028ff8dfd7d2681b468a9c258bbb3a795188286b889cfaaaeed58ca2d59506f7ac2328196f347b5d WHIRLPOOL 2e1b1460217e0a34ed0b041aad66ebd1c3ad87481e85f0751344cf04219a6842ced2337bfa3fa5e999c27c58adfd6b073889abace84031365cb97d09dc4e33fa
+MISC ChangeLog 2233 SHA256 2526984807d738f888ed38c5019fd9746cf1cb7e44c381eb14c880536b542a52 SHA512 53bb77addc5e658e3e4ba70995e74654aefa96d611152de523f4a4c1ff3229acd64560d4705b4d9588df8c43ead4f31ed04f07f73e707c2639fac4b8b5f336a9 WHIRLPOOL c3d6251d84c5c1ffab3ab5d68a36f89ae28192325c959c4c8e1f509cbd2ad3afa1f1e2940e1af44eca1b68a77bd7b539e663a8ba4433e5602b74ae41d799fe34
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJUO/NCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1MYP/0Veutxv7HNqJQsWOjEn/GPt
-1E1tgkmlXbXoiy+TvZAnS/5mdGDZkE/rdJ+jMcUjOZbNaGF1auxzne/xRd2V/ER/
-8eA66m3JaTZI+yMouv1S6jyerghYLiByLhGFoOMCRRtr+w1EmKGf1i7BIPI9kKsY
-ZSyXC4BbEWQG/CqwnrORpf9HdpZwfEvrhrmJzRVPPjWvVQexYZs5BQydRD8x2J8d
-xPX8I7pwSi0qFPehzbxtzXNerFYysSsDOtk11fEEdmQaNlxKe3yhDqPmlLhSW65f
-FHMWm/ncDLA5WQxkk8EptEEvC0Hvb72ANgP1+HN2MCO+7I+9Z5XDOk8r/4+2Gdzm
-G467dmDjKUXxjPBlvLk4UupIeUrSQcbPZe5Kmo76jnpoXjruEpNrFCjN8uw+O2DD
-6CaTn7KbDQEx/Fid7dq88xhguSdVjl1cGQ6W97zbt1pRbs0+bHTtWhbnlssCOITT
-b9xCfV1T0YJKWm0cjieNXM0WAWu3aQ2PgQUnwD+l6A/JDFy25QTHvfWntVhj29t6
-U+vXCJCq06giH118MqSIv4Pri9zIzu1widgcZ5pFDYtPj5HAruogIkGG/kcUcpNK
-aIOR0bH0Wn8+aw5VJYl1Xjn6ocsA31KPJWUUZfhqSAMJewLTr8a5ls9QhK9X+0/K
-g7Lmw9F46P8OP5jhQ4E+
-=8A3s
------END PGP SIGNATURE-----
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
index ed89cd7a108d..5f09122f860a 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
@@ -1,29 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.16 2014/10/13 15:44:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.17 2015/03/27 02:33:01 mr_bones_ Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils unpacker games
 
 DESCRIPTION="Control your own kingdom in this simulation"
 HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=8&"
-SRC_URI="http://demos.linuxgamepublishing.com/majesty/majesty_demo.run"
+SRC_URI="http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run"
 
-LICENSE="all-rights-reserved"
+LICENSE="MAJESTY-DEMO"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
-RESTRICT="mirror bindist strip"
+RESTRICT="bindist strip"
 
 RDEPEND="sys-libs/glibc
 	|| (
-		ppc? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXau
-			x11-libs/libXdmcp
-		)
-		!ppc? (
+		(
 			x11-libs/libX11[abi_x86_32(-)]
 			x11-libs/libXext[abi_x86_32(-)]
 			x11-libs/libXau[abi_x86_32(-)]
@@ -47,15 +41,12 @@ src_install() {
 	exeinto "${dir}"
 	doins -r data quests
 	doins majesty.{bmp,xpm} majestysite.url
-	cp "${S}"/majesty.xpm "${S}"/majesty-demo.xpm
-	doicon majesty-demo.xpm
-	# I am only installing the static version for now
+	newicon majesty.xpm majesty-demo.xpm
+	# only installing the static version for now
 	if use x86 || use amd64; then
-		doexe bin/Linux/x86/glibc-2.1/maj_demo
-	elif use ppc; then
-		doexe bin/Linux/ppc/glibc-2.1/maj_demo
+		doexe bin/Linux/x86/maj_demo
 	fi
 	games_make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
 	prepgamesdirs
-	make_desktop_entry maj_demo "Majesty (Demo)" ${PN}
+	make_desktop_entry maj_demo "Majesty (Demo)"
 }