From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E695139694 for ; Fri, 2 Jun 2017 14:38:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE0FDE0D1C; Fri, 2 Jun 2017 14:38:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6DAFE0D1C for ; Fri, 2 Jun 2017 14:38:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1C0E341773 for ; Fri, 2 Jun 2017 14:38:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 763E47470 for ; Fri, 2 Jun 2017 14:38:48 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1496414137.ae8839815d5e2d1954b4ad0e0ce25d4f0bb4da0e.mva@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/files/, games-arcade/mars-game/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-arcade/mars-game/files/mars-game-9999-glib.patch games-arcade/mars-game/mars-game-0.7.5.ebuild games-arcade/mars-game/mars-game-9999.ebuild X-VCS-Directories: games-arcade/mars-game/files/ games-arcade/mars-game/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: ae8839815d5e2d1954b4ad0e0ce25d4f0bb4da0e X-VCS-Branch: master Date: Fri, 2 Jun 2017 14:38:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 685e0201-3ee5-4857-a5ee-5375b0eeaa96 X-Archives-Hash: 045ab9ded239d2b477e2152a946a4f1c commit: ae8839815d5e2d1954b4ad0e0ce25d4f0bb4da0e Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Fri Jun 2 14:35:37 2017 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Fri Jun 2 14:35:37 2017 +0000 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ae883981 mars-game: fixes .../mars-game/files/mars-game-9999-glib.patch | 4 ++-- games-arcade/mars-game/mars-game-0.7.5.ebuild | 28 ++++++++++++++-------- games-arcade/mars-game/mars-game-9999.ebuild | 21 +++++++++------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/games-arcade/mars-game/files/mars-game-9999-glib.patch b/games-arcade/mars-game/files/mars-game-9999-glib.patch index e112dd5..7c3b28d 100644 --- a/games-arcade/mars-game/files/mars-game-9999-glib.patch +++ b/games-arcade/mars-game/files/mars-game-9999-glib.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt-O 2012-07-13 11:49:06.000000000 +0200 -+++ CMakeLists.txt 2012-07-13 11:59:31.590809749 +0200 +--- a/CMakeLists.txt 2012-07-13 11:49:06.000000000 +0200 ++++ b/CMakeLists.txt 2012-07-13 11:59:31.590809749 +0200 @@ -48,6 +48,9 @@ # Fribidi library needed for bi-directional texts find_library(FRIBIDI_LIBRARY fribidi) diff --git a/games-arcade/mars-game/mars-game-0.7.5.ebuild b/games-arcade/mars-game/mars-game-0.7.5.ebuild index fe2bb24..8384fee 100644 --- a/games-arcade/mars-game/mars-game-0.7.5.ebuild +++ b/games-arcade/mars-game/mars-game-0.7.5.ebuild @@ -1,29 +1,37 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/mars-game/mars-game-9999.ebuild,v 1.2 2011/09/09 07:52:53 frostwork Exp $ -EAPI=4 +EAPI=6 -inherit cmake-utils eutils +# No tagged release tarball after github dropped "download" +EGIT_COMMIT="c855d044094a1d92317e38935d81ba938946132e" + +inherit cmake-utils eutils vcs-snapshot DESCRIPTION="M.A.R.S. a ridiculous shooter" HOMEPAGE="http://mars-games.sourceforge.net" -SRC_URI="https://github.com/downloads/thelaui/M.A.R.S./mars_source_${PV}.tar.gz" +SRC_URI="https://github.com/thelaui/M.A.R.S./archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug" -DEPEND="dev-libs/fribidi - >=media-libs/libsfml-2.0_rc20120731 +DEPEND=" + dev-libs/fribidi + media-libs/libsfml media-libs/taglib - virtual/opengl" + virtual/opengl +" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}" +#S="${WORKDIR}/${PN}" + +PATCHES=( + "${FILESDIR}/${PN}-9999-glib.patch" +) src_prepare() { - epatch "${FILESDIR}"/${PN}-9999-glib.patch sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt + default } diff --git a/games-arcade/mars-game/mars-game-9999.ebuild b/games-arcade/mars-game/mars-game-9999.ebuild index 902d9f0..8120e15 100644 --- a/games-arcade/mars-game/mars-game-9999.ebuild +++ b/games-arcade/mars-game/mars-game-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/mars-game/mars-game-9999.ebuild,v 1.2 2011/09/09 07:52:53 frostwork Exp $ -EAPI=4 +EAPI=6 -inherit cmake-utils eutils git-2 +inherit cmake-utils eutils git-r3 DESCRIPTION="M.A.R.S. a ridiculous shooter" HOMEPAGE="http://mars-game.sourceforge.net" @@ -15,13 +14,19 @@ SLOT="0" KEYWORDS="" IUSE="debug" -DEPEND="dev-libs/fribidi - >=media-libs/libsfml-2.0_rc20120731 +DEPEND=" + dev-libs/fribidi + media-libs/libsfml media-libs/taglib - virtual/opengl" + virtual/opengl +" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}"-glib.patch +) + src_prepare(){ - epatch "${FILESDIR}"/${P}-glib.patch sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt + default }