commit: 54ec28c7293877bfa9780e2e6a4645d67b9724f9 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Oct 1 20:32:19 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Oct 1 20:33:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54ec28c7
games-strategy/liquidwar6: Remove Closes: https://bugs.gentoo.org/654654 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> games-strategy/liquidwar6/Manifest | 2 - .../files/liquidwar6-0.4.3681-check-headers.patch | 70 ------------- .../files/liquidwar6-0.4.3681-ldconfig.patch | 16 --- .../files/liquidwar6-0.4.3681-paths.patch | 27 ----- .../liquidwar6/liquidwar6-0.4.3681-r1.ebuild | 112 --------------------- games-strategy/liquidwar6/metadata.xml | 28 ------ profiles/package.mask | 5 - 7 files changed, 260 deletions(-) diff --git a/games-strategy/liquidwar6/Manifest b/games-strategy/liquidwar6/Manifest deleted file mode 100644 index 73731cde7c9..00000000000 --- a/games-strategy/liquidwar6/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST liquidwar6-0.4.3681.tar.gz 26531646 BLAKE2B c6043931f634dd9769c822b18d243fd32cf0457e6974ec3fee5a8098f4864a7de09d343fd729b2cd9b8c966f92279d972636bb82bc40065f1635b4f5d41ce36f SHA512 4154c8d3c2ceb128cf2d27a4682c89a30d3610f695b2e05f8d4e33c13fb54aaab3bb4a2b5c6dbcc43ff5d24991ea57a521716c94e15d8dd05dc384c22a37f52a -DIST liquidwar6-extra-maps-0.4.3681.tar.gz 16191302 BLAKE2B 178d9ca86b0ede86d2dec61b92033ea86c01b18d1bbded79d7ffa1643e6fa6e4665a989bc6295923aed55f4e663090e907852581be23c86c9f5220bdc3ca557d SHA512 e767adc4402f803824145fd12f79eb2cbf9b34aea12065123a558dfb6704bd7ab1861b453e794f7a612d4fa75d0f6024ef410b2700eea08a279d6857b9dc2ba7 diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch deleted file mode 100644 index 34dd76b48ea..00000000000 --- a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Julian Ospald <hasuf...@gentoo.org> -Date: Wed Jun 4 16:01:18 UTC 2014 -Subject: fix header checks - - our multilib wrapped headers are broken shit - ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ - AC_SUBST(LW6_VERSION_MINOR) - - dnl Headers, some are optional --AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) -+AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) - - dnl GNULIB stuff, http://www.gnu.org/software/gnulib/ - gl_00GNULIB -@@ -477,40 +477,42 @@ - fi - SDL_EXTRA="${SDL_EXTRA_CFLAGS} ${SDL_EXTRA_LIBS}" - -+CFLAGS="$CFLAGS $SDL_EXTRA_CFLAGS" -+ - AC_CHECK_HEADER(SDL/SDL.h, HAVE_SDL_H=1, AC_MSG_WARN([ - *** Liquid War 6 needs SDL (http://www.libsdl.org/) --]),[${SDL_EXTRA}]) -+]),[]) - AC_CHECK_LIB(SDL, SDL_Init, HAVE_LIBSDL=1, AC_MSG_WARN([ - *** Liquid War 6 needs SDL (http://www.libsdl.org/) --]),[${SDL_EXTRA}]) -+]),[]) - - AC_CHECK_HEADER(GL/gl.h, HAVE_GL_GL_H=1,AC_MSG_WARN([ - *** Liquid War 6 needs Mesa (http://www.mesa3d.org/) --]),[${SDL_EXTRA}]) -+]),[]) - AC_CHECK_LIB(GL, glBegin, HAVE_LIBGL=1, AC_MSG_WARN([ - *** Liquid War 6 needs Mesa (http://www.mesa3d.org/) --]),[${SDL_EXTRA}]) -+]),[]) - - AC_CHECK_HEADER(GL/glu.h, HAVE_GL_GLU_H=1,AC_MSG_WARN([ - *** Liquid War 6 needs GLU (http://www.mesa3d.org/) --]),[${SDL_EXTRA}]) -+]),[]) - AC_CHECK_LIB(GLU, gluBeginCurve, HAVE_LIBGLU=1, AC_MSG_WARN([ - *** Liquid War 6 needs GLU (http://www.mesa3d.org/) --]),[${SDL_EXTRA}]) -+]),[]) - - AC_CHECK_HEADER(SDL/SDL_image.h, HAVE_SDL_IMAGE_H=1, AC_MSG_WARN([ - *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/) --]),[${SDL_EXTRA}]) -+]),[]) - AC_CHECK_LIB(SDL_image, IMG_Load, HAVE_LIBSDL_IMAGE=1, AC_MSG_WARN([ - *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/) --]),[${SDL_EXTRA}]) -+]),[]) - - AC_CHECK_HEADER(SDL/SDL_ttf.h, HAVE_SDL_TTF_H=1, AC_MSG_WARN([ - *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/) --]),[${SDL_EXTRA}]) -+]),[]) - AC_CHECK_LIB(SDL_ttf, TTF_Init, HAVE_LIBSDL_TTF=1, AC_MSG_WARN([ - *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/) --]),[${SDL_EXTRA}]) -+]),[]) - - AC_ARG_ENABLE([mod-gl1], AS_HELP_STRING([--enable-mod-gl1],[compile mod-gl1 default=yes]), [enable_mod_gl1=$enableval], [enable_mod_gl1=yes]) - diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch deleted file mode 100644 index dd5e702b614..00000000000 --- a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch +++ /dev/null @@ -1,16 +0,0 @@ -commit 1bd3596545912f2e47b8848df3fb5d99195d299a -Author: hasufell <hasuf...@gentoo.org> -Date: Wed Jan 8 17:21:09 2014 +0100 - - don't run ldconfig - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -65,7 +65,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u - SUBDIRS = lib - - install-exec-local: -- if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root - if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@LW6_VERSION_BASE@; ln -s @PACKAGE_TARNAME@-@LW6_VERSION_BASE@ $(DESTDIR)$(bindir)/liquidwar6; fi - - uninstall-local: diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch deleted file mode 100644 index 3ac69032471..00000000000 --- a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit b121fe3d9fb7e5fc52f592482e02b6a28430435f -Author: hasufell <hasuf...@gentoo.org> -Date: Wed Jan 8 17:23:56 2014 +0100 - - respect datarootdir - ---- a/data/icon/Makefile.am -+++ b/data/icon/Makefile.am -@@ -19,6 +19,6 @@ - # Contact author : uf...@ufoot.org - - pkgdata_DATA = liquidwar6.png liquidwar6.xpm --pkgdatadir = $(datadir)/pixmaps -+pkgdatadir = $(datarootdir)/pixmaps - EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns - ---- a/pkg/Makefile.am -+++ b/pkg/Makefile.am -@@ -19,7 +19,7 @@ - # Contact author : uf...@ufoot.org - - pkgdata_DATA = liquidwar6.desktop --pkgdatadir = $(datadir)/applications -+pkgdatadir = $(datarootdir)/applications - EXTRA_DIST = $(pkgdata_DATA) liquidwar6.spec liquidwar6d 406FFCAB.gnupg.txt FD409E94.gnupg.txt - - distclean-local: diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild deleted file mode 100644 index cd8f2f0621e..00000000000 --- a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils toolchain-funcs games - -MY_PV=${PV/_beta/beta} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Unique multiplayer wargame between liquids" -HOMEPAGE="https://www.gnu.org/software/liquidwar6/"; -SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz - maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test" - -# yes, cunit is rdep -RDEPEND="dev-db/sqlite:3 - dev-libs/expat - dev-scheme/guile:12 - dev-util/cunit - media-libs/freetype:2 - media-libs/libpng:0 - media-libs/libsdl[X,opengl,video] - media-libs/sdl-image[jpeg,png] - media-libs/sdl-ttf - net-misc/curl - dev-libs/libltdl:0 - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/opengl - libcaca? ( media-libs/libcaca ) - gles2? ( media-libs/mesa[gles2] ) - gtk? ( x11-libs/gtk+:2 ) - nls? ( virtual/libintl - virtual/libiconv ) - ogg? ( - media-libs/libsdl[X,sound,opengl,video] - media-libs/sdl-mixer[vorbis] - ) - readline? ( sys-libs/ncurses:0 - sys-libs/readline:0 )" -DEPEND="${RDEPEND} - dev-lang/perl - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_P} -S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV} - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi - games_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-{ldconfig,paths}.patch \ - "${FILESDIR}"/${P}-check-headers.patch - - sed -i \ - -e 's/-Werror//' \ - configure.ac || die - eautoreconf -} - -src_configure() { - # configure fails with cunit disabled - egamesconf \ - $(use_enable nls) \ - --enable-cunit \ - $(use_enable gtk) \ - --enable-mod-gl1 \ - $(use_enable gles2 mod-gles2) \ - $(use_enable libcaca mod-caca) \ - $(use_enable openmp) \ - $(use_enable ogg mod-ogg) \ - $(use_enable !ogg silent) \ - $(use_enable readline console) \ - --disable-static \ - --datarootdir=/usr/share \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html - - if use maps; then - cd "${S_MAPS}" || die - egamesconf - fi -} - -src_compile() { - default - use doc && emake html - use maps && emake -C "${S_MAPS}" -} - -src_install() { - emake DESTDIR="${D}" install - use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install - prune_libtool_files --all - prepgamesdirs -} diff --git a/games-strategy/liquidwar6/metadata.xml b/games-strategy/liquidwar6/metadata.xml deleted file mode 100644 index 5f504d57eb1..00000000000 --- a/games-strategy/liquidwar6/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>ga...@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <use> - <flag name="doc">Convert the info pages to html</flag> - <flag name="gles2">Enable OpenGL ES 2.0 support</flag> - <flag name="gtk">Used to display error/critical messages</flag> - <flag name="maps">Install extra maps</flag> - <flag name="ogg">Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg> (currently the only sound provider)</flag> - <flag name="readline">Enable interactive script shell for hacking</flag> - </use> - <longdescription lang="en"> - FEATURES: - * Fast-paced tactical action. Control the movement of all your forces at the same time - * Simple yet original game mechanics, discovered by Thomas Colcombet - * 10 different teams, each with their own charactaristics and special attacks - * 13 levels, each one twisting the gameplay in a new direction - * 100+ more levels if you download the bonus pack - * Levels can be created using simple image files - * Lots of level design options: walls, edge wraparound, bridges, different speed, special areas such as glue or danger and varied army size and fighter behavior - * Internationalization support, interface translated in French, Norwegian and Russian - * Free Software, part of the GNU project (licence: GNU GPL v3+) - </longdescription> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 99e8e93950c..5f69512ea25 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1120,11 +1120,6 @@ dev-scheme/guile-lib sci-chemistry/burrow-owl sci-libs/starparse -# Matt Turner <matts...@gentoo.org> (2019-09-01) -# Unmaintained, unpackaged versions from 2015. Incompatible with guile-2.2. -# Removal in 30 days. # Bug #654654. -games-strategy/liquidwar6 - # Matt Turner <matts...@gentoo.org> (2019-09-01) # TeXmacs is the only remaining package in tree that requires guile-1.8, which # is unsupported upstream. A TeXmacs port to Guile-2 has been in progress for a
