[gentoo-commits] repo/gentoo:master commit in: games-strategy/asc/, games-strategy/asc/files/, profiles/

[Marek Szuba]

commit:     6df684e77b96510d6c88484147dc81de895e16e6
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 21:09:01 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 21:09:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df684e7

games-strategy/asc: remove last-rited package

Bug: https://bugs.gentoo.org/635592
Bug: https://bugs.gentoo.org/752708
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 games-strategy/asc/Manifest                        |  4 --
 games-strategy/asc/asc-2.6.0.0-r2.ebuild           | 84 ----------------------
 .../asc/files/asc-2.6.0.0-freetype_pkgconfig.patch | 28 --------
 .../files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch  | 32 ---------
 games-strategy/asc/metadata.xml                    | 11 ---
 profiles/package.mask                              |  5 --
 6 files changed, 164 deletions(-)

diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
deleted file mode 100644
index 702debd6248..00000000000
--- a/games-strategy/asc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST asc-2.6.0.0.tar.bz2 42280527 BLAKE2B a2ab8777f36d64924bb12359226792ea6d76a07f306bfe2f7204f50de5c103d524fbb69eb88106c293312650619cf3683a25a6afa6176941e8efb72edca9424c SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540
-DIST frontiers.ogg 4691844 BLAKE2B 02909247293439b72ca2f94b515abd53ebf931ac4ffbcc7a4d7909cfdcc79cd1411c973f42760e6012197ead5ce2369895d52b8b4fea5107f62e852502f2428d SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af
-DIST machine_wars.ogg 3138308 BLAKE2B 7c1f4e2c652b70dc9e41f313a8428a22844d1f98717b3c59061d462cf6d4a8f30c2ea2f7d2032afd8b6c9d50513286c409d8d21fb78c59bd246bd4cce3255029 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8
-DIST time_to_strike.ogg 3830679 BLAKE2B ced7de55d8f52177ee5fac6a19a4f76df8b50f70f9d62e42b10d6868608ebf88fe5405e072ee7b1cbc2152f54f4ae66fe3e025c13faf9b57b09a6c117a2c3d13 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee

diff --git a/games-strategy/asc/asc-2.6.0.0-r2.ebuild b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
deleted file mode 100644
index 6f17949ef83..00000000000
--- a/games-strategy/asc/asc-2.6.0.0-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit autotools toolchain-funcs flag-o-matic wxwidgets
-
-DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
-HOMEPAGE="http://www.asc-hq.org/"
-SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
-	http://www.asc-hq.org/music/frontiers.ogg
-	http://www.asc-hq.org/music/time_to_strike.ogg
-	http://www.asc-hq.org/music/machine_wars.ogg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	dev-games/physfs
-	dev-lang/lua:0
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/libsigc++:1.2
-	media-libs/libpng:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-sound
-	media-libs/freetype
-	media-libs/xvid
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch
-	"${FILESDIR}/"/${P}-freetype_pkgconfig.patch #657998
-)
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.bz2
-	for f in ${A}
-	do
-		case ${f} in
-		*ogg)
-			cp "${DISTDIR}/${f}" "${S}/data/music" || die
-			;;
-		esac
-	done
-}
-
-src_prepare() {
-	default
-	# required for freetype_pkgconfig patch
-	eautoreconf
-}
-
-src_configure() {
-	need-wxwidgets unicode
-	# Added --disable-paraguitest for bugs 26402 and 4488
-	# Added --disable-paragui for bug 61154 since it's not really used much
-	# and the case is well documented at http://www.asc-hq.org/
-	if [[ $(gcc-major-version) -eq 4 ]] ; then
-		replace-flags -O3 -O2
-	fi
-	local myeconfargs=(
-		--disable-paraguitest
-		--disable-paragui
-		--datadir="/usr/share"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc -r doc/*
-}

diff --git a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index a07cd2f8627..00000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/657998
-
---- asc-2.6.0.0/configure.ac
-+++ asc-2.6.0.0/configure.ac
-@@ -401,22 +401,7 @@
-       FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
-       FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`"
-    else
--      AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
--      AC_CHECK_HEADER(ft2build.h,have_ft2build=yes)
--      if test "$have_ft2build" != "yes"; then
--         have_freetype="no"
--      elif test "$have_freetype" = "yes"; then
--         FREETYPE_LIBS="-lfreetype"
--         ft2inc="no"
--         AC_MSG_CHECKING(freetype2 include directory)
--         if test -d /usr/local/include/freetype2; then
--            ft2inc="/usr/local/include/freetype2"
--         elif test -d /usr/include/freetype2; then
--            ft2inc="/usr/include/freetype2"
--         fi
--         AC_MSG_RESULT($ft2inc)
--         FREETYPE_CFLAGS="-I$ft2inc"
--      fi
-+      PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=yes)
-    fi
- 
-    if test x$have_freetype = xno; then

diff --git a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
deleted file mode 100644
index e710b22f8c8..00000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Bug: https://bugs.gentoo.org/612934
-Upstream Bug: https://sourceforge.net/p/asc-hq/patches/2/
-
---- a/source/basestrm.cpp
-+++ b/source/basestrm.cpp
-@@ -1728,7 +1728,6 @@
-       }
-    } catch ( ... ) {
-       displayLogMessage( 9, ASCString("~tn_c_lzw_filestream : caught exception") );
--      throw;
-    }
- }
- 
---- a/source/simplestream.cpp
-+++ b/source/simplestream.cpp
-@@ -43,6 +43,7 @@
-  #endif
- #endif
- 
-+#include "util/messaginghub.h"
- 
- tnbufstream::tnbufstream (  )
- {
-@@ -270,7 +271,7 @@
- 
-    int res = fclose( fp );
-    if ( res != 0 ) 
--      throw  tfileerror ( getDeviceName() + " : " + strerror(errno));
-+      displayLogMessage( 9, ASCString( getDeviceName() + " : " + strerror(errno) ) );
-       
-    _mode = uninitialized;
- 

diff --git a/games-strategy/asc/metadata.xml b/games-strategy/asc/metadata.xml
deleted file mode 100644
index 33170f2a754..00000000000
--- a/games-strategy/asc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@g.o</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">asc-hq</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index fc77001eafc..415ef0457d9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -499,11 +499,6 @@ gnome-base/libbonobo
 gnome-base/libgnome-keyring
 gnome-base/orbit
 
-# Michał Górny <mgorny@g.o> (2020-10-23)
-# Fails to build.  Needs a dedicated maintainer and a version bump.
-# Removal in 30 days.  Bug #635592.
-games-strategy/asc
-
 # David Seifert <soap@g.o> (2020-10-21)
 # No releases in over 3 years, no more revdeps in tree
 # upstream mostly unresponsive to requests for proper