[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: b64ccd53adcd139fee15c5c24f230a8244fa2a30 Author: Azamat H. Hackimov gmail com> AuthorDate: Fri Jun 13 18:46:22 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Fri Jun 13 18:46:22 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b64ccd53 [games-strategy/openxcom] Version bump Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- ...penxcom-1.0_pre20140528.ebuild => openxcom-1.0_pre20140614.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-strategy/openxcom/openxcom-1.0_pre20140528.ebuild b/games-strategy/openxcom/openxcom-1.0_pre20140614.ebuild similarity index 95% rename from games-strategy/openxcom/openxcom-1.0_pre20140528.ebuild rename to games-strategy/openxcom/openxcom-1.0_pre20140614.ebuild index 5c77b23..f9df84f 100644 --- a/games-strategy/openxcom/openxcom-1.0_pre20140528.ebuild +++ b/games-strategy/openxcom/openxcom-1.0_pre20140614.ebuild @@ -9,9 +9,9 @@ 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_05_28_0101.zip"; +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=467fd76aa47721097dc6e5539f555cd02228e190 +EGIT_COMMIT=71c8b2a2779ebd76f621e404d472d39fc4da022a LICENSE="GPL-3" SLOT="0"
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: 0d1d4b7832a673827cb49cf1baf90e335af9f4e2 Author: Azamat H. Hackimov gmail com> AuthorDate: Sat Jun 14 07:10:41 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Sat Jun 14 07:10:41 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0d1d4b78 [games-strategy/openxcom] 1.0 is here, watch out! Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- games-strategy/openxcom/openxcom-1.0.0.ebuild | 57 +++ 1 file changed, 57 insertions(+) diff --git a/games-strategy/openxcom/openxcom-1.0.0.ebuild b/games-strategy/openxcom/openxcom-1.0.0.ebuild new file mode 100644 index 000..709a530 --- /dev/null +++ b/games-strategy/openxcom/openxcom-1.0.0.ebuild @@ -0,0 +1,57 @@ +# 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" +}
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: eec91623d667d463a7b7bb9859639d273f8a6f7e Author: Azamat H. Hackimov gmail com> AuthorDate: Wed May 28 17:57:22 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Wed May 28 17:57:22 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=eec91623 [games-strategy/openxcom] First 1.0 pre version. Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- ...{openxcom-0.9_p20140514.ebuild => openxcom-1.0_pre20140528.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-strategy/openxcom/openxcom-0.9_p20140514.ebuild b/games-strategy/openxcom/openxcom-1.0_pre20140528.ebuild similarity index 95% rename from games-strategy/openxcom/openxcom-0.9_p20140514.ebuild rename to games-strategy/openxcom/openxcom-1.0_pre20140528.ebuild index 7c359fe..5c77b23 100644 --- a/games-strategy/openxcom/openxcom-0.9_p20140514.ebuild +++ b/games-strategy/openxcom/openxcom-1.0_pre20140528.ebuild @@ -9,9 +9,9 @@ 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_05_12_0530.zip"; +SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2014_05_28_0101.zip"; EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=225f19ab6a9313905cd21ab937b2fd00f5c5c77a +EGIT_COMMIT=467fd76aa47721097dc6e5539f555cd02228e190 LICENSE="GPL-3" SLOT="0"
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: 37fb6867dec809c7b9e1fda748f4aaefcc48c43d Author: Azamat H. Hackimov gmail com> AuthorDate: Mon May 12 16:28:29 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Mon May 12 16:28:29 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=37fb6867 [games-strategy/openxcom] Version bump Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- .../{openxcom-0.9_p20140427.ebuild => openxcom-0.9_p20140512.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-strategy/openxcom/openxcom-0.9_p20140427.ebuild b/games-strategy/openxcom/openxcom-0.9_p20140512.ebuild similarity index 95% rename from games-strategy/openxcom/openxcom-0.9_p20140427.ebuild rename to games-strategy/openxcom/openxcom-0.9_p20140512.ebuild index 493050c..7c359fe 100644 --- a/games-strategy/openxcom/openxcom-0.9_p20140427.ebuild +++ b/games-strategy/openxcom/openxcom-0.9_p20140512.ebuild @@ -9,9 +9,9 @@ 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_04_27_0630.zip"; +SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2014_05_12_0530.zip"; EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=1daa72dbeefeb9ea24ad0b9032f7b64b3a048d60 +EGIT_COMMIT=225f19ab6a9313905cd21ab937b2fd00f5c5c77a LICENSE="GPL-3" SLOT="0"
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: 5fdb5903518e6d1f88680e578efa5b275d46b0ff Author: Azamat H. Hackimov gmail com> AuthorDate: Sun Apr 27 10:06:39 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Sun Apr 27 10:11:18 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=5fdb5903 [games-strategy/openxcom] Version bump --- .../{openxcom-0.9_p20140411.ebuild => openxcom-0.9_p20140427.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-strategy/openxcom/openxcom-0.9_p20140411.ebuild b/games-strategy/openxcom/openxcom-0.9_p20140427.ebuild similarity index 95% rename from games-strategy/openxcom/openxcom-0.9_p20140411.ebuild rename to games-strategy/openxcom/openxcom-0.9_p20140427.ebuild index 55bef80..493050c 100644 --- a/games-strategy/openxcom/openxcom-0.9_p20140411.ebuild +++ b/games-strategy/openxcom/openxcom-0.9_p20140427.ebuild @@ -9,9 +9,9 @@ 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_04_11_0608.zip"; +SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2014_04_27_0630.zip"; EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=7de60a2a9a3bc7a1ae4e6564024a539f6bd599c2 +EGIT_COMMIT=1daa72dbeefeb9ea24ad0b9032f7b64b3a048d60 LICENSE="GPL-3" SLOT="0"
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: f710cbac54f088bec6c06523993b4f0ab6ccce53 Author: Azamat H. Hackimov gmail com> AuthorDate: Mon Apr 7 15:56:03 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Mon Apr 7 15:56:03 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=f710cbac [games-strategy/openxcom] Version bump Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- .../{openxcom-0.9_p20140319.ebuild => openxcom-0.9_p20140407.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-strategy/openxcom/openxcom-0.9_p20140319.ebuild b/games-strategy/openxcom/openxcom-0.9_p20140407.ebuild similarity index 95% rename from games-strategy/openxcom/openxcom-0.9_p20140319.ebuild rename to games-strategy/openxcom/openxcom-0.9_p20140407.ebuild index 081e813..437e666 100644 --- a/games-strategy/openxcom/openxcom-0.9_p20140319.ebuild +++ b/games-strategy/openxcom/openxcom-0.9_p20140407.ebuild @@ -9,9 +9,9 @@ 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_03_18_2038.zip"; +SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2014_04_07_0649.zip"; EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=56d81b7179c240b47f468e7abc62859471f582a3 +EGIT_COMMIT=001fc0d31727cb97fa16468ce6c978e47140342b LICENSE="GPL-3" SLOT="0"
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: b325ab03ed5cd1bf5fae2efc3dd6d6ed0c551052 Author: Azamat H. Hackimov gmail com> AuthorDate: Fri Apr 11 17:17:44 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Fri Apr 11 17:17:44 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b325ab03 [games-strategy/openxcom] New version, desktop file and pixmaps. Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- ...{openxcom-0.9_p20140407.ebuild => openxcom-0.9_p20140411.ebuild} | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/games-strategy/openxcom/openxcom-0.9_p20140407.ebuild b/games-strategy/openxcom/openxcom-0.9_p20140411.ebuild similarity index 90% rename from games-strategy/openxcom/openxcom-0.9_p20140407.ebuild rename to games-strategy/openxcom/openxcom-0.9_p20140411.ebuild index 437e666..55bef80 100644 --- a/games-strategy/openxcom/openxcom-0.9_p20140407.ebuild +++ b/games-strategy/openxcom/openxcom-0.9_p20140411.ebuild @@ -9,9 +9,9 @@ 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_04_07_0649.zip"; +SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2014_04_11_0608.zip"; EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=001fc0d31727cb97fa16468ce6c978e47140342b +EGIT_COMMIT=7de60a2a9a3bc7a1ae4e6564024a539f6bd599c2 LICENSE="GPL-3" SLOT="0" @@ -50,6 +50,8 @@ 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 }
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: 1c88fc7c23b78547e8b13c2c449cb76fb0d55987 Author: Azamat H. Hackimov gmail com> AuthorDate: Wed Mar 19 14:29:08 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Wed Mar 19 14:29:08 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=1c88fc7c [games-strategy/openxcom] New version from git Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- .../openxcom/openxcom-0.9_p20140318.ebuild | 62 ++ 1 file changed, 62 insertions(+) diff --git a/games-strategy/openxcom/openxcom-0.9_p20140318.ebuild b/games-strategy/openxcom/openxcom-0.9_p20140318.ebuild new file mode 100644 index 000..4798af5 --- /dev/null +++ b/games-strategy/openxcom/openxcom-0.9_p20140318.ebuild @@ -0,0 +1,62 @@ +# 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_03_18_2038.zip"; +EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; +EGIT_COMMIT=e6ccd67125862f66c3534544a27b2691cb154a68 + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="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/" + + 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" +}
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/
commit: ba8e4ef6bec960f4160a03a3d0419664d49dcaf2 Author: Azamat H. Hackimov gmail com> AuthorDate: Thu Mar 20 01:17:50 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Thu Mar 20 01:17:50 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ba8e4ef6 [games-strategy/openxcom] Quick bump to solve application crash bug. Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- .../openxcom/openxcom-0.9_p20130906.ebuild | 57 -- ...140318.ebuild => openxcom-0.9_p20140319.ebuild} | 4 +- 2 files changed, 2 insertions(+), 59 deletions(-) diff --git a/games-strategy/openxcom/openxcom-0.9_p20130906.ebuild b/games-strategy/openxcom/openxcom-0.9_p20130906.ebuild deleted file mode 100644 index 2792064..000 --- a/games-strategy/openxcom/openxcom-0.9_p20130906.ebuild +++ /dev/null @@ -1,57 +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 git-2 - -DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" -HOMEPAGE="http://openxcom.org/"; -EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=3558366d159029149b83945916420531b8e670f1 - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND=">=dev-cpp/yaml-cpp-0.5.1 - 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" - -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/* - - 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-0.9_p20140318.ebuild b/games-strategy/openxcom/openxcom-0.9_p20140319.ebuild similarity index 95% rename from games-strategy/openxcom/openxcom-0.9_p20140318.ebuild rename to games-strategy/openxcom/openxcom-0.9_p20140319.ebuild index 4798af5..081e813 100644 --- a/games-strategy/openxcom/openxcom-0.9_p20140318.ebuild +++ b/games-strategy/openxcom/openxcom-0.9_p20140319.ebuild @@ -11,12 +11,12 @@ HOMEPAGE="http://openxcom.org/"; # For translation files SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2014_03_18_2038.zip"; EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=e6ccd67125862f66c3534544a27b2691cb154a68 +EGIT_COMMIT=56d81b7179c240b47f468e7abc62859471f582a3 LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +IUSE="debug doc" RDEPEND="app-arch/unzip >=dev-cpp/yaml-cpp-0.5.1
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/files/, games-strategy/openxcom/, profiles/updates/
commit: e6b93de157396777462d424d31e500fe5c351a6c Author: Azamat H. Hackimov gmail com> AuthorDate: Sun Jun 15 19:16:56 2014 + Commit: Azamat H. Hackimov gentoo ru> CommitDate: Sun Jun 15 19:16:56 2014 + 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..000 --- 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 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..000 --- a/games-strategy/openxcom/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd";> - - -azamat.hacki...@gmail.com -Azamat H. Hackimov - - -An open-source reimplementation of the popular UFO: Enemy Unknown. - - -Открытая реализация популярной тактической стратегии 1994 года UFO: Enemy Unknown. - - - diff --git a/games-strategy/openxcom/openxcom-0.9.ebuild b/games-strategy/openxcom/openxcom-0.9.ebuild deleted file mode 100644 index 1de5d80..000 --- 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="~de