From 3421c268bb04de25ed20c46b095e7336720cb2d0 Mon Sep 17 00:00:00 2001 From: hasufell Date: Sat, 29 Sep 2012 01:18:54 +0200 Subject: [PATCH] version bump, split packages --- games-engines/flare/Manifest | 5 +- .../flare/files/flare-0.16-build.patch | 49 ---------------- games-engines/flare/flare-0.16.ebuild | 57 ------------------- .../flare/flare-0.17_pre20120928.ebuild | 43 ++++++++++++++ games-rpg/flare/Manifest | 2 + games-rpg/flare/flare-0.17.ebuild | 45 +++++++++++++++ profiles/updates/4Q-2012 | 1 + 7 files changed, 93 insertions(+), 109 deletions(-) delete mode 100644 games-engines/flare/files/flare-0.16-build.patch delete mode 100644 games-engines/flare/flare-0.16.ebuild create mode 100644 games-engines/flare/flare-0.17_pre20120928.ebuild create mode 100644 games-rpg/flare/Manifest create mode 100644 games-rpg/flare/flare-0.17.ebuild diff --git a/games-engines/flare/Manifest b/games-engines/flare/Manifest index 4a43c67..39b365f 100644 --- a/games-engines/flare/Manifest +++ b/games-engines/flare/Manifest @@ -1,3 +1,2 @@ -AUX flare-0.16-build.patch 1823 SHA256 4db3585400d025dffdcd3845918a5b79274d4fb2771e719ec9dd95763d24048b SHA512 8803032461a771cc6ec14a30ca01706da6a3ac12b249726dd0facc1fce901abf570a50b248e8a74957c04713536ee2703c25921f1de2b19ee738410a4c82906e WHIRLPOOL 4b318beba2e766e0836e0b4517c707fe009a0b54b44f21a88dd2cf0c16ccd0ef4f2d5e5ad399c32f0731d2ab763597f32300382173d2c144a9fb70f09bfd43e2 -DIST flare_linux_v016.zip 86574824 SHA256 c8faf183be4b75cf49ff11dc836c73c89dda2597855b9f3b687a818abfc84b0f SHA512 5c5559959b91d812efd6623f7c75a29274cd7bf852f3379232dc2c6e25da4f307718a36fcebab462551de788548e724296875c14db5b1fb5197ae20d6581f7b3 WHIRLPOOL 5a03553eb89af59406b387f9e339a670feec893441d690046d4d759c79ef4a8fbc4258b0c7c3739cf89d29affa538faf50d613eeb24906a59c1b89eaeaa00f0c -EBUILD flare-0.16.ebuild 1207 SHA256 3c79bbb6e944f96fa91328c1ba43f688d77a4cd92ef5d0343ab7580aba1644ff SHA512 90c5285049e7617207cb79d5b263b8e058706398200636099397dcd973484b0af236b72593e8a44318210d001e054d34fc774400d76558845628042259aefed0 WHIRLPOOL 23f2a1e78e6cd7e4d4107b7aba308dea48566a06c3411052f5918ae3a743fcce67013cf3009725ad67e6356a4223124a693e34102bb55c31349c71b21a0a7421 +DIST flare-0.17_pre20120928.tar.gz 470849 SHA256 1ec06d7156e48bc18d4a4447350ba6b41dfad4d319a02fb7d74259273723ea74 SHA512 127b91c6061722c095d424eb65dc8103baed40f66e35e8ec9222d01c3d99719a14701f5f2f53728f204c018e34bd665016bbca8123017cf7f0c29ce4d53737aa WHIRLPOOL 567bdc4e326870235c208beb77dad3fa4741b4f6ffce01d871fa5743fd08601e0914d3d15c35ee2cb28f2cde29bd44b93f49482542582d14aae3e02107bae733 +EBUILD flare-0.17_pre20120928.ebuild 909 SHA256 e44b57e405fdd9e3fb4597ea8066af7ce0fe3ae6c2f56a49ebe11a5a4f3ca3ed SHA512 51484f7edaca48dadd61c7ee5f6b7e2d1f18cf02217b9db3e08e60d0c515a44755e5b523d1090c59094fc52d0325822c296a47384ebdf50d2f78ba8d713ee837 WHIRLPOOL 0e17ce909a22e8478cd56765467f024a68826677aa4a0fecd471d754472d14f0de72274f8fc9df1e3ae46f1824bb43ed07e5db90162f89097142e38091d05415 diff --git a/games-engines/flare/files/flare-0.16-build.patch b/games-engines/flare/files/flare-0.16-build.patch deleted file mode 100644 index ecd35b8..0000000 --- a/games-engines/flare/files/flare-0.16-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Julian Ospald -Date: Wed Jul 11 19:00:02 UTC 2012 -Subject: build system - -make DATA_INSTALL_DIR and game paths compatible with absolute paths - ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -27,7 +27,11 @@ - set(BINDIR "games" CACHE STRING "Directory from CMAKE_INSTALL_PREFIX where game executable will be installed.") - set(DATADIR "share/games/flare" CACHE STRING "Directory from CMAKE_INSTALL_PREFIX where game data files will be installed.") - --add_definitions(-DDATA_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${DATADIR}") -+If(NOT IS_ABSOLUTE "${DATADIR}") -+ add_definitions(-DDATA_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${DATADIR}") -+Else(NOT IS_ABSOLUTE "${DATADIR}") -+ add_definitions(-DDATA_INSTALL_DIR="${DATADIR}") -+EndIf(NOT IS_ABSOLUTE "${DATADIR}") - - # Detect missing dependencies - -@@ -155,18 +159,22 @@ - - Target_Link_Libraries (flare ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMAIN_LIBRARY}) - -- --set(FLARE_EXECUTABLE_PATH ${CMAKE_INSTALL_PREFIX}/${BINDIR}/flare) -+# desktop file -+If(NOT IS_ABSOLUTE "${BINDIR}") -+ set(FLARE_EXECUTABLE_PATH ${CMAKE_INSTALL_PREFIX}/${BINDIR}/flare) -+Else(NOT IS_ABSOLUTE "${BINDIR}") -+ set(FLARE_EXECUTABLE_PATH ${BINDIR}/flare) -+EndIf(NOT IS_ABSOLUTE "${BINDIR}") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/distribution/flare.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/flare.desktop") - - - # installing to the proper places - install(PROGRAMS - ${CMAKE_CURRENT_BINARY_DIR}/flare -- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BINDIR}) -+ DESTINATION ${BINDIR}) - install(DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}/mods" -- DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATADIR}) -+ DESTINATION ${DATADIR}) - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/flare.desktop" - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) - diff --git a/games-engines/flare/flare-0.16.ebuild b/games-engines/flare/flare-0.16.ebuild deleted file mode 100644 index a746c91..0000000 --- a/games-engines/flare/flare-0.16.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils cmake-utils versionator games - -MY_PV="v$(delete_version_separator 1 $(replace_version_separator 2 '_'))" -MY_P="${PN}_linux_${MY_PV}" - -DESCRIPTION="Free/Libre Action Roleplaying Engine" -HOMEPAGE="http://flarerpg.org/" -SRC_URI="mirror://github/clintbellanger/${PN}/${MY_P}.zip - mirror://github/arx/ArxGentoo/${MY_P}.zip" - -# Code is GPL, assets are CC-BY-SA -LICENSE="GPL-3 CCPL-Attribution-ShareAlike-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/libsdl[X,audio,joystick,video] - media-libs/sdl-image[png] - media-libs/sdl-mixer[vorbis] - media-libs/sdl-ttf" -DEPEND="${RDEPEND} - app-arch/unzip" - -S=${WORKDIR}/${PN}_${MY_PV} - -src_prepare() { - sed \ - -e 's/flare.svg/flare/' \ - -i distribution/flare.desktop.in \ - || die "fixing desktop file failed!" - - epatch "${FILESDIR}"/${P}-build.patch -} - -src_configure() { - local mycmakeargs=( - -DBINDIR="${GAMES_BINDIR}" - -DDATADIR="${GAMES_DATADIR}/${PN}" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - dodoc README - prepgamesdirs -} diff --git a/games-engines/flare/flare-0.17_pre20120928.ebuild b/games-engines/flare/flare-0.17_pre20120928.ebuild new file mode 100644 index 0000000..4ad4e33 --- /dev/null +++ b/games-engines/flare/flare-0.17_pre20120928.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit cmake-utils games vcs-snapshot + +MY_P="flare_linux_v${PV//./}" +DESCRIPTION="Free/Libre Action Roleplaying engine" +HOMEPAGE="https://github.com/clintbellanger/flare-game" +SRC_URI="https://github.com/clintbellanger/flare-engine/tarball/7a6b9e56a53f448c2e3f781fc2b72a818425d2ad -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + !games-rpg/flare + media-libs/libsdl[X,audio,joystick,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-ttf" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DBINDIR="${GAMES_BINDIR}" + -DDATADIR="${GAMES_DATADIR}/${PN}" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + dodoc README + prepgamesdirs +} diff --git a/games-rpg/flare/Manifest b/games-rpg/flare/Manifest new file mode 100644 index 0000000..e8c5564 --- /dev/null +++ b/games-rpg/flare/Manifest @@ -0,0 +1,2 @@ +DIST flare_linux_v017.tar.gz 113884135 SHA256 ce9a1c2dff366e0e5b354a35256f8201c3b5db7e3db2f345cad3739c32c7633a SHA512 6f129e257f1117973950eb73e01d7cf4111254daa8b14d61ba571ec82f17cc9ad1393f636b53ecb6b85f3c1c5d6df7261019592927aa23a7dc8b420310dde38d WHIRLPOOL a550bfbb2cb5c79ed6393d1b50267fa79c06d94c261ce9fc20fa7933cea2dd4b60d47fe840b5579d9f033f8cbc1326106f4a000184d586098f3a6667ff66b43c +EBUILD flare-0.17.ebuild 866 SHA256 91afe22493dc9d960dad9a64303049b90d17aed4e72a6bb2aa0a5796c0360219 SHA512 62141020c3ece573f893cf4296cd20586e5b08fd0b2d024debf0f8a533b108922f2c6b12a26394e470804ac1411eef09c534c5cd2caf7180fdec1f3f35f04338 WHIRLPOOL cac357f981d4cd2295500bc3d4714566382e047871e2814c32f56cf07ffe2ac2f05e582701717752de82d953a54e47a743d188089179f5212004addb879a5dab diff --git a/games-rpg/flare/flare-0.17.ebuild b/games-rpg/flare/flare-0.17.ebuild new file mode 100644 index 0000000..51e8c2e --- /dev/null +++ b/games-rpg/flare/flare-0.17.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit cmake-utils games + +MY_P="flare_linux_v${PV//./}" +DESCRIPTION="Free/Libre Action Roleplaying game" +HOMEPAGE="https://github.com/clintbellanger/flare-game" +SRC_URI="mirror://github/clintbellanger/flare-game/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + !games-engines/flare + media-libs/libsdl[X,audio,joystick,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-ttf" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +src_configure() { + local mycmakeargs=( + -DBINDIR="${GAMES_BINDIR}" + -DDATADIR="${GAMES_DATADIR}/${PN}" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + dodoc README + prepgamesdirs +} diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012 index 2a085ea..b5e88a1 100644 --- a/profiles/updates/4Q-2012 +++ b/profiles/updates/4Q-2012 @@ -1,2 +1,3 @@ move games-action/minetest games-engines/minetest move games-engines/minetest games-action/minetest +move games-engines/flare games-rpg/flare