From ebb07c94f800907e02d2a6b92c1bc757b2f86f49 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 18 Mar 2024 12:50:07 +0000
Subject: gentoo auto-resync : 18:03:2024 - 12:50:07
---
games-roguelike/Manifest.gz | Bin 3059 -> 3062 bytes
games-roguelike/scourge/Manifest | 2 +-
games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 73 --------------------
games-roguelike/scourge/scourge-0.21.1-r2.ebuild | 82 +++++++++++++++++++++++
4 files changed, 83 insertions(+), 74 deletions(-)
delete mode 100644 games-roguelike/scourge/scourge-0.21.1-r1.ebuild
create mode 100644 games-roguelike/scourge/scourge-0.21.1-r2.ebuild
(limited to 'games-roguelike')
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index ed9a812edef3..815fcdd33c48 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest
index 7916a5185774..192ba2afb2f5 100644
--- a/games-roguelike/scourge/Manifest
+++ b/games-roguelike/scourge/Manifest
@@ -7,5 +7,5 @@ AUX scourge-0.21.1-gcc6.patch 601 BLAKE2B 78114f97ac4258cde239926c7012568f76b33c
AUX scourge-0.21.1-respect-AR.patch 207 BLAKE2B ed9e5f7476668cb1a6063be30cc76c1d9b4dc6574ae3171c5dc2e89e6f74db3fdd3c1a83e50056b9b784dec358ed98adf96ef7f05be1cfbd695b9532ece940a7 SHA512 2254db48095c2bc64319b253e002174849601d05cd8312d3fe1a0487b3234b30522ce6cede66db6499221ce8a934ea70967468fb60714c607dfdeb4f0d2125b2
DIST scourge-0.21.1.data.tar.gz 142093436 BLAKE2B 68e4cc0bfb40e9a92bc38b3db75f36df665974595ba4978cc34e077901522ece9ec5e15203ad9ab5044a61484d6850367306eb60a0da5d168a33e03130fe5774 SHA512 3701aba0f70d71aeb0e185e808e34cea62a637809a9b4c14fd19bdfbf91d36cf8dafa2a4cfddc3ee493827b40eea657fcdddc8277c57a635bc8ca8e3286376be
DIST scourge-0.21.1.src.tar.gz 8146157 BLAKE2B ed48b29a54df1b8c7444ac2985ad069f82568b1e7a5aa98e922fb4fcf10c48840c2c38361a4bf15044c71547cd41d06fdd270b379ae0827b9b5f8063b92c1d18 SHA512 e530a8f7bddc1969a02a8b9a8b272f6f60d2c4830d23d96fc671cb79a2c4097fb9c5c0c262004a8157448b601bf58f9bbff95dd6d98275a28d3d404c339ce2ad
-EBUILD scourge-0.21.1-r1.ebuild 1506 BLAKE2B 37cd9e79116b1ba21a326ccadfae68278a7a006c3678ab4be9c843d0cf8ca1647c0513d6302d567ee9641e4729b2eada8fe04f8d3ea11b5ac10e7ba75859f1bb SHA512 cf6bfa6112ef60ebb4138d0f51dd524a95f2d21b52f3246c561848862bf78b56f82c12c30d252bc1cfc947b66f47d1dd210c245f5596930825eaad9a00e1132d
+EBUILD scourge-0.21.1-r2.ebuild 1811 BLAKE2B 8a0e2b2a7f27e45163ae18a689f1730a7d190f0e20f55649045dbd433e3f4dd73ac7c2b570b5695d64b7a7ce5fdc736180056c1e1d3580a632d5441358fae388 SHA512 2cd3fb6b7f895b2a4b4d2644693f71332a7fbb1668b5314fdf68b22b7cb6afc94877def11be4d9aef9dcdbee98121eddfb1c4d4fc11dc30dd1e2da7d042387f1
MISC metadata.xml 331 BLAKE2B c53ca6d89dd1e388797a8a5a46c040100930bff17cf4f6b0c2ee96dd0596176b981e620c57b670fd408c589a4abc903df2e965628c4c12c624b5651804c619a8 SHA512 1a8105a9d406277a41322cab48b3e08be87f007bafc1fcc976654c910b1df3e47541fde5222225d119b068507ca5ad69ba3c1b3d5196f07720975144086f0fdb
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
deleted file mode 100644
index a0ae342f3b0e..000000000000
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="A graphical rogue-like adventure game"
-HOMEPAGE="https://sourceforge.net/projects/scourge/"
-SRC_URI="
- mirror://sourceforge/${PN}/${P}.src.tar.gz
- mirror://sourceforge/${PN}/${P}.data.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- media-libs/freetype:2
- media-libs/libsdl[joystick,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[vorbis]
- media-libs/sdl-net
- media-libs/sdl-ttf
- virtual/libintl
- virtual/opengl
- virtual/glu"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc47.patch
- "${FILESDIR}"/${P}-gcc6.patch
- "${FILESDIR}"/${P}-automake-1.13.patch
- "${FILESDIR}"/${P}-freetype_pkgconfig.patch
- "${FILESDIR}"/${P}-Wc++11-narrowing.patch
- "${FILESDIR}"/${PN}-0.21.1-respect-AR.patch
- "${FILESDIR}"/${P}-gcc-11.patch
-)
-
-src_prepare() {
- default
-
- # bug #257601
- sed -i \
- -e '/AC_CHECK_HEADERS.*glext/ s:):, [#include <GL/gl.h>] ):' \
- configure.in || die
- sed -i \
- -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
- src/scourgehandler.cpp || die
-
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-rpath \
- --with-data-dir="${EPREFIX}"/usr/share/${PN}
-}
-
-src_install() {
- default
-
- insinto /usr/share/scourge
- doins -r ../scourge_data/.
-
- doicon assets/scourge.png
- make_desktop_entry scourge S.C.O.U.R.G.E.
-}
diff --git a/games-roguelike/scourge/scourge-0.21.1-r2.ebuild b/games-roguelike/scourge/scourge-0.21.1-r2.ebuild
new file mode 100644
index 000000000000..9dc31e76a884
--- /dev/null
+++ b/games-roguelike/scourge/scourge-0.21.1-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic
+
+DESCRIPTION="A graphical rogue-like adventure game"
+HOMEPAGE="https://sourceforge.net/projects/scourge/"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.src.tar.gz
+ mirror://sourceforge/${PN}/${P}.data.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ media-libs/freetype:2
+ media-libs/libsdl[joystick,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-net
+ media-libs/sdl-ttf
+ virtual/libintl
+ virtual/opengl
+ virtual/glu"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch
+ "${FILESDIR}"/${P}-Wc++11-narrowing.patch
+ "${FILESDIR}"/${PN}-0.21.1-respect-AR.patch
+ "${FILESDIR}"/${P}-gcc-11.patch
+)
+
+src_prepare() {
+ default
+
+ # bug #257601
+ sed -i \
+ -e '/AC_CHECK_HEADERS.*glext/ s:):, [#include <GL/gl.h>] ):' \
+ configure.in || die
+ sed -i \
+ -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
+ src/scourgehandler.cpp || die
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ # -Werror=strict-aliasing
+ # https://bugs.gentoo.org/859211
+ # Upstream sourceforge last updated in 2015, and that appears to have
+ # been uploading existing files. svn last updated 2011. No bug filed. ;)
+ #
+ # Do not trust it for LTO either.
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ econf \
+ --disable-rpath \
+ --with-data-dir="${EPREFIX}"/usr/share/${PN}
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/scourge
+ doins -r ../scourge_data/.
+
+ doicon assets/scourge.png
+ make_desktop_entry scourge S.C.O.U.R.G.E.
+}
--
cgit v1.2.3