Update build system a bit and update ebuild.

4 files changed, 69 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffbd4b9..9422473 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@
 # -DCMAKE_DATA_PATH=/other/bla/	# install path for data
 # -DCMAKE_CONF_PATH=/etc	# install path for conf
 # -DLIB_INSTALL_DIR=/other/bla	# install path for lib
-# -DCMAKE_DOC_PATH=/other/bla	# install path for doc
+# -DCMAKE_DOC_PATH=/other/bla/doc/tuxanci-version/	# install path for doc
 # -DCMAKE_LOCALE_PATH=/other/bla	# install path for locale
 # -DCMAKE_FONT=/bla/font.ttf	# install path for locale
 ###############################################################################
@@ -25,7 +25,6 @@ SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src )
 # data because some distributions want different data placement
 SET ( CMAKE_CONF_PATH "/etc" CACHE PATH "Config path prefix" )
 SET ( CMAKE_INSTALL_PREFIX "/usr/local/" CACHE PATH "Install path prefix" )
-SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc" CACHE PATH "Data path prefix" )
 SET ( CMAKE_LOCALE_PATH "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE PATH "Locale path prefix" )
 SET ( CMAKE_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/" CACHE PATH "Data path prefix" )
 SET ( CMAKE_LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib/" CACHE PATH "Library path prefix" )
@@ -58,6 +57,7 @@ SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
 #various variables
 SET ( CMAKE_FONT "${CMAKE_DATA_PATH}/${APPNAME}/font/DejaVuSans.ttf" CACHE PATH "Font" )
 SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} )
+SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/${APPNAME}" CACHE PATH "Doc path prefix" )
 SET ( CMAKE_INSTALL_BINDIR bin )
 SET ( CMAKE_INSTALL_LOCALEDIR ${CMAKE_LOCALE_PATH} )
 SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} )
@@ -188,9 +188,9 @@ ADD_SUBDIRECTORY ( src )
 # path which user send us
 ADD_SUBDIRECTORY ( data )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/ )
 ###############################################################################
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index aece086..a7a9572 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -15,6 +15,6 @@ ADD_SUBDIRECTORY ( sound )
 CONFIGURE_FILE ( ${CMAKE_SOURCE_DIR}/data/tuxanci.desktop.in ${CMAKE_SOURCE_DIR}/data/tuxanci.desktop )
 IF ( NOT Server )
 	INSTALL ( FILES tuxanci.svg
-		DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
+		DESTINATION ${CMAKE_INSTALL_DOCDIR}/ )
 ENDIF ( NOT Server )
 ###############################################################################
diff --git a/packaging/gentoo/tuxanci-0.21.0.ebuild b/packaging/gentoo/tuxanci-0.21.0.ebuild
new file mode 100644
index 0000000..09ab6d4
--- /dev/null
+++ b/packaging/gentoo/tuxanci-0.21.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxanci/tuxanci-0.21.0.ebuild,v 1.2 2008/10/27 08:56:52 scarabeus Exp $
+
+EAPI="1"
+
+inherit cmake-utils games
+
+DESCRIPTION="Tuxanci is first cushion shooter inspired by game Bulanci."
+HOMEPAGE="http://www.tuxanci.org/"
+SRC_URI="http://download.${PN}.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dedicated nls"
+# alsa is used only when building client
+
+RDEPEND="!dedicated? (
+			>=media-libs/libsdl-1.2.10
+			>=media-libs/sdl-ttf-2.0.7
+			>=media-libs/sdl-image-1.2.6-r1
+			alsa? (
+				>=media-libs/sdl-mixer-1.2.7
+			)
+		)
+	dev-libs/zziplib"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.6.0
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local mycmakeargs
+	use alsa || mycmakeargs="${mycmakeargs} -DNO_Audio=1"
+	use debug && mycmakeargs="${mycmakeargs} -DDebug=1"
+	use dedicated && mycmakeargs="${mycmakeargs} -DServer=1"
+	use nls && mycmakeargs="${mycmakeargs} -DNLS=1"
+	# This cant be quoted due to cmake nature.
+	# Read as: quote it and it wont compile.
+	mycmakeargs="${mycmakeargs} -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+		-DCMAKE_DATA_PATH=${GAMES_DATADIR}
+		-DCMAKE_LOCALE_PATH=${GAMES_DATADIR_BASE}/locale/
+		-DCMAKE_DOC_PATH=${GAMES_DATADIR_BASE}/doc/
+		-DCMAKE_ETC_PATH=${GAMES_SYSCONFDIR} -DLIB_INSTALL_DIR=$(games_get_libdir)"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	local MY_PN
+	use dedicated && MY_PN=${PN}-server || MY_PN=${PN}
+
+	cmake-utils_src_install
+	dosym "${GAMES_BINDIR}"/${MY_PN}-${PV} "${GAMES_BINDIR}"/${MY_PN}
+	doicon data/${PN}.svg
+	# we compile our desktop file
+	domenu data/${PN}.desktop
+	prepgamesdirs
+}
diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild
index 720a1cc..d4bcbbe 100644
--- a/packaging/gentoo/tuxanci-9999.ebuild
+++ b/packaging/gentoo/tuxanci-9999.ebuild
@@ -9,7 +9,7 @@ inherit games cmake-utils git
 DESCRIPTION="Tuxanci is first cushion shooter inspired by game Bulanci."
 HOMEPAGE="http://www.tuxanci.org/"
 EGIT_REPO_URI="git://repo.or.cz/tuxanci.git"
-#SRC_URI="http://download.${PN}.org/${PV}/${P}-src.tar.bz2"
+#SRC_URI="http://download.${PN}.org/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dedicated nls"
 # alsa is used only when building client
 
-DEPEND="!dedicated? (
+RDEPEND="!dedicated? (
 			>=media-libs/libsdl-1.2.10[X]
 			>=media-libs/sdl-ttf-2.0.7[X]
 			>=media-libs/sdl-image-1.2.6-r1[png]
@@ -25,8 +25,8 @@ DEPEND="!dedicated? (
 				>=media-libs/sdl-mixer-1.2.7[vorbis]
 			)
 		)
-	dev-libs/zziplib[sdl]
-	>=dev-util/cmake-2.6.0
+	dev-libs/zziplib[sdl]"
+DEPEND=">=dev-util/cmake-2.6.0
 	nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}"/"${PN}"
@@ -40,7 +40,7 @@ src_configure() {
 	mycmakeargs="${mycmakeargs} -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
 		-DCMAKE_DATA_PATH=${GAMES_DATADIR}
 		-DCMAKE_LOCALE_PATH=${GAMES_DATADIR_BASE}/locale/
-		-DCMAKE_DOC_PATH=${GAMES_DATADIR_BASE}/doc/
+		-DCMAKE_DOC_PATH=${GAMES_DATADIR_BASE}/doc/${PF}
 		-DCMAKE_ETC_PATH=${GAMES_SYSCONFDIR} -DLIB_INSTALL_DIR=$(games_get_libdir)"
 	cmake-utils_src_configure
 }