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 7AFF21382C5 for ; Sun, 25 Apr 2021 19:13:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4E3CE08E0; Sun, 25 Apr 2021 19:13:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD7EBE08E0 for ; Sun, 25 Apr 2021 19:13: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 CAC053416A9 for ; Sun, 25 Apr 2021 19:13:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9D6372E for ; Sun, 25 Apr 2021 19:13:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1619378012.689665a811a72189bcb6ea55363097db738c9810.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/berusky/, games-arcade/berusky/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/berusky/berusky-1.7.1-r1.ebuild games-arcade/berusky/berusky-1.7.1-r2.ebuild games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch X-VCS-Directories: games-arcade/berusky/ games-arcade/berusky/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 689665a811a72189bcb6ea55363097db738c9810 X-VCS-Branch: master Date: Sun, 25 Apr 2021 19:13:47 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 04beda53-886d-454d-b62b-6a9441b0ce7a X-Archives-Hash: 87055a2621747aef0f2a9f34b356ff3d commit: 689665a811a72189bcb6ea55363097db738c9810 Author: Sam James gentoo org> AuthorDate: Sun Apr 25 19:12:37 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 25 19:13:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689665a8 games-arcade/berusky: install data files again This was lost a few years ago in the games.eclass porting. Only now did somebody notice! Closes: https://bugs.gentoo.org/785259 Signed-off-by: Sam James gentoo.org> ...sky-1.7.1-r1.ebuild => berusky-1.7.1-r2.ebuild} | 31 ++++++++++---- .../berusky/files/berusky-1.7.1-r2-gentoo.patch | 47 ++++++++++++++++++++++ 2 files changed, 71 insertions(+), 7 deletions(-) diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r2.ebuild similarity index 62% rename from games-arcade/berusky/berusky-1.7.1-r1.ebuild rename to games-arcade/berusky/berusky-1.7.1-r2.ebuild index 57077ecfc39..66d347e826c 100644 --- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild +++ b/games-arcade/berusky/berusky-1.7.1-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit desktop gnome2 DATAFILE="${PN}-data-1.7" @@ -14,20 +15,36 @@ SRC_URI="https://www.anakreon.cz/download/${P}.tar.gz LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.1-r1-gentoo.patch +) + +src_prepare() { + mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . || die + + default +} src_install() { gnome2_src_install - rm -rf "${ED}"/usr/doc + + rm -rf "${ED}"/usr/doc || die + + insinto /usr/share/${PN} + doins -r GameData Graphics Levels + + insinto /var/lib/${PN} + doins berusky.ini + doicon -s 32 "${DISTDIR}"/${PN}.png make_desktop_entry ${PN} } diff --git a/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch new file mode 100644 index 00000000000..6fd1381ad2a --- /dev/null +++ b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch @@ -0,0 +1,47 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,8 +5,7 @@ + + SUBDIRS = po src data + +-beruskydocdir = ${prefix}/doc/berusky +-beruskydoc_DATA = \ ++EXTRA_DIST = \ + README\ + COPYING\ + AUTHORS\ +@@ -15,10 +14,6 @@ + NEWS\ + TODO + +-EXTRA_DIST = $(beruskydoc_DATA) +- +- +- + # Copy all the spec files. Of cource, only one is actually used. + dist-hook: + for specfile in *.spec; do \ +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -3,10 +3,3 @@ + ## Created by Anjuta - will be overwritten + ## If you don't want it to overwrite it, + ## Please disable it in the Anjuta project configuration +- +-berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@ +- +-berusky_data_DATA = \ +- berusky.ini +- +-EXTRA_DIST = $(berusky_data_DATA) +--- a/src/defines.h ++++ b/src/defines.h +@@ -446,7 +446,7 @@ + #define INI_USER_DIRECTORY "~/.berusky" + #define INI_USER_LEVELS "~/.berusky/User" + #define INI_USER_PROFILES "~/.berusky/Profiles" +-#define INI_FILE_GLOBAL "/var/games/berusky/"INI_FILE_NAME ++#define INI_FILE_GLOBAL "/var/lib/berusky/"INI_FILE_NAME + #define INI_FILE_USER "~/.berusky/"INI_FILE_NAME + #define INI_FILE_LOCAL "./"INI_FILE_NAME + #elif WINDOWS