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

[Michael Weber]

commit:     5a523ff90c15898ff2ed1778701414a86e2fbd14
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 00:02:27 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 00:02:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a523ff9

games-simulation/crrcsim: Version bump (bug 601238, thanks Grant Edwards).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-simulation/crrcsim/Manifest                  |  1 +
 games-simulation/crrcsim/crrcsim-0.9.13.ebuild     | 60 +++++++++++++++++++++
 .../crrcsim/files/crrcsim-0.9.13-buildsystem.patch | 62 ++++++++++++++++++++++
 3 files changed, 123 insertions(+)

diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index 0a90e22..d55ace0 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -1 +1,2 @@
 DIST crrcsim-0.9.12.tar.gz 7355827 SHA256 2d166aec9ff4394a0252368d4cfcac5ba4ab8a29f58f99cd1649721a8f65a3fb SHA512 53c4a530922d58ca0211a5a3171d927c9c9161139c63e73d8dbc602e0aa1c259ef0f3ba712b30a71dc357889bbf59fa76888315bdcd264e0d29307e66b70b00a WHIRLPOOL 3f177ae208e0f70b0ebdc9aa4e1e200ff73bdf656fecb67c6ffe7a8e303bae4ce8caab4c4e01e52371c42ae389574e9c821dcb5c4afb4dc32b94661add18b7ee
+DIST crrcsim-0.9.13.tar.gz 8337392 SHA256 abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698 SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab WHIRLPOOL 2af5b8aa79f8e1edead4ff982392314d659e6f5fbb31f0a4438ecc986898c6026e05d9dc417c6ff88a7a3bba9d10b122e3bf09b8bb274354fe4e531bd86f7b2f

diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
new file mode 100644
index 00000000..579b6a8
--- /dev/null
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WANT_AUTOMAKE="1.10"
+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
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
+
+src_prepare() {
+	default
+
+	if has_version "sci-mathematics/cgal[gmp(+)]" ; then
+		eapply "${FILESDIR}"/${PN}-cgal_gmp.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datadir="/usr/share" \
+		--datarootdir="${EPREFIX%/}/usr/share" \
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		$(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
new file mode 100644
index 00000000..396fd57
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
@@ -0,0 +1,62 @@
+--- 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