EAPI=5; switch to LGP version of demo

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 18 insertions, 23 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/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)"
 }