public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/
Date: Tue, 15 Dec 2020 15:38:50 +0000 (UTC)	[thread overview]
Message-ID: <1608046705.d1a1094a20def82b39fe3378415bbb707418c741.soap@gentoo> (raw)

commit:     d1a1094a20def82b39fe3378415bbb707418c741
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Tue Dec 15 15:38:25 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 15:38:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a1094a

games-roguelike/tomenet: drop old

Closes: https://bugs.gentoo.org/669928
Closes: https://github.com/gentoo/gentoo/pull/18522
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-roguelike/tomenet/Manifest                   |  2 -
 .../tomenet/files/tomenet-4.6.1a-makefile.patch    | 77 -----------------
 .../tomenet/files/tomenet-4.7.2-makefile.patch     | 65 --------------
 games-roguelike/tomenet/tomenet-4.6.1a.ebuild      | 99 ----------------------
 games-roguelike/tomenet/tomenet-4.7.2.ebuild       | 99 ----------------------
 5 files changed, 342 deletions(-)

diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index 28db3470d88..04197fd30cc 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,3 +1 @@
-DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f
-DIST tomenet-4.7.2.tar.bz2 3253873 BLAKE2B 4cba4827a64588c850691ae3b5c7ad0097a322ab1baca42492cbe42bc1e76615fb0084b7b8608e20adf303bded42a9cb80c4d09d0a29f1f68699ffa8e04240bb SHA512 284aa71374b726fd86bfa6b0d820301ec7e5004ddb140a1567c54c883c138cabd2ac55085c222aa057b234dc822f717489128b857ed527fff7d702092bdb51d5
 DIST tomenet-4.7.3.tar.bz2 3355774 BLAKE2B e574434d283525793ad7b7e2c23103692c540be8727a90623b9fd52aba47d245be99cb39846046f4ba78795e168c8ef9342ff9ee16417dce3698036cbd6c50eb SHA512 25c7dedcd63306ada738078c412a45483ee6ac4c6fe116624a409cb4c9795270942cac2428c1ecafac45bbc9e3044890e308f8bd1bb1344dd156a610948addcd

diff --git a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
deleted file mode 100644
index c78a55cebd9..00000000000
--- a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -ru tomenet-4.6.1a.orig/src/makefile tomenet-4.6.1a/src/makefile
---- tomenet-4.6.1a.orig/src/makefile	2015-12-31 07:05:21.000000000 -0500
-+++ tomenet-4.6.1a/src/makefile	2016-02-10 01:42:12.958344532 -0500
-@@ -203,7 +203,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
- 
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -237,6 +247,11 @@
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags`
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer
- ##
-+
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
-+
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm
-@@ -256,8 +271,8 @@
- # attempt to "guess" at many of these flags based on your system.
- #
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
-+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
- ##
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-@@ -357,10 +372,6 @@
- # Compile a client with 'test client' version/tag
- tomenet.test: CFLAGS += -DTEST_CLIENT -O0
- 
--# Normal release build
--tomenet: CFLAGS += -O2
--
--
- # Lua
- SRCS += $(LUASRCS)
- SRCS += $(CLI_LUASRCS)

diff --git a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
deleted file mode 100644
index 1b89c2bc987..00000000000
--- a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/makefile b/makefile
-index ee56a33..7f3c81f 100644
---- a/makefile
-+++ b/makefile
-@@ -203,7 +203,7 @@ CLI_LUAOBJS = \
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@ CC = gcc
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
- 
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -236,6 +246,11 @@ X11BASE = /usr/X11R6
- ## With SDL
- #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags`
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
-+
- ##
- ## Without SDL
- #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-@@ -259,7 +274,7 @@ X11BASE = /usr/X11R6
- #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC
- CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC -Wno-format-truncation
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
- ACCEDIT_LIBS = -lcurses -lcrypt
- ##
- ## Without SDL

diff --git a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
deleted file mode 100644
index ec80992655c..00000000000
--- a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="https://www.tomenet.eu"
-SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-RDEPEND="sys-libs/ncurses:0
-	!dedicated? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
-	sed \
-		-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server || use dedicated ; then
-		sed \
-			-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if ! use dedicated ; then
-		newgamesbin ${PN} ${PN}.bin
-		dogamesbin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		newgamesbin tomenet.server tomenet.server.bin
-		dogamesbin "${T}"/${PN}.server accedit
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  http://tomenet.net/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.2.ebuild
deleted file mode 100644
index 5da772d9c22..00000000000
--- a/games-roguelike/tomenet/tomenet-4.7.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="https://www.tomenet.eu"
-SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-RDEPEND="sys-libs/ncurses:0
-	!dedicated? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-makefile.patch
-)
-
-src_prepare() {
-	default
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
-	sed \
-		-e "s#@LIBDIR@#/usr/share/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server || use dedicated ; then
-		sed \
-			-e "s#@LIBDIR@#/usr/share/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if ! use dedicated ; then
-		newbin ${PN} ${PN}.bin
-		dobin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		newbin tomenet.server tomenet.server.bin
-		dobin "${T}"/${PN}.server accedit
-	fi
-
-	insinto "/usr/share/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  https://tomenet.net/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


             reply	other threads:[~2020-12-15 15:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-15 15:38 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-02-10  3:18 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/ Aaron Bauman
2019-02-10  3:18 Aaron Bauman
2015-12-02  6:47 Michael Sterrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1608046705.d1a1094a20def82b39fe3378415bbb707418c741.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox