summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhaarp <main.haarp@gmail.com>2017-12-04 19:19:06 +0100
committerhaarp <main.haarp@gmail.com>2017-12-04 19:43:15 +0100
commit8a989643fa450e0d20442e1ae112e903c27f5fb1 (patch)
tree3aca69622572200589d1f925563a06577e230eff
parentgzdoom 3.2.3 (diff)
downloadhaarp-8a989643fa450e0d20442e1ae112e903c27f5fb1.tar.gz
haarp-8a989643fa450e0d20442e1ae112e903c27f5fb1.tar.bz2
haarp-8a989643fa450e0d20442e1ae112e903c27f5fb1.zip
doomseeker: fix multilib, desktop file fix not necessary anymore, fix portage's cmake-utils_src_prepare complaints
-rw-r--r--games-util/doomseeker/Manifest2
-rw-r--r--games-util/doomseeker/doomseeker-1.1.ebuild12
2 files changed, 6 insertions, 8 deletions
diff --git a/games-util/doomseeker/Manifest b/games-util/doomseeker/Manifest
index 6854138..3cc2a9a 100644
--- a/games-util/doomseeker/Manifest
+++ b/games-util/doomseeker/Manifest
@@ -1,5 +1,5 @@
DIST doomseeker-1.0_src.tar.bz2 8415394 SHA256 7c352f8180e0aaf22ce87c9e8d1c0b1bd3d93786002a652e242603715e5f5e9c SHA512 638e1226b181a6d96cc576f834316f420788a22d0a9a116fca8c34f42b9be9ea0f50550ea7464b195a7a605498413287b50a4c1877d09406a1e958300360f614 WHIRLPOOL dc2138cd9f6de6379d6f4b152f6bf5424d1283307160079d0b367f662ceb31b61446495e835458a97bfe47680298928e20be8fa0c2d2bbad6405f0c0a09627ff
DIST doomseeker-1.1_src.tar.bz2 8647902 SHA256 f0641080b45900a02133c29fb15ba7934c7b3be8aee619ffb3607c419046b85a SHA512 3e82131ecdc6adc312c30a6bfbdbc182494d3eaa8d0535d46d4ac97090a3924cc512ef7fb76178e879284513876db0ee77d68db9c3ea340c1e22ead241ebb16e WHIRLPOOL be8ae1b200a9631ca93b46f68abbb5c75653630fb14ff11af0936dc37f424095d24a84f97b5d837c7ffb38706433d6e7ce127431c79f4803bea5031b86791af9
EBUILD doomseeker-1.0-r1.ebuild 1078 SHA256 712925709fd4d8f87464d8c978ef54e2052de64de0a7aca4ca3c04cdfbbdabc3 SHA512 b9a82e095679c6f3cdfa643a17d9e4ad7db20f09f604c594aa7333c6deee841b9d28b24d3eabaff85cc658266320791cbef2cfffb5b3a5138ec7092f469e12a4 WHIRLPOOL 3d6f440d092832ceb48b056ea78afd711b05c491be63232d923b5fca6b7bebae68ef812c94bf5bca19fbca85ae2cefcbf84c717b6017b5ca3281dcacb3da5518
-EBUILD doomseeker-1.1.ebuild 1145 SHA256 86dbc6a8bf5fb4fd84f36dd1217920a8ae95828180c388a91d78ea90ac515b15 SHA512 e9aad47bbfeb6c808620ff288428b48da9dfe6e9a1b2f8ead500d9a20497be11c8ece4529ae9e9cbfb64ec0dab3f6bc70e3c8079f5c4086aca0f5d66dc71e61c WHIRLPOOL e4ce427fc7841c844d9cce3aaf35c185e775981faa3a28f38080fb3b0088efa751da748a4cb75a83b4abbf48407f3705221a9217b15701a7aee16cbfd36be939
+EBUILD doomseeker-1.1.ebuild 1148 SHA256 4e570658541448aae95f7790dd0993a06c459b2fbd411d10f3cf4014b3e222ee SHA512 ec5aea871adbaf938089da95747ae5197c1ec77d1236bfcdb190c5661514d662c99436600fddb2dfe2b3797555059aa419fa2e92c87b9587843c947c5cf0a2de WHIRLPOOL 4a48472b9f49e8acfd65ee748dfab9c1f29b756f841785cabec830b24ff1899ea5ffa09d4c93cbf7980fab2a3897b2682e63f9846443959881665d8b2d0b16d9
MISC metadata.xml 328 SHA256 50ba527532ebdbdf36d595f7535be7b3a5fc3014d53a3ffa0808112194e76888 SHA512 9e5e4896feda252dfa228974d8adb7529bdba0ded46632b8cfe91448c289660839a4f52deb0d111e31ef47e21813c98c0721d3356a74cdcfa86ff7ce6e403ab9 WHIRLPOOL 04fc88e6a5abe9ba663e97db2be23143e7aeee82a41a90e3d941588bd10cd20fd0751d134596e44f81a6c5d3f0b3bb1b3494f66e0967171bec53137dcc67df2c
diff --git a/games-util/doomseeker/doomseeker-1.1.ebuild b/games-util/doomseeker/doomseeker-1.1.ebuild
index 7339269..7f3dea6 100644
--- a/games-util/doomseeker/doomseeker-1.1.ebuild
+++ b/games-util/doomseeker/doomseeker-1.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils
+inherit cmake-utils multilib
DESCRIPTION="Internet Doom server browser"
HOMEPAGE="http://doomseeker.drdteam.org/"
@@ -25,13 +25,11 @@ S="${WORKDIR}/${P}_src"
src_prepare() {
# libs go into libdir, not share
# FIXME: plugin-specific translations also end up in libdir
- sed -i -e 's:DESTINATION share/:DESTINATION lib/:' src/plugins/PluginFooter.txt
- sed -i -e 's:INSTALL_PREFIX "/share/doomseeker/":INSTALL_PREFIX "/lib/doomseeker/":' src/core/main.cpp
+ sed -i -e "s:DESTINATION share/:DESTINATION $(get_libdir)/:" src/plugins/PluginFooter.txt
+ sed -i -e "s:INSTALL_PREFIX \"/share/doomseeker/\":INSTALL_PREFIX \"/$(get_libdir)/doomseeker/\":" src/core/main.cpp
+ sed -i -e "s:DESTINATION lib:DESTINATION $(get_libdir):" src/wadseeker/CMakeLists.txt
- # fix desktop file
- sed -i -e 's:Icon=/usr/local:Icon=/usr:' -e 's:Categories=Game:Categories=Game;:' media/Doomseeker.desktop
-
- eapply_user
+ cmake-utils_src_prepare
}
src_configure() {