commit: e6b93de157396777462d424d31e500fe5c351a6c
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Jun 15 19:16:56 2014 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sun Jun 15 19:16:56 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=e6b93de1
[games-engines/openxcom] rename category, cleanup.
---
.../files/openxcom-0.9_data-install-dir.patch | 74 ----------------------
games-strategy/openxcom/metadata.xml | 15 -----
games-strategy/openxcom/openxcom-0.9.ebuild | 59 -----------------
games-strategy/openxcom/openxcom-1.0.0.ebuild | 57 -----------------
.../openxcom/openxcom-1.0_pre20140614.ebuild | 64 -------------------
profiles/updates/3Q-2014 | 1 +
6 files changed, 1 insertion(+), 269 deletions(-)
diff --git a/games-strategy/openxcom/files/openxcom-0.9_data-install-dir.patch
b/games-strategy/openxcom/files/openxcom-0.9_data-install-dir.patch
deleted file mode 100644
index 8e4d16a..0000000
--- a/games-strategy/openxcom/files/openxcom-0.9_data-install-dir.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed68a96..0422b09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,7 @@ option ( ENABLE_WARNING "Always show warnings (even for
release builds)" OFF )
- option ( FATAL_WARNING "Treat warnings as errors" OFF )
- set ( MSVC_WARNING_LEVEL 3 CACHE STRING "Visual Studio warning levels" )
- option ( FORCE_INSTALL_DATA_TO_BIN "Force installation of data to binary
directory" OFF )
-+set ( DATADIR "" CACHE STRING "Where to place datafiles" )
-
- if ( WIN32 )
- set ( default_deps_dir "${CMAKE_SOURCE_DIR}/deps" )
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 81247c6..3099f7e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -591,7 +591,12 @@ set ( install_dest RUNTIME )
- set ( set_exec_path ON )
- set ( install_dest_dir bin )
- if ( UNIX AND NOT APPLE )
-- set ( data_install_dir ${CMAKE_INSTALL_PREFIX}/share/openxcom )
-+ if ( DEFINED DATADIR )
-+ set ( data_install_dir ${DATADIR} )
-+ add_definitions( -DDATADIR="${data_install_dir}/" )
-+ else()
-+ set ( data_install_dir "share/openxcom" )
-+ endif()
- endif ()
- if ( APPLE )
- set ( openxcom_src ${openxcom_src} ${MACOS_SDLMAIN_M_PATH} )
-@@ -603,7 +608,12 @@ if ( APPLE )
- set ( install_dest_dir "" )
- set ( data_install_dir bin )
- else ()
-- set ( data_install_dir ${CMAKE_INSTALL_PREFIX}/share/openxcom )
-+ if ( DEFINED DATADIR )
-+ set ( data_install_dir ${DATADIR} )
-+ add_definitions( -DDATADIR="${data_install_dir}/" )
-+ else()
-+ set ( data_install_dir "share/openxcom" )
-+ endif()
- endif ()
- endif ()
- if ( set_exec_path )
-diff --git a/src/Engine/CrossPlatform.cpp b/src/Engine/CrossPlatform.cpp
-index 9ac27ba..6571938 100644
---- a/src/Engine/CrossPlatform.cpp
-+++ b/src/Engine/CrossPlatform.cpp
-@@ -153,16 +153,18 @@ std::vector<std::string> findDataFolders()
- dir = strtok(0, ":");
- }
- }
-- else
-- {
- #ifdef __APPLE__
-- snprintf(path, MAXPATHLEN, "%s/Users/Shared/OpenXcom/data/",
home);
-- list.push_back(path);
-+ snprintf(path, MAXPATHLEN, "%s/Users/Shared/OpenXcom/data/", home);
-+ list.push_back(path);
- #else
-- list.push_back("/usr/local/share/openxcom/data/");
-- list.push_back("/usr/share/openxcom/data/");
-+ list.push_back("/usr/local/share/openxcom/data/");
-+ list.push_back("/usr/share/openxcom/data/");
-+#ifdef DATADIR
-+ snprintf(path, MAXPATHLEN, "%s/data/", DATADIR);
-+ list.push_back(path);
-+#endif
-+
- #endif
-- }
-
- // Get working directory
- list.push_back("./data/");
diff --git a/games-strategy/openxcom/metadata.xml
b/games-strategy/openxcom/metadata.xml
deleted file mode 100644
index 0bbbca9..0000000
--- a/games-strategy/openxcom/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer>
-<email>azamat.hacki...@gmail.com</email>
-<name>Azamat H. Hackimov</name>
-</maintainer>
-<longdescription lang="en">
-An open-source reimplementation of the popular UFO: Enemy Unknown.
-</longdescription>
-<longdescription lang="ru">
-Открытая реализация популярной тактической стратегии 1994 года UFO: Enemy
Unknown.
-</longdescription>
-</pkgmetadata>
-
diff --git a/games-strategy/openxcom/openxcom-0.9.ebuild
b/games-strategy/openxcom/openxcom-0.9.ebuild
deleted file mode 100644
index 1de5d80..0000000
--- a/games-strategy/openxcom/openxcom-0.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils games
-
-DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
-HOMEPAGE="http://openxcom.org/";
-SRC_URI="https://github.com/SupSuper/OpenXcom/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="~dev-cpp/yaml-cpp-0.3.0
- media-libs/libsdl:0
- media-libs/sdl-gfx
- media-libs/sdl-image:0
- media-libs/sdl-mixer
- media-sound/timidity++"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/OpenXcom-${PV}"
-
-DOCS=( README.txt )
-src_prepare() {
- epatch "${FILESDIR}/${P}_data-install-dir.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
- "-DDATADIR=${GAMES_DATADIR}/${PN}"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- use doc && cmake-utils_src_compile doxygen
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dohtml -r "${CMAKE_BUILD_DIR}"/docs/html/*
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES,
SOUND,"
- elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM
game to"
- elog "${GAMES_DATADIR}/${PN}/data"
-}
diff --git a/games-strategy/openxcom/openxcom-1.0.0.ebuild
b/games-strategy/openxcom/openxcom-1.0.0.ebuild
deleted file mode 100644
index 709a530..0000000
--- a/games-strategy/openxcom/openxcom-1.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils games
-
-DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
-HOMEPAGE="http://openxcom.org/";
-SRC_URI="http://openxcom.org/wp-content/uploads/downloads/2014/06/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="app-arch/unzip
- >=dev-cpp/yaml-cpp-0.5.1
- media-libs/libsdl
- media-libs/sdl-gfx
- media-libs/sdl-image
- media-libs/sdl-mixer
- media-sound/timidity++"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-DOCS=( README.txt )
-
-src_configure() {
- mycmakeargs=(
- "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
- "-DDATADIR=${GAMES_DATADIR}/${PN}"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- use doc && cmake-utils_src_compile doxygen
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dohtml -r "${CMAKE_BUILD_DIR}"/docs/html/*
- doicon res/linux/icons/openxcom.svg
- domenu res/linux/openxcom.desktop
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES,
SOUND,"
- elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM
game to"
- elog "${GAMES_DATADIR}/${PN}/data"
-}
diff --git a/games-strategy/openxcom/openxcom-1.0_pre20140614.ebuild
b/games-strategy/openxcom/openxcom-1.0_pre20140614.ebuild
deleted file mode 100644
index f9df84f..0000000
--- a/games-strategy/openxcom/openxcom-1.0_pre20140614.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils games git-2
-
-DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
-HOMEPAGE="http://openxcom.org/";
-# For translation files
-SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2014_06_13_1923.zip";
-EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git";
-EGIT_COMMIT=71c8b2a2779ebd76f621e404d472d39fc4da022a
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="app-arch/unzip
- >=dev-cpp/yaml-cpp-0.5.1
- media-libs/libsdl
- media-libs/sdl-gfx
- media-libs/sdl-image
- media-libs/sdl-mixer
- media-sound/timidity++"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/OpenXcom"
-
-DOCS=( README.txt )
-
-src_configure() {
- mycmakeargs=(
- "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
- "-DDATADIR=${GAMES_DATADIR}/${PN}"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- use doc && cmake-utils_src_compile doxygen
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dohtml -r "${CMAKE_BUILD_DIR}"/docs/html/*
- insinto "${GAMES_DATADIR}/${PN}/data/"
- doins -r "../openxcom/data/Language/"
- doicon res/linux/icons/openxcom.svg
- domenu res/linux/openxcom.desktop
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES,
SOUND,"
- elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM
game to"
- elog "${GAMES_DATADIR}/${PN}/data"
-}
diff --git a/profiles/updates/3Q-2014 b/profiles/updates/3Q-2014
new file mode 100644
index 0000000..aa5ba4e
--- /dev/null
+++ b/profiles/updates/3Q-2014
@@ -0,0 +1 @@
+move games-strategy/openxcom games-engines/openxcom
