From 44a9fdfcc437f3480730313c4dd783b216883ea7 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Sun, 13 Nov 2011 22:15:50 +0000 Subject: fix sci-mathematics/cgal[gmp] problem (thanks rinus, bug 390309) Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- games-simulation/crrcsim/ChangeLog | 6 +++++- games-simulation/crrcsim/Manifest | 13 ++++++------ games-simulation/crrcsim/crrcsim-0.9.11.ebuild | 5 ++++- .../crrcsim/files/crrcsim-buildsystem.patch | 23 ---------------------- .../crrcsim/files/crrcsim-cgal_gmp.patch | 11 +++++++++++ 5 files changed, 27 insertions(+), 31 deletions(-) create mode 100644 games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch (limited to 'games-simulation') diff --git a/games-simulation/crrcsim/ChangeLog b/games-simulation/crrcsim/ChangeLog index ab3a5f673fc3..e6cbc3cf7fc4 100644 --- a/games-simulation/crrcsim/ChangeLog +++ b/games-simulation/crrcsim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-simulation/crrcsim # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/crrcsim/ChangeLog,v 1.2 2011/11/12 01:54:08 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/crrcsim/ChangeLog,v 1.3 2011/11/13 22:15:50 xmw Exp $ + + 13 Nov 2011; Michael Weber crrcsim-0.9.11.ebuild, + +files/crrcsim-cgal_gmp.patch, files/crrcsim-buildsystem.patch: + fix sci-mathematics/cgal[gmp] problem (thanks rinus, bug 390309) 12 Nov 2011; Michael Weber crrcsim-0.9.11.ebuild: Add dep on sci-mathematics/cgal, fix --docdir, clean up diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest index 5a84a7bf564c..c760ddb76fe7 100644 --- a/games-simulation/crrcsim/Manifest +++ b/games-simulation/crrcsim/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX crrcsim-buildsystem.patch 1222 RMD160 bc15b8a60db0096075140b1d4bf804da59a6af89 SHA1 496f821cac0948ffa5395b1a510fda8b89916486 SHA256 0fdf065a2a7bcfe13999b6ab3a4a9764ff3e53b152d25d0f8ab976245def470f +AUX crrcsim-buildsystem.patch 465 RMD160 3f2d3e6672d7d8a7cf98d1747fd71d7153970ee9 SHA1 d379c63b00f013289303d9da57638155a34a295c SHA256 5cec25bf06820a8d91511ac36f2ab152a29706f63d21ed3c95d9e013cec83955 +AUX crrcsim-cgal_gmp.patch 352 RMD160 dcda7391d23304cc0c540ba272a728bf6d8d2151 SHA1 c495965d9d617facd771d177647664a077cef574 SHA256 f79c80467c5bd704a5ddb3d7de185037569d939a06d745211b1c6ea99afc899a DIST crrcsim-0.9.11.tar.gz 6779165 RMD160 301e1a5fbface0ecfce7910c557a1fb8a2f01d47 SHA1 7e1b9ce9a5ad0f2b878ff422e00f8a3e28dc0f8d SHA256 3f42582623613ebc112b9c124d2905da4b90789b48c6c930052201737b7ce99b -EBUILD crrcsim-0.9.11.ebuild 926 RMD160 90da38833acd7eb6a379942a56748c43aa2e74bf SHA1 3c48ffe16d257e082285b1f44039b54f1424829d SHA256 ea3f31952ad9dc73d3515a63acf5a7725d1976c71b2cb0754375732ac5c3f84a -MISC ChangeLog 596 RMD160 5bf5c117cbf5fd86e3ae0cb809e4d12adf4eb6a8 SHA1 4eb54d53a7b6d58aa9bfaa7d6929bdcf27bbca4a SHA256 e1698d16a82ae1323d2f3bade88b1299ea950cbfef13df337a345102f38e9291 +EBUILD crrcsim-0.9.11.ebuild 1041 RMD160 66f76cba5fa5a62b40c6c8385ca6cacfb59e422b SHA1 8d9b8e7a03930701cc2fd0f27892721097ca6473 SHA256 2c9591514a18d2ffb04bb6739d2697993dc151164de40e160a81972a4f4d4c9f +MISC ChangeLog 799 RMD160 edee3ccf8a4a6b3ba5bfa21d5206b3b40cf3ccf4 SHA1 6b8ebb3e4e948e36ddfb6af989e8b7bbfeee9d75 SHA256 e8ab6d731673ef2abce6de8e8bba8ae4718fb88bb17fb335bb49581dc4aba694 MISC metadata.xml 243 RMD160 61a73b3edc5d56dfe9ee302cc4c70f56a96eed78 SHA1 00fc0791a913c7c2a57718c9019f6ec0cf582326 SHA256 89106787a5945407ba66d216c4d1ade48c419f09c5f13933be3bb92657dad8b0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk690cYACgkQknrdDGLu8JCAuwD9FVEE/ssWxY63RrezUrdrnJJK -rRuW61egkXCpuwZk38MA/3eIYhSCXbABs8pnIIxArGIjg82hxAEpeiDszywA3nGe -=09Ma +iF4EAREIAAYFAk7AQZoACgkQknrdDGLu8JC71AEAhc+aR3wnBgSjJiGmKLKrSF23 +HmLGO5oMOsGj0g2n32cA/3041OV0iu7R1Ee/UPj08a2er44xg04lnsYItcZlHtb0 +=1dUA -----END PGP SIGNATURE----- diff --git a/games-simulation/crrcsim/crrcsim-0.9.11.ebuild b/games-simulation/crrcsim/crrcsim-0.9.11.ebuild index 5aab180b2666..82a71b0aa07a 100644 --- a/games-simulation/crrcsim/crrcsim-0.9.11.ebuild +++ b/games-simulation/crrcsim/crrcsim-0.9.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/crrcsim/crrcsim-0.9.11.ebuild,v 1.2 2011/11/12 01:54:08 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/crrcsim/crrcsim-0.9.11.ebuild,v 1.3 2011/11/13 22:15:50 xmw Exp $ EAPI=3 @@ -23,6 +23,9 @@ DEPEND="${RDEPEND}" src_prepare() { epatch "${FILESDIR}"/${PN}-buildsystem.patch + if built_with_use --missing false sci-mathematics/cgal gmp ; then + epatch "${FILESDIR}"/${PN}-cgal_gmp.patch + fi eautoreconf } diff --git a/games-simulation/crrcsim/files/crrcsim-buildsystem.patch b/games-simulation/crrcsim/files/crrcsim-buildsystem.patch index 824add723a53..774a19379ef8 100644 --- a/games-simulation/crrcsim/files/crrcsim-buildsystem.patch +++ b/games-simulation/crrcsim/files/crrcsim-buildsystem.patch @@ -13,26 +13,3 @@ if (test "x$ac_cv_header_portaudio_h" = "xyes"); then dnl Check for Portaudio 18 -@@ -116,9 +120,11 @@ - fi - AC_SUBST(PA_LIBS) - -+AC_ARG_WITH([sdl], AS_HELP_STRING([--without-sdl], [Build without sdl library (default: test)])) - dnl Search for SDL 1.2.5 or newer - SDL_VERSION=1.2.5 - sdl_mousewheel="yes (SDL >= 1.2.5)" -+AS_IF([test "x$with_foo" != "xno"], [ - AM_PATH_SDL($SDL_VERSION,:,AC_MSG_NOTICE([*** SDL version $SDL_VERSION or newer not found! See if at least 1.2.0 is present...])) - if test "x$no_sdl" = "xyes" - then -@@ -129,6 +135,10 @@ - AC_DEFINE([SDL_WITHOUT_MOUSEWHEEL], [1], [SDL < 1.2.5 did not feature mousewheel button macros]) - sdl_mousewheel="no (SDL < 1.2.5)" - fi -+]) -+AS_IF([test "x$with_foo" != "xyes"], [ -+ AC_DEFINE([SDL_WITHOUT_MOUSEWHEEL], [1], [SDL disabled]) -+]) - AC_SUBST(SDL_LIBS) - AC_SUBST(SDL_CFLAGS) - diff --git a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch new file mode 100644 index 000000000000..10d6bff6b769 --- /dev/null +++ b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch @@ -0,0 +1,11 @@ +--- crrcsim-0.9.11/configure.ac ++++ crrcsim-0.9.11/configure.ac +@@ -229,7 +229,7 @@ + has_CGAL="yes (found CGAL v3)" + fi + CGAL_CFLAGS=-frounding-math +- CGAL_LIBS=-lCGAL ++ CGAL_LIBS="-lCGAL -lgmp" + AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable]) + else + has_CGAL="no (CGAL not found)" -- cgit v1.2.3-65-gdbad