[gentoo-commits] repo/gentoo:master commit in: games-simulation/crrcsim/, games-simulation/crrcsim/files/

2021-07-19 Thread Ionen Wolkens
commit: be34bcfc61abb8bdff5b98bd59a700e6200dfdc5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jul 19 15:57:57 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jul 19 16:01:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be34bcfc

games-simulation/crrcsim: drop 0.9.13-r1

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-simulation/crrcsim/crrcsim-0.9.13-r1.ebuild  | 58 
 .../crrcsim/files/crrcsim-0.9.13-buildsystem.patch | 62 --
 .../crrcsim/files/crrcsim-cgal_gmp.patch   | 11 
 3 files changed, 131 deletions(-)

diff --git a/games-simulation/crrcsim/crrcsim-0.9.13-r1.ebuild 
b/games-simulation/crrcsim/crrcsim-0.9.13-r1.ebuild
deleted file mode 100644
index cf65eba9ef2..000
--- a/games-simulation/crrcsim/crrcsim-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="model-airplane flight simulation program"
-HOMEPAGE="https://sourceforge.net/projects/crrcsim/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
-
-RDEPEND="media-libs/libsdl[X,sound,joystick,opengl,video]
-   media-libs/plib
-   sci-mathematics/cgal[shared(+)]
-   portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-buildsystem.patch
-   "${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-   default
-
-   if has_version "sci-mathematics/cgal[gmp(+)]" ; then
-   eapply "${FILESDIR}"/${PN}-cgal_gmp.patch
-   fi
-   eautoreconf
-}
-
-src_configure() {
-   econf $(use_with portaudio)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodoc AUTHORS HISTORY NEWS README
-   doicon -s 32 packages/icons/${PN}.png
-   make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}

diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch 
b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
deleted file mode 100644
index 396fd573ec9..000
--- a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
+++ /dev/null
@@ -1,62 +0,0 @@
 crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -79,8 +79,12 @@
- dnl Default is: no portaudio present
- portaudio=0
- 
-+AC_ARG_WITH([portaudio], AS_HELP_STRING([--without-portaudio], [Build without 
portaudio library (default: test)]))
-+
-+AS_IF([test "x$with_portaudio" != "xno"], [
- dnl Check for the Portaudio header file
- AC_CHECK_HEADER([portaudio.h])
-+])
- 
- if  (test "x$ac_cv_header_portaudio_h" = "xyes"); then 
-   dnl Check for Portaudio 18
 crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-+++ crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-@@ -113,8 +113,8 @@
-   // $USERPROFILE/.crrcsim(WIN32)
-   // $HOME/.crrcsim   (LINUX)
-   // CRRC_DATA_PATH   (LINUX)
--  // /usr/local/share/games/crrcsim   (LINUX)
--  // /usr/share/games/crrcsim (LINUX)
-+  // /usr/local/share/crrcsim (LINUX)
-+  // /usr/share/crrcsim   (LINUX)
- 
-   // cwd
-   if (dirname != "")
-@@ -154,13 +154,13 @@
- s.append(dirname);
- pathlist.push_back(s);
- #endif
--s = "/usr/local/share/games/" + appname + "/";
-+s = "/usr/local/share/" + appname + "/";
- if (s != data_path)// avoid adding this path twice
- {
-   s.append(dirname);
-   pathlist.push_back(s);
- }
--s = "/usr/share/games/" + appname + "/";
-+s = "/usr/share/" + appname + "/";
- if (s != data_path)// avoid adding this path twice
- {
-   s.append(dirname);
-@@ -172,13 +172,13 @@
- #ifdef CRRC_DATA_PATH
- pathlist.push_back(data_path);
- #endif
--if (data_path != "/usr/local/share/games/" + appname)  // avoid adding 
this path twice
-+if (data_path != "/usr/local/share/" + appname)  // avoid adding this 
path twice
- {
--  pathlist.push_back("/usr/local/share/games/" + appname);
-+  pathlist.push_back("/usr/local/share/" + appname);
- }
--if (data_path != "/usr/share/games/" + appname)  // avoid adding this 
path twice
-+if (data_path != "/usr/share/" + appname)  // avoid adding this path twice
- {
--  pathlist.push_back("/usr/share/games/" + appname);
-+  pathlist.push_back("/usr/share/" + appname);
- }
-   }
-   #endif

diff --git a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch 
b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
deleted file mode 100644
index 10d6bff6b76..000
--- a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 

[gentoo-commits] repo/gentoo:master commit in: games-simulation/crrcsim/, games-simulation/crrcsim/files/

2017-07-23 Thread Michael Palimaka
commit: 495a52fc2fe5740647c86062cffb28303b15c097
Author: Peter Levine  gmail  com>
AuthorDate: Sun Jul 23 06:31:56 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 12:39:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=495a52fc

games-simulation/crrcsim: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=610560
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 games-simulation/crrcsim/crrcsim-0.9.13.ebuild   |  5 -
 games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch | 14 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild 
b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
index d3b2bb8e014..ef5b5ce752d 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -20,7 +20,10 @@ RDEPEND="media-libs/libsdl[X,sound,joystick,opengl,video]
portaudio? ( media-libs/portaudio )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-buildsystem.patch
+   "${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_prepare() {
default

diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch 
b/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
new file mode 100644
index 000..b11550f3dff
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/610560
+Upstream commit: 
https://sourceforge.net/p/crrcsim/code/ci/28ed9ba57011371cab8b637550acc716b973c47d
+
+--- a/src/mod_video/crrc_animation.cpp
 b/src/mod_video/crrc_animation.cpp
+@@ -84,7 +84,7 @@
+   else
+   {
+ std::cerr << "createAnimation: unknown animation type \'"
+-  << type << "\'" << std::cerr;
++  << type << "\'" << std::endl;
+   }
+   
+   if (anim != NULL)