* [gentoo-commits] repo/gentoo:master commit in: games-action/violetland/, games-action/violetland/files/
@ 2017-01-31 0:59 Austin English
0 siblings, 0 replies; 3+ messages in thread
From: Austin English @ 2017-01-31 0:59 UTC (permalink / raw
To: gentoo-commits
commit: b88f1938637ed30a9c7e28e68e77b0b529ea04c4
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 00:31:33 2017 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 00:59:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88f1938
games-action/violetland: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: Portage-2.3.2, Repoman-2.3.1
.../files/violetland-0.4.3-boost150.patch | 8 +--
games-action/violetland/violetland-0.4.3-r1.ebuild | 57 ++++++++++++++++++++++
2 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/games-action/violetland/files/violetland-0.4.3-boost150.patch b/games-action/violetland/files/violetland-0.4.3-boost150.patch
index 4e700ca..5ddd5e8 100644
--- a/games-action/violetland/files/violetland-0.4.3-boost150.patch
+++ b/games-action/violetland/files/violetland-0.4.3-boost150.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old 2012-11-05 15:19:11.501044743 +0100
-+++ CMakeLists.txt 2012-11-05 15:19:25.415250207 +0100
+--- a/CMakeLists.txt 2012-11-05 15:19:11.501044743 +0100
++++ b/CMakeLists.txt 2012-11-05 15:19:25.415250207 +0100
@@ -8,7 +8,6 @@
find_package(SDL_mixer REQUIRED)
find_package(OpenGL REQUIRED)
@@ -8,8 +8,8 @@
if(${MINGW})
set(INTL_LIBRARY intl)
---- src/system/utility/FileUtility.cpp.old 2012-11-05 21:26:07.865488297 +0100
-+++ src/system/utility/FileUtility.cpp 2012-11-05 21:30:44.881208230 +0100
+--- a/src/system/utility/FileUtility.cpp 2012-11-05 21:26:07.865488297 +0100
++++ b/src/system/utility/FileUtility.cpp 2012-11-05 21:30:44.881208230 +0100
@@ -20,7 +20,7 @@
while (dir_it != boost::filesystem::directory_iterator()) {
diff --git a/games-action/violetland/violetland-0.4.3-r1.ebuild b/games-action/violetland/violetland-0.4.3-r1.ebuild
new file mode 100644
index 00000000..a3b711a
--- /dev/null
+++ b/games-action/violetland/violetland-0.4.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs flag-o-matic cmake-utils
+
+DESCRIPTION="Help a girl named Violet in the struggle with hordes of monsters"
+HOMEPAGE="https://code.google.com/p/violetland/"
+SRC_URI="https://github.com/ooxi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost[threads(+)]
+ media-libs/libsdl[sound,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-ttf
+ virtual/glu
+ virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-boost150.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "/README_EN.TXT/d" \
+ -e "/README_RU.TXT/d" \
+ CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+ mycmakeargs=(
+ "-DCMAKE_INSTALL_PREFIX=/usr"
+ "-DDATA_INSTALL_DIR=/usr/share/${PN}"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ DOCS="README_EN.TXT CHANGELOG" cmake-utils_src_install
+ newicon icon-light.png ${PN}.png
+ make_desktop_entry ${PN} VioletLand
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/violetland/, games-action/violetland/files/
@ 2019-11-10 12:24 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2019-11-10 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 7e5eaba5460fb4da936b81ac439875698bd1019c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 12:23:11 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 12:23:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5eaba5
games-action/violetland: Drop old 0.4.3-r1
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/violetland/Manifest | 1 -
.../files/violetland-0.4.3-boost150.patch | 41 -----------------
games-action/violetland/violetland-0.4.3-r1.ebuild | 51 ----------------------
3 files changed, 93 deletions(-)
diff --git a/games-action/violetland/Manifest b/games-action/violetland/Manifest
index 36b692b15f7..cb15d8dc990 100644
--- a/games-action/violetland/Manifest
+++ b/games-action/violetland/Manifest
@@ -1,2 +1 @@
-DIST violetland-0.4.3.tar.gz 9257919 BLAKE2B 255c9c13a49db576a37dbd4aa863306f0778f9528173426b26934a674dd0145574ff96242577feff8a4566571eebd97d0cb7a1d8a9718ac84fcd6c4492230fd5 SHA512 678e1aea42c9358794c6b8b83bdd113baf26e16db4cb815c756cb6c1d268b8210d18a47d1a98a019556633b4db62cd8cf7fc6a1e1ec3b7e3647a9d8353020fae
DIST violetland-0.5-source-with-dependencies.tar.gz 11495885 BLAKE2B 33c3e8a8955ddc416c66c761681dce337ecccdb52ae7be3777124f4854c325436296ea5614100527a3e5be6c4d3a3cf2dffb2336037d5e904b50e2ae843d0fc4 SHA512 9b00fa600332c956c49bc5906f373c0dfff08a13320617014942ac4dbc199de8f84bef87ed218b38812ae3c53622e9148aa4463c4ea219056360bff1c73b7f88
diff --git a/games-action/violetland/files/violetland-0.4.3-boost150.patch b/games-action/violetland/files/violetland-0.4.3-boost150.patch
deleted file mode 100644
index 5ddd5e8445b..00000000000
--- a/games-action/violetland/files/violetland-0.4.3-boost150.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/CMakeLists.txt 2012-11-05 15:19:11.501044743 +0100
-+++ b/CMakeLists.txt 2012-11-05 15:19:25.415250207 +0100
-@@ -8,7 +8,6 @@
- find_package(SDL_mixer REQUIRED)
- find_package(OpenGL REQUIRED)
- find_package(Boost COMPONENTS filesystem system REQUIRED)
--add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
-
- if(${MINGW})
- set(INTL_LIBRARY intl)
---- a/src/system/utility/FileUtility.cpp 2012-11-05 21:26:07.865488297 +0100
-+++ b/src/system/utility/FileUtility.cpp 2012-11-05 21:30:44.881208230 +0100
-@@ -20,7 +20,7 @@
-
- while (dir_it != boost::filesystem::directory_iterator()) {
- if (boost::filesystem::is_regular_file(*dir_it))
-- files.push_back(dir_it->filename());
-+ files.push_back(dir_it->path().filename().string());
- ++dir_it;
- }
- return files;
-@@ -32,8 +32,8 @@
-
- while (dir_it != boost::filesystem::directory_iterator()) {
- if (boost::filesystem::is_directory(*dir_it))
-- if (dir_it->path().filename()[0] != '.')
-- subDirs.push_back(dir_it->path().filename());
-+ if (dir_it->path().filename().string()[0] != '.')
-+ subDirs.push_back(dir_it->path().filename().string());
- ++dir_it;
- }
- return subDirs;
-@@ -45,7 +45,7 @@
-
- while (dir_it != boost::filesystem::directory_iterator()) {
- if (boost::filesystem::is_directory(*dir_it))
-- if (dir_it->path().filename()[0] != '.')
-+ if (dir_it->path().filename().string()[0] != '.')
- ++count;
- ++dir_it;
- }
diff --git a/games-action/violetland/violetland-0.4.3-r1.ebuild b/games-action/violetland/violetland-0.4.3-r1.ebuild
deleted file mode 100644
index ce501bb5741..00000000000
--- a/games-action/violetland/violetland-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="Help a girl named Violet in the struggle with hordes of monsters"
-HOMEPAGE="https://violetland.github.io/"
-SRC_URI="https://github.com/ooxi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads(+)]
- media-libs/libsdl[sound,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[vorbis]
- media-libs/sdl-ttf
- virtual/glu
- virtual/opengl"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-boost150.patch )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i \
- -e "/README_EN.TXT/d" \
- -e "/README_RU.TXT/d" \
- CMakeLists.txt || die "sed failed"
- rm README_RU.TXT || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDATA_INSTALL_DIR=share/${PN}
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon icon-light.png ${PN}.png
- make_desktop_entry ${PN} VioletLand
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/violetland/, games-action/violetland/files/
@ 2024-05-26 13:20 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2024-05-26 13:20 UTC (permalink / raw
To: gentoo-commits
commit: ea2c31177a8deed2225c5decf6a3562e6598e90e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 11:33:57 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May 26 13:20:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2c3117
games-action/violetland: fix build with boost-1.85
Closes: https://bugs.gentoo.org/932778
Thanks-to: Torsten Kaiser
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-action/violetland/files/violetland-0.5-boost1.85.patch | 8 ++++++++
games-action/violetland/violetland-0.5.ebuild | 6 +++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/games-action/violetland/files/violetland-0.5-boost1.85.patch b/games-action/violetland/files/violetland-0.5-boost1.85.patch
new file mode 100644
index 000000000000..8382122c0ccf
--- /dev/null
+++ b/games-action/violetland/files/violetland-0.5-boost1.85.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/932778
+--- a/src/game/Highscores.cpp
++++ b/src/game/Highscores.cpp
+@@ -107,3 +107,3 @@
+ boost::filesystem::copy_file(hsTempFile, hsFile,
+- boost::filesystem::copy_option::overwrite_if_exists);
++ boost::filesystem::copy_options::overwrite_existing);
+ boost::filesystem::remove(hsTempFile);
diff --git a/games-action/violetland/violetland-0.5.ebuild b/games-action/violetland/violetland-0.5.ebuild
index 21c08d426767..2db7c5ac14cf 100644
--- a/games-action/violetland/violetland-0.5.ebuild
+++ b/games-action/violetland/violetland-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,6 +28,10 @@ BDEPEND="
sys-devel/gettext
"
+PATCHES=(
+ "${FILESDIR}"/${P}-boost1.85.patch
+)
+
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-26 13:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-10 12:24 [gentoo-commits] repo/gentoo:master commit in: games-action/violetland/, games-action/violetland/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-05-26 13:20 Ionen Wolkens
2017-01-31 0:59 Austin English
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox