[gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/

[Lars Wendler]

commit:     14775221f19895ef468fe17dbb4ccafa4e38b9ca
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 23:19:01 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 23:20:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14775221

games-rpg/manaplus: Bumped live ebuild to EAPI-6.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-rpg/manaplus/manaplus-9999.ebuild | 88 +++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 36 deletions(-)

diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
index a34b274..7440ab2 100644
--- a/games-rpg/manaplus/manaplus-9999.ebuild
+++ b/games-rpg/manaplus/manaplus-9999.ebuild
@@ -2,30 +2,29 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit autotools git-r3 games
+EAPI=6
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
 HOMEPAGE="http://manaplus.evolonline.org"
-EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
+else
+	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="mumble nls opengl pugixml test"
+IUSE="mumble nls opengl pugixml +sdl2 test"
 
 RDEPEND="
 	>=dev-games/physfs-1.0.0
 	media-fonts/dejavu
-	media-fonts/wqy-microhei
 	media-fonts/liberation-fonts
 	media-fonts/mplus-outline-fonts
+	media-fonts/wqy-microhei
 	media-libs/libpng:0=
-	media-libs/libsdl2[X,opengl?,video]
-	media-libs/sdl2-gfx
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net
-	media-libs/sdl2-ttf
 	net-misc/curl
 	sys-libs/zlib
 	x11-apps/xmessage
@@ -35,49 +34,66 @@ RDEPEND="
 	nls? ( virtual/libintl )
 	opengl? ( virtual/opengl )
 	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )"
+	!pugixml? ( dev-libs/libxml2 )
+	sdl2? (
+		media-libs/libsdl2[X,opengl?,video]
+		media-libs/sdl2-gfx
+		media-libs/sdl2-image[png]
+		media-libs/sdl2-mixer[vorbis]
+		media-libs/sdl2-net
+		media-libs/sdl2-ttf
+	)
+	!sdl2? (
+		media-libs/libsdl[X,opengl?,video]
+		media-libs/sdl-gfx
+		media-libs/sdl-image[png]
+		media-libs/sdl-mixer[vorbis]
+		media-libs/sdl-net
+		media-libs/sdl-ttf
+	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
 src_prepare() {
-	eautoreconf
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
 	CONFIG_SHELL=/bin/bash \
-	egamesconf \
-		--with-sdl2 \
-		--without-internalsdlgfx \
+	econf \
 		--localedir=/usr/share/locale \
-		--prefix="/usr" \
-		--bindir="${GAMES_BINDIR}" \
+		--without-internalsdlgfx \
 		$(use_with mumble) \
 		$(use_enable nls) \
 		$(use_with opengl) \
 		--enable-libxml=$(usex pugixml pugixml libxml) \
+		$(use_with sdl2) \
 		$(use_enable test unittests)
 }
 
 src_install() {
 	default
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
 
-	prepgamesdirs
+	local destpath="/usr/share/${PN}"
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
+	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
+}
+
+src_test() {
+	make check
 }