From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9A4F4138A1A for ; Fri, 9 Jan 2015 21:14:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 294D0E07DB; Fri, 9 Jan 2015 21:14:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B65E6E07DB for ; Fri, 9 Jan 2015 21:14:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D088D34070C for ; Fri, 9 Jan 2015 21:14:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D948F3A0 for ; Fri, 9 Jan 2015 21:14:52 +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: <1420838085.0c2f2cb0aaa00291241a63f7b37e0ca7637322dc.mva@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-arcade/dustforce/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-arcade/dustforce/dustforce-1.0.20120917.ebuild games-arcade/dustforce/dustforce-1.0.20141222.ebuild X-VCS-Directories: games-arcade/dustforce/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: 0c2f2cb0aaa00291241a63f7b37e0ca7637322dc X-VCS-Branch: master Date: Fri, 9 Jan 2015 21:14:52 +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: 2a7eda1c-4ed5-4c57-be2b-85fc1d891564 X-Archives-Hash: 9f122ee5fe75fd86e1833938261307fe commit: 0c2f2cb0aaa00291241a63f7b37e0ca7637322dc Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Fri Jan 9 21:14:45 2015 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Fri Jan 9 21:14:45 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0c2f2cb0 [games-arcade/dustforce] Bumped + rewritten Signed-off-by: Vadim A. Misbakh-Soloviov mva.name> --- ...120917.ebuild => dustforce-1.0.20141222.ebuild} | 42 ++++++++++------------ 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/games-arcade/dustforce/dustforce-1.0.20120917.ebuild b/games-arcade/dustforce/dustforce-1.0.20141222.ebuild similarity index 62% rename from games-arcade/dustforce/dustforce-1.0.20120917.ebuild rename to games-arcade/dustforce/dustforce-1.0.20141222.ebuild index dfcf65b..b113588 100644 --- a/games-arcade/dustforce/dustforce-1.0.20120917.ebuild +++ b/games-arcade/dustforce/dustforce-1.0.20141222.ebuild @@ -2,15 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" inherit games multilib unpacker-nixstaller -TIMESTAMP="1347954459" +TIMESTAMP="2014-12-22" DESCRIPTION="An acrobatic janitor 2d platformer" HOMEPAGE="http://dustforce.com" -SRC_URI="dustforce-linux-${TIMESTAMP}.sh" +SRC_URI="Dustforce-Linux-${TIMESTAMP}.sh" RESTRICT="fetch" @@ -20,7 +20,8 @@ KEYWORDS="-* ~amd64 ~x86" IUSE="" DEPEND="" -RDEPEND="virtual/opengl +RDEPEND=" + virtual/opengl app-arch/bzip2 dev-libs/expat media-libs/fontconfig @@ -37,7 +38,8 @@ RDEPEND="virtual/opengl x11-libs/libXdmcp x11-libs/libXext x11-libs/libXrender - x11-libs/libxcb" + x11-libs/libxcb +" S="${WORKDIR}" MY_PN=Dustforce @@ -49,37 +51,31 @@ pkg_nofetch() { } src_unpack() { - local arch; - use x86 && arch="x86"; - use amd64 && arch="x86_64"; - nixstaller_unpack \ - "instarchive_all" \ - "instarchive_linux_${arch}" \ - "subarch" \ - "deps/cURL/cURL_files_linux_${arch}" - # FIXME: We need last two lines only due to broken dependency. - # May be it will be good to report it to upstream? + unzip -q "${DISTDIR}/${A}" } src_install() { local dir="${GAMES_PREFIX_OPT}/${PN}" + local exe arch; + insinto "${dir}" - doins -r content + doins -r "data/noarch/content" exeinto "${dir}" - local exe - use x86 && exe="${MY_PN}.bin.x86" - use amd64 && exe="${MY_PN}.bin.x86_64" + use x86 && arch="x86" + use amd64 && arch="x86_64" - doexe "${exe}" + exe="${MY_PN}.bin.${arch}" + doexe "data/${arch}/${exe}" # Broken dep insinto "${dir}/$(get_libdir)" - doins "$(get_libdir)/libcurl.so.3" - doicon "${MY_PN}.png" + doins -r "data/${arch}/$(get_libdir)"/* +#/libcurl.so.3" + doicon "data/noarch/${MY_PN}.png" make_desktop_entry "${PN}" "${MY_PN}" "${MY_PN}" games_make_wrapper "${PN}" "./${exe}" "${dir}" "${dir}/$(get_libdir)" - dodoc README.linux + dodoc data/noarch/README.linux prepgamesdirs }