gentoo resync : 18.12.2020

8 files changed, 73 insertions, 275 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 9ae3f0500be3..ac8ecf1d2a7e 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index b3f30e3adc83..67bf27c610fb 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,9 +1,6 @@
-AUX tomenet-4.6.1a-makefile.patch 2699 BLAKE2B 480333d83f89c557bbec4bfdbfe0146b2607c8c50269fe365b304575fd92c3948ba00e6b87dfa42a446c92a0830d267b052719b20e0a789c2454a78ab1064de7 SHA512 89e72ec53f43770b3fea6e4d99838eed37c1f537238e7b6c7a16edadcf3755e7611256435702802809575f988238f5f529c4b962994d5d13b34f77b8520cb25d
-AUX tomenet-4.7.2-makefile.patch 2365 BLAKE2B 23d83d5b5bcd21b881d4fd6455087fb447d28ffbeac7bf1941e6bbd82189971a8626e5725290c6d1650f5ba6cc006056ed5a7d3546f2d4671e387ce81f7bd0c3 SHA512 b10f3de114eacbbbe95c00e09d1b76cacd2765ac975fa1fe5c661a4939755b36242ddc8cbf5ef012765e4a82a884eb2cb6062e9074c96b6898189c9467bfc2c4
+AUX tomenet-4.7.3-makefile.patch 1627 BLAKE2B c34cb479c05590f00517009232a5ef0aee2e747d71f03f15e4ab3256b334dff757d42b8d75b1f167e934b8f7a55f51d8a87610ad75cba7ccb3d1ec0b291f6ed2 SHA512 3baf4952f1a4dcd99cca33d024b5c3bdf1adf5a4e433dc0b90fbf3857b164ce56fb3e8f9bad3f216e9d8cfc07e1c358b55a7cf05769b88fe54275149f457dd78
 AUX tomenet-server-wrapper 105 BLAKE2B 3b23750806b3bb3a6b5fa9c99aca0f2dbbcce2852bcb80296fd97b36ffb6fa0896939636fce6938f0874ece0b30abe800d10479431eac2cf6d883332d2b432e9 SHA512 9f509cdcc694fe47eed4cfdcb14f0ab3ea7006c202e7f4d8798012e62b89f34cc26834131412e18d2f0edba4237b6c66f4743ff6b780e3080a52e9da992d8cc3
 AUX tomenet-wrapper 557 BLAKE2B 9b73f87c55815b49f6444e01c552ee1ba102e64b042f33bed89627c39602cf5646e287be99ffd88f26a281b64c4d023b20f2eaac8b924438709a2ac9ef4e1009 SHA512 9a913502af52c7988e8cb3b9c678e556e5f07d4bf99e7e3951f1be6192980da22b8091617d4c4daaac356cd72d7e175706f96ca62d6581ab916bc7a7034eb629
-DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f
-DIST tomenet-4.7.2.tar.bz2 3253873 BLAKE2B 4cba4827a64588c850691ae3b5c7ad0097a322ab1baca42492cbe42bc1e76615fb0084b7b8608e20adf303bded42a9cb80c4d09d0a29f1f68699ffa8e04240bb SHA512 284aa71374b726fd86bfa6b0d820301ec7e5004ddb140a1567c54c883c138cabd2ac55085c222aa057b234dc822f717489128b857ed527fff7d702092bdb51d5
-EBUILD tomenet-4.6.1a.ebuild 2143 BLAKE2B 5d8d8090b9ee296683e037a2d84d4d0a0fbc02173fb7450bffa6495e041c268e88dba9bd6835d5de171b892f66924e71d712782b79ba5e109befab2760c23065 SHA512 6534f48ea79938264a95c05062ae10d29757b27b83241f73e2e23c6d3e83eda610c3f079c70f981a341335ac2aa2140c8e4e8d4ce3b9afeb20cf307927955c72
-EBUILD tomenet-4.7.2.ebuild 2057 BLAKE2B cdf3f6cf24757597e41a1ef5f1a2942f021ef02c8e037abdf2c31a105bc3b1e2644d54d1902142d068d73ed6676100147102571d7fc71dc9486efd41be84a410 SHA512 daf2663128b972e6e9eb74afcc03074e903fb7b11485dab4c6eb063141eef0eb3d6768f8966d8affcf668c2b960d81762444d7aa505c8e86713a40e12bb98656
-MISC metadata.xml 795 BLAKE2B 61b39e7ecb9d7bee7c9488ba16b75354b92b99fcd6157f8b249406557fb93b7bdb9d476c264b4aec5501bfe73987667e94b21db81d0a6aefea0fac7b76a4d418 SHA512 4e7b25ba67a044e76013a5d2c88979d5f082872e785576b37647face2e0cff9056d138df0cd16db23b5b79328156d110d7adf667ba2481c089569fb02b18a0f1
+DIST tomenet-4.7.3.tar.bz2 3355774 BLAKE2B e574434d283525793ad7b7e2c23103692c540be8727a90623b9fd52aba47d245be99cb39846046f4ba78795e168c8ef9342ff9ee16417dce3698036cbd6c50eb SHA512 25c7dedcd63306ada738078c412a45483ee6ac4c6fe116624a409cb4c9795270942cac2428c1ecafac45bbc9e3044890e308f8bd1bb1344dd156a610948addcd
+EBUILD tomenet-4.7.3.ebuild 2029 BLAKE2B 34739cfb541be230d99ab0c6417fad696a5691d01f13dbf0e2b996899f83f52ca5a95f3fe36466a05a272966b0528b3293b5bd6247a17a2824ba3de6ce9a365b SHA512 41ff9227b02ecf00054247f00b7a65e901c11905a9a67cdbb1d6162dfb77666183825119bc1986c7b8cd712a5d0481e4fd32bc860cc31c45d4143da6e15615b4
+MISC metadata.xml 831 BLAKE2B aea21f1ced6d7849fe8d4d8e7e44cf5034d9ad2db91f26b5ab47bbe9de83c20a6f380898ff1399701358ad839bcfefae6250c4c5e718e9eb0dc1fdfc816b5525 SHA512 99e687841cc0a3082e6101542f04cdbd48d608aa328d66aae39220a739f2278e6687107ed89ac4ecfcbde0aba52be6cefe82d3b743c536788c12f3eb724891e8
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 c78a55cebd94..000000000000
--- 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 1b89c2bc987d..000000000000
--- 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/files/tomenet-4.7.3-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch
new file mode 100644
index 000000000000..c00fc5f1e699
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch
@@ -0,0 +1,43 @@
+diff --git a/makefile b/makefile
+index ee56a33..7f3c81f 100644
+--- a/makefile
++++ b/makefile
+@@ -224,7 +224,7 @@ CPP = cpp
+ #thing is, that the correctly transcribed URL will actually make tolua choke.
+ #So, -nostdinc will prevent the whole own comment blob of cpp to get generated
+ #in the first place, as we never asked for it:
+-CPPFLAGS = -C -P -nostdinc
++CPPFLAGS = -C -P -nostdinc $(GENTOO_CPPFLAGS)
+ 
+ # gcc variant:
+ #CPP = gcc
+--- a/makefile
++++ b/makefile
+@@ -234,5 +234,19 @@ CC = gcc
+ 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 += -DUSE_X11
++LIBS += -lX11
++endif
++
++CFLAGS += -Wall
++CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
++LIBS += $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
+ 
+ ##
+ ## Standard version -- supports X11 (main-x11.c)
+@@ -259,7 +274,5 @@ 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 -fPIE
+-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 -fPIE -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
+ ACCEDIT_LIBS = -lcurses -lcrypt
+ ##
+ ## Without SDL
diff --git a/games-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
index 9d9cd998599c..b80155092934 100644
--- a/games-roguelike/tomenet/metadata.xml
+++ b/games-roguelike/tomenet/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="server">Compile server support</flag>
+		<flag name="client">Compile client</flag>
+		<flag name="server">Compile server</flag>
 	</use>
 	<longdescription lang="en">
 		TomeNET is a multiplayer fantasy dungeon exploration game based on
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 ec80992655ca..000000000000
--- 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.3.ebuild
index 5da772d9c22c..7c9991bde4d9 100644
--- a/games-roguelike/tomenet/tomenet-4.7.2.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils toolchain-funcs
+EAPI=7
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
 HOMEPAGE="https://www.tomenet.eu"
@@ -11,10 +11,11 @@ SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
 LICENSE="Moria"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
+IUSE="+client server +sound X"
+REQUIRED_USE="|| ( client server )"
 
 RDEPEND="sys-libs/ncurses:0
-	!dedicated? (
+	client? (
 		X? (
 			x11-libs/libX11
 		)
@@ -24,8 +25,8 @@ RDEPEND="sys-libs/ncurses:0
 		)
 	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
+	client? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${P}/src
 
@@ -35,15 +36,17 @@ PATCHES=(
 
 src_prepare() {
 	default
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
+	if ! use server; then
+		rm -r ../lib/{config,data,save} || die
+	fi
 
 	sed \
-		-e "s#@LIBDIR@#/usr/share/${PN}#" \
+		-e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
 		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
 
-	if use server || use dedicated ; then
+	if use server; then
 		sed \
-			-e "s#@LIBDIR@#/usr/share/${PN}#" \
+			-e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
 			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
 	fi
 
@@ -51,10 +54,13 @@ src_prepare() {
 }
 
 src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")"
+	local mytargets="$(usex client "tomenet" "") $(usex server "accedit tomenet.server" "")"
 	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
+		$(usex client "$(usex X "USE_X=1" "")" "") \
+		$(usex client "$(usex sound "USE_SDL=1" "")" "") \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP)" \
+		GENTOO_CPPFLAGS="${CPPFLAGS}" \
 		-f makefile \
 		${mytargets[@]}
 }
@@ -62,7 +68,7 @@ src_compile() {
 src_install() {
 	dodoc ../TomeNET-Guide.txt
 
-	if ! use dedicated ; then
+	if use client ; then
 		newbin ${PN} ${PN}.bin
 		dobin "${T}"/${PN}
 
@@ -70,7 +76,7 @@ src_install() {
 		make_desktop_entry ${PN} ${PN} ${PN}4
 	fi
 
-	if use server || use dedicated ; then
+	if use server ; then
 		newbin tomenet.server tomenet.server.bin
 		dobin "${T}"/${PN}.server accedit
 	fi
@@ -80,20 +86,12 @@ src_install() {
 	doins ../.tomenetrc
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 
 	if use sound; then
 		elog "You can get soundpacks from here:"
-		elog '  https://tomenet.net/downloads.php'
+		elog '  https://tomenet.eu/downloads.php'
 		elog "They must be placed inside ~/.tomenet directory."
 	fi
 }
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}