Update games-util/doomseeker, fix some paths while we're at it

3 files changed, 16 insertions, 74 deletions

diff --git a/games-util/doomseeker/doomseeker-0.10b.ebuild b/games-util/doomseeker/doomseeker-0.10b.ebuild
deleted file mode 100644
index 5922dff..0000000
--- a/games-util/doomseeker/doomseeker-0.10b.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-EAPI="5"
-inherit eutils games qt4-r2 cmake-utils
-
-DESCRIPTION="Cross-platform server browser for Doom"
-HOMEPAGE="http://doomseeker.drdteam.org/"
-SRC_URI="http://doomseeker.drdteam.org/files/${P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-RDEPEND="
-	dev-util/cmake
-	>=dev-qt/qtgui-4.7
-	sys-libs/zlib
-"
-
-S="${WORKDIR}/${P}_src"
-
-src_prepare() {
-	GAMES_LIBDIR=$(games_get_libdir)
-	epatch ${FILESDIR}/${PN}-fixpaths.patch
-	einfo "Fixing the library path... (${GAMES_LIBDIR})"
-	sed -ie "s:/usr/local/share/doomseeker/engines/:${GAMES_LIBDIR}:" src/core/main.cpp
-}
-src_install() {
-	cd "${CMAKE_BUILD_DIR}" || die cd failed
-
-	# Libraries.
-	dogameslib libwadseeker.so
-	dogameslib engines/libzandronum.so
-	if use extras; then
-		dogameslib engines/lib{chocolatedoom,odamex,vavoom}.so
-	fi
-
-	# Binary.
-	dogamesbin ${PN}
-
-	# Desktop entry.
-	newicon ${S}/media/icon_small.png ${PN}.png
-	make_desktop_entry ${PN} "Doomseeker"
-
-	prepgamesdirs
-}
diff --git a/games-util/doomseeker/doomseeker-0.12.2b.ebuild b/games-util/doomseeker/doomseeker-0.12.2b.ebuild
index e8bd1f0..aea550f 100644
--- a/games-util/doomseeker/doomseeker-0.12.2b.ebuild
+++ b/games-util/doomseeker/doomseeker-0.12.2b.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-inherit games cmake-utils
+inherit cmake-utils games
 
-DESCRIPTION="Cross-platform server browser for Doom"
+DESCRIPTION="Internet Doom server browser"
 HOMEPAGE="http://doomseeker.drdteam.org/"
 SRC_URI="http://doomseeker.drdteam.org/files/${P}_src.tar.bz2"
 
@@ -23,27 +23,27 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}_src"
 
+src_prepare() {
+	#libs go into libdir, not share
+	sed -i -e "s:DESTINATION share/:DESTINATION $(games_get_libdir)/:" src/plugins/PluginFooter.txt
+	sed -i -e "s:INSTALL_PREFIX \"/share/doomseeker/\":\"$(games_get_libdir)/doomseeker/\":" src/core/main.cpp
+
+	#fix some paths
+	sed -i -e "s:LIBRARY DESTINATION lib:LIBRARY DESTINATION $(games_get_libdir):" src/wadseeker/CMakeLists.txt
+	sed -i -e "s:/usr/share:${GAMES_PREFIX}/share:" src/core/datapaths.cpp
+	sed -i -e "s:Icon=/usr/local:Icon=${GAMES_PREFIX}:" media/Doomseeker.desktop
+}
+
 src_configure() {
-	local mycmakeargs+=(
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
 		$(cmake-utils_use_build fake-plugins FAKE_PLUGINS)
 		$(cmake-utils_use_build legacy-plugins LEGACY_PLUGINS)
 	)
-
 	cmake-utils_src_configure
 }
 
 src_install() {
-##	cmake-utils_src_install	#this install libs into /usr/share/
-
-	cd "${CMAKE_BUILD_DIR}" || die "cd failed"
-
-	dogameslib libwadseeker.so
-	dogameslib engines/lib*.so
-
-	dogamesbin ${PN}
-
-	newicon ${S}/media/icon.png ${PN}.png
-	make_desktop_entry ${PN} "Doomseeker" ${PN} "Game;"
-
+	cmake-utils_src_install
 	prepgamesdirs
 }
diff --git a/games-util/doomseeker/files/doomseeker-fixpaths.patch b/games-util/doomseeker/files/doomseeker-fixpaths.patch
deleted file mode 100644
index 816cc83..0000000
--- a/games-util/doomseeker/files/doomseeker-fixpaths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/core/main.cpp	2011-03-04 15:50:06.000000000 -0800
-+++ src/core/main.cpp	2011-03-29 21:53:52.412809448 -0700
-@@ -134,7 +134,9 @@
- 		return 0;
- 	}
- 
--	enginePlugins = new PluginLoader(MAKEID('E','N','G','N'), dataDirectories, "engines/");
-+	QStringList tmpDataDirs;
-+	tmpDataDirs << "/usr/local/share/doomseeker/engines/";
-+	enginePlugins = new PluginLoader(MAKEID('E','N','G','N'), tmpDataDirs, "");
- 
- 	if (bTestMode)
- 	{