diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /dev-games | |
parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) |
gentoo resync : 06.08.2019
Diffstat (limited to 'dev-games')
-rw-r--r-- | dev-games/Manifest.gz | bin | 6402 -> 6237 bytes | |||
-rw-r--r-- | dev-games/openscenegraph/Manifest | 4 | ||||
-rw-r--r-- | dev-games/openscenegraph/openscenegraph-3.5.5.ebuild | 7 | ||||
-rw-r--r-- | dev-games/openscenegraph/openscenegraph-3.6.3.ebuild | 7 | ||||
-rw-r--r-- | dev-games/vamos/Manifest | 9 | ||||
-rw-r--r-- | dev-games/vamos/files/vamos-0.7.1-as-needed.patch | 11 | ||||
-rw-r--r-- | dev-games/vamos/files/vamos-0.7.1-gcc46.patch | 10 | ||||
-rw-r--r-- | dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch | 378 | ||||
-rw-r--r-- | dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch | 25 | ||||
-rw-r--r-- | dev-games/vamos/metadata.xml | 11 | ||||
-rw-r--r-- | dev-games/vamos/vamos-0.7.1.ebuild | 45 | ||||
-rw-r--r-- | dev-games/vamos/vamos-0.8.2.ebuild | 61 |
12 files changed, 8 insertions, 560 deletions
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz Binary files differindex c602b4223b73..ec1a0d0b2519 100644 --- a/dev-games/Manifest.gz +++ b/dev-games/Manifest.gz diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index d9e553df2a3b..5ded17ade790 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -4,6 +4,6 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 DIST OpenSceneGraph-3.6.3.tar.gz 5784660 BLAKE2B b117a10d7be8fa456d739eb04f218cf9565ea4bd5a91642ada3bde5cc194a71809482ca2e6f2b4ff977fd26f3a855e27392ac60921e4217b72ebd828efa4df0e SHA512 5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322 -EBUILD openscenegraph-3.5.5.ebuild 3789 BLAKE2B a83f1017bd1add8f5b15cddb48dfa22818ad4ab4a109a9755af76b50625623cfca83d0cb4eb3a74b2f22701b1e6126195313671c333bb237b482bb5525dbfb6f SHA512 1587e604a77f4d6ed367eca0aa83a492523a5b1689f766798c8f57109ae4d88fd77f46e02e8a324907e303b31ba1fd9c65e2464a5ea15b67dbfd5d38b4c1a110 -EBUILD openscenegraph-3.6.3.ebuild 4379 BLAKE2B 9c45ab18686e98fafe495d4002c573e53815371c2cf7271cf6cfd2685d583b23d95cb3941a1370572fabae7c8b03014e13f5645b5a165f272b2d71242e1b281f SHA512 445504f7d7f523303faf1ab27ca5a5f81d7635b809a4000bb7b6e3e11abdba40d661cc08812da8b32b37efd738c4dc3265f1c5c3bdc3fc8d614ba216b9a20ff4 +EBUILD openscenegraph-3.5.5.ebuild 3735 BLAKE2B c5c689c98f6246042225f7b85e4695d0d610b65ea86def9500a1ccaa9f5bef419d33cc653d3553ff9149da58a625e2d9d179397303ff6cf0b0c0af0299f900fc SHA512 8b49334b93e1ad3033ffbec3a486705492d2275b266fd942a591b0709d854d24b5cfe65c56a1f3f47d6ddd3d308d646b126e46a4e80a60c7cc44f33b538d21c0 +EBUILD openscenegraph-3.6.3.ebuild 4332 BLAKE2B 5079b814dd8a48ff7200bc5c13b2fde78bdc002ac84e3ff06a858354df846aef29c94c3a97acba3699b42ad3151e0e0932fd289bc08a050a5b31f17380fd67ef SHA512 7b4ade8fc4403b491a8c784003874128119a78676a5102534575e3d7d772589243dd3b3e88a6e87b5a99fff0674dc9a14c07f480ce8b043e0772460d2b048af8 MISC metadata.xml 1661 BLAKE2B 6846485027ea4fb4ba5994c4003d09f0f3929217f4f7140853776db0afe52988075bda496e29148a878ef941fe76decf2f480a8df7e87c50a8015e86b2e27e83 SHA512 e6e1f87c7322bd16929804e403f62204575a1bc6aa68e2aa22e802282ca4d547a0d30425bcf9b4caec2a618c30b2f1635f5a6c3fc816ed12f607d82b0f383789 diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index 7b066c0abf2c..29582ffe9098 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86" IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg -jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff +las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib" REQUIRED_USE="sdl2? ( sdl )" @@ -49,7 +49,6 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( @@ -112,7 +111,7 @@ src_configure() { -DWITH_GLIB=$(usex gstreamer) -DWITH_GtkGl=$(usex gtk) -DWITH_JPEG=$(usex jpeg) - -DWITH_Jasper=$(usex jpeg2k) + -DWITH_Jasper=OFF -DWITH_LIBLAS=$(usex las) -DWITH_Lua=$(usex lua) -DWITH_OpenEXR=$(usex openexr) diff --git a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild index b1bbf9578d9a..995535e2ff3c 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" IUSE="asio curl debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg -jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff +las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr zlib" REQUIRED_USE="sdl2? ( sdl )" @@ -49,7 +49,6 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( @@ -114,7 +113,7 @@ src_configure() { $(cmake-utils_use_find_package gstreamer GStreamer) $(cmake-utils_use_find_package gtk GtkGl) $(cmake-utils_use_find_package jpeg JPEG) - $(cmake-utils_use_find_package jpeg2k Jasper) + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON $(cmake-utils_use_find_package las LIBLAS) $(cmake-utils_use_find_package lua Lua51) -DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest deleted file mode 100644 index 4dc668a06482..000000000000 --- a/dev-games/vamos/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX vamos-0.7.1-as-needed.patch 468 BLAKE2B bdb8cbb21fe89114e45cbdacab2283d97998b8ac476745eb458a72cf5d8bcd9386c94cf4e4c58aaf74146341ed29e6d0e11a1aa84afda003bfca30508579acff SHA512 e06aca9c628b6fd58b63c1808c52d2222b4f99ccde17c07ffb5c6ef0895a940de37ffc36d4d8fe1c382a71b2d3b4ce49007a301903ff6713ebbc34f5871bc164 -AUX vamos-0.7.1-gcc46.patch 246 BLAKE2B 8db281bd4df2a8ace91b844935128ed02f4702892251bb80d8baeaff5588bc9dda616de451d3f73517490e6153d4aed1f27aef731090dbee1f7cf68c84aaf0f1 SHA512 0ae32707a87d94ba5f1bf3dc085e8109fc1b0f8bc4cf7bdf3997d7b47e65ebc10cbdee667d076cff41f65c461a16519f8615b5b704be66d6863aadd5a971e11b -AUX vamos-0.8.2-fix-buildsystem.patch 9650 BLAKE2B 3ece75ea7415c77aff65edf63ce1be39ddce908826b5bcea0e4eb02a8f92277ade29c076976944a14c494478683de3da8887640cf513a0421f0631f505078f42 SHA512 147cc9f7ecf918dd92da85903a4ec6055ae97b45a9850c3c190e72f7f2d3eaaf43c45b155d2e2629d4e4e08cb08463073f27b2d3fa6f0e741055479d64307ba4 -AUX vamos-0.8.2-fix-c++14.patch 554 BLAKE2B 4b45082dee29de037d9e6bfffb025b0f3cc9e914445e4c3e08f5a5c50a891ed179f2c9428a6cc7477664d468958f8933a0b8a78867e3da33b8e756b41b109b43 SHA512 b5fb978bfa0a1d3d7986800e3a9d83bd7eb92b2f6b0060f171d4f388acac3714e397cc966641fbe70297534849010081a8d58b7d3eea6549625f952d3fe81179 -DIST vamos-0.7.1.tar.gz 1681074 BLAKE2B 6d7c132fc65d1ba59c12d98699e82bd4d6029c0f6bb88e2c661d14ab602dc3aa0fe15b30cb8cc70d5b4c7e81f9d5a27c96b53f450098fb164806618d0ed7d35b SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2 -DIST vamos-0.8.2.tar.gz 2148278 BLAKE2B a8afa661295bd646c0ee1d826dcee452f9788ecea7364116b0026f4950286280ef57d1b0179cb51b5f54c2788ca66f16b97bbc07142e0c92468638ebfbd81975 SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880 -EBUILD vamos-0.7.1.ebuild 887 BLAKE2B 36d4484d093b3b7dc8c378d3282ff5d47f2067fcf891a4db51a07c4aa5de8509f6243295374c0aa9ff85ab0938d1db5217754750dac335f4fadb4a9bb4de0249 SHA512 785311b6f0e3fecfbca8b0151fbb8ca2981c880d8eb2776deea9114faa4dda9acffe21eb87ab9225296c9c82ab3359e732a4f9e44e09c4c6efb42dbab8328fda -EBUILD vamos-0.8.2.ebuild 1196 BLAKE2B c85dbd56914b8eae3f1ba8dfa2d652682f5733102fd56f8c496d7ec79f15cf44c7dbdabd4d7aff62d398b4c13d8d85bb56e1ab5f08469cdbfb42ae7af3b6abff SHA512 c5f55f474b2768db75090e0dcfae8f19f5c2fc62b4094d92009f13243c832204193e25309d762b62c678e085f9c675a0e81be93fa6939a6e773de1f516ee7e85 -MISC metadata.xml 328 BLAKE2B 2c3269c4159fb3bb89b8e5c119844f960236e72bbd22915a44b901293d040f8c3e65d28e0a84e0075ed870bfb7c52d919c9aebd3456e93c7ed9ed2e2f91d01f6 SHA512 698c72452fe860f88cff1cb1de6a46902e02fe685081693c2dacbd5c9843fe717128cb9a706849adf19359bba1f809863fe62d569e776649bf5f8b5190663cb4 diff --git a/dev-games/vamos/files/vamos-0.7.1-as-needed.patch b/dev-games/vamos/files/vamos-0.7.1-as-needed.patch deleted file mode 100644 index 868e9318cae8..000000000000 --- a/dev-games/vamos/files/vamos-0.7.1-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vamos-0.7.0.orig/media/Makefile.in -+++ vamos-0.7.0/media/Makefile.in -@@ -71,7 +71,7 @@ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" - LTLIBRARIES = $(lib_LTLIBRARIES) --libvamos_media_la_LIBADD = -+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la - am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo \ - XML_Parser.lo - libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS) diff --git a/dev-games/vamos/files/vamos-0.7.1-gcc46.patch b/dev-games/vamos/files/vamos-0.7.1-gcc46.patch deleted file mode 100644 index bf2ec3c6f6aa..000000000000 --- a/dev-games/vamos/files/vamos-0.7.1-gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- vamos-0.7.1.orig/geometry/Parameter.h -+++ vamos-0.7.1/geometry/Parameter.h -@@ -21,6 +21,7 @@ - #define PARAMETER_H - - #include <vector> -+#include <cstddef> - - /// A container for numbers passed from the command line. - namespace Vamos_Geometry diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch b/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch deleted file mode 100644 index f78ac1c4f055..000000000000 --- a/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch +++ /dev/null @@ -1,378 +0,0 @@ -Fix buildsystem: -* Prevent pollution of python site-packages root dir -* Fix underlinking in modules -* Remove broken AX_* macros -* Add workaround for parallel install issue with automake - ---- a/body/Makefile.am -+++ b/body/Makefile.am -@@ -21,6 +21,10 @@ - Tire.cc \ - Transmission.cc \ - Wheel.cc -+libvamos_body_la_LIBADD = \ -+ -l$(BOOST_PYTHON_LIB) \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la - - pkginclude_HEADERS = \ - Aerodynamic_Device.h \ -@@ -46,24 +50,23 @@ - - EXTRA_DIST = $(pkginclude_HEADERS) - --AM_CXXFLAGS = -fPIC -Wall -pedantic -+AM_CXXFLAGS = -Wall -pedantic -+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) - - # Python Module - if HAVE_PYTHON --pyexec_LTLIBRARIES = body.la -+pkgpyexec_LTLIBRARIES = body.la - else --pyexec_LTLIBRARIES = -+pkgpyexec_LTLIBRARIES = - endif - - body_la_SOURCES = bp-body.cc --body_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) - body_la_LDFLAGS = -avoid-version -module - body_la_LIBADD = \ -- $(top_srcdir)/body/libvamos-body.la \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -- -l$(PYTHON_LIB) \ -- -l$(BOOST_PYTHON_LIB) -+ libvamos-body.la \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la \ -+ $(PYTHON_LIBS) - - if DO_UNIT_TESTS - UNIT_TESTS = \ -@@ -81,7 +84,7 @@ - test_Aerodynamic_Device_SOURCES = test_Aerodynamic_Device.cc - test_Aerodynamic_Device_CXXFLAGS = -DBOOST_TEST_DYN_LINK - test_Aerodynamic_Device_LDADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -+ ../geometry/libvamos-geometry.la \ - Frame.lo \ - Particle.lo \ - Aerodynamic_Device.lo \ -@@ -89,35 +92,35 @@ - test_Car_SOURCES = test_Car.cc - test_Car_CXXFLAGS = -DBOOST_TEST_DYN_LINK - test_Car_LDADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -- $(top_srcdir)/body/libvamos-body.la \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la \ -+ ../body/libvamos-body.la \ - -lboost_unit_test_framework - test_Frame_SOURCES = test_Frame.cc - test_Frame_CXXFLAGS = -DBOOST_TEST_DYN_LINK - test_Frame_LDADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -+ ../geometry/libvamos-geometry.la \ - Frame.lo \ - -lboost_unit_test_framework - test_Particle_SOURCES = test_Particle.cc - test_Particle_CXXFLAGS = -DBOOST_TEST_DYN_LINK - test_Particle_LDADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -+ ../geometry/libvamos-geometry.la \ - Frame.lo \ - Particle.lo \ - -lboost_unit_test_framework - test_Rigid_Body_SOURCES = test_Rigid_Body.cc - test_Rigid_Body_CXXFLAGS = -DBOOST_TEST_DYN_LINK - test_Rigid_Body_LDADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -- $(top_srcdir)/body/libvamos-body.la \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la \ -+ ../body/libvamos-body.la \ - -lboost_unit_test_framework - - if DO_UNIT_TESTS - check-local: $(UNIT_TESTS) - for test in $(UNIT_TESTS); do \ - echo $$test; \ -- $(top_srcdir)/body/$$test; \ -+ ../body/$$test; \ - done - endif ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,7 @@ - AC_PROG_INSTALL - AC_PROG_MAKE_SET - --AC_PROG_LIBTOOL -+LT_INIT - - AC_PATH_X - -@@ -28,9 +28,6 @@ - - AC_CONFIG_FILES([vamos/vamos], [chmod +x vamos/vamos]) - --dnl Python --AX_PYTHON -- - dnl Boost - AX_BOOST_BASE([1.46.0],, AC_MSG_ERROR([Boost >= v1.46.0 is required.])) - AX_BOOST_PYTHON([1.46.0]) ---- a/geometry/Makefile.am -+++ b/geometry/Makefile.am -@@ -15,6 +15,7 @@ - Three_Vector.cc \ - Two_Vector.cc \ - Parameter.cc -+libvamos_geometry_la_LIBADD = -l$(BOOST_PYTHON_LIB) - - pkginclude_HEADERS = \ - Calculations.h \ -@@ -39,22 +40,21 @@ - - EXTRA_DIST = $(pkginclude_HEADERS) - --AM_CXXFLAGS = -fPIC -Wall -pedantic -+AM_CXXFLAGS = -Wall -pedantic -+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) - - # Python Module - if HAVE_PYTHON --pyexec_LTLIBRARIES = geometry.la -+pkgpyexec_LTLIBRARIES = geometry.la - else --pyexec_LTLIBRARIES = -+pkgpyexec_LTLIBRARIES = - endif - - geometry_la_SOURCES = bp-geometry.cc --geometry_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) - geometry_la_LDFLAGS = -avoid-version -module - geometry_la_LIBADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- -l$(PYTHON_LIB) \ -- -l$(BOOST_PYTHON_LIB) -+ libvamos-geometry.la \ -+ $(PYTHON_LIBS) - - # Unit Tests - if DO_UNIT_TESTS -@@ -110,6 +110,6 @@ - check-local: $(UNIT_TESTS) - for test in $(UNIT_TESTS); do \ - echo $$test; \ -- $(top_srcdir)/geometry/$$test; \ -+ ../geometry/$$test; \ - done - endif ---- a/media/Makefile.am -+++ b/media/Makefile.am -@@ -7,6 +7,7 @@ - Texture_Image.cc \ - Two_D.cc \ - XML_Parser.cc -+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la - - pkginclude_HEADERS = \ - Ac3d.h \ -@@ -19,23 +20,27 @@ - - EXTRA_DIST = $(pkginclude_HEADERS) - --AM_CXXFLAGS = -fPIC -Wall -pedantic -+AM_CXXFLAGS = -Wall -pedantic -+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) - - # Python Module - if HAVE_PYTHON --pyexec_LTLIBRARIES = media.la -+pkgpyexec_LTLIBRARIES = media.la - else --pyexec_LTLIBRARIES = -+pkgpyexec_LTLIBRARIES = - endif - - media_la_SOURCES = bp-media.cc --media_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) - media_la_LDFLAGS = -avoid-version -module - media_la_LIBADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -- -l$(PYTHON_LIB) \ -- -l$(BOOST_PYTHON_LIB) -+ ../geometry/libvamos-geometry.la \ -+ libvamos-media.la \ -+ $(PYTHON_LIBS) -+ -+# workaround for broken parallel install support in automake with LTLIBRARIES -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 -+install_pkgpyexecLTLIBRARIES = install-pkgpyexecLTLIBRARIES -+$(install_pkgpyexecLTLIBRARIES): install-libLTLIBRARIES - - # Unit Tests - if DO_UNIT_TESTS -@@ -54,6 +59,6 @@ - check-local: $(UNIT_TESTS) - for test in $(UNIT_TESTS); do \ - echo $$test; \ -- $(top_srcdir)/media/$$test; \ -+ ../media/$$test; \ - done - endif ---- a/track/Makefile.am -+++ b/track/Makefile.am -@@ -6,6 +6,9 @@ - Road_Segment.cc \ - Strip_Track.cc \ - Strip_Track_Reader.cc -+libvamos_track_la_LIBADD = \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la - - pkginclude_HEADERS = \ - Gl_Road_Segment.h \ -@@ -17,24 +20,23 @@ - - EXTRA_DIST = $(pkginclude_HEADERS) - --AM_CXXFLAGS = -fPIC -Wall -pedantic -+AM_CXXFLAGS = -Wall -pedantic -+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) - - # Python Module - if HAVE_PYTHON --pyexec_LTLIBRARIES = track.la -+pkgpyexec_LTLIBRARIES = track.la - else --pyexec_LTLIBRARIES = -+pkgpyexec_LTLIBRARIES = - endif - - track_la_SOURCES = bp-track.cc --track_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) - track_la_LDFLAGS = -avoid-version -module - track_la_LIBADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -- $(top_srcdir)/track/libvamos-track.la \ -- -l$(PYTHON_LIB) \ -- -l$(BOOST_PYTHON_LIB) -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la \ -+ libvamos-track.la \ -+ $(PYTHON_LIBS) - - # Unit Tests - if DO_UNIT_TESTS -@@ -50,14 +52,14 @@ - test_Road_Segment_SOURCES = test_Road_Segment.cc - test_Road_Segment_CXXFLAGS = -DBOOST_TEST_DYN_LINK - test_Road_Segment_LDADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -+ ../geometry/libvamos-geometry.la \ - Road_Segment.lo \ - -lboost_unit_test_framework - test_Strip_Track_SOURCES = test_Strip_Track.cc - test_Strip_Track_CXXFLAGS = -DBOOST_TEST_DYN_LINK - test_Strip_Track_LDADD = \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la \ - Road_Segment.lo \ - Gl_Road_Segment.lo \ - Strip_Track.lo \ -@@ -68,6 +70,6 @@ - check-local: $(UNIT_TESTS) - for test in $(UNIT_TESTS); do \ - echo $$test; \ -- $(top_srcdir)/track/$$test; \ -+ ../track/$$test; \ - done - endif ---- a/vamos/Makefile.am -+++ b/vamos/Makefile.am -@@ -9,12 +9,12 @@ - EXTRA_DIST = Options.h - - cvamos_LDADD = \ -- $(top_srcdir)/world/libvamos-world.la \ -- $(top_srcdir)/body/libvamos-body.la \ -- $(top_srcdir)/track/libvamos-track.la \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -+ ../world/libvamos-world.la \ -+ ../body/libvamos-body.la \ -+ ../track/libvamos-track.la \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la \ - -lboost_system \ - -lboost_filesystem - --AM_CXXFLAGS = -fPIC -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\" -+AM_CXXFLAGS = -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\" ---- a/world/Makefile.am -+++ b/world/Makefile.am -@@ -10,6 +10,10 @@ - Sounds.cc \ - Timing_Info.cc \ - World.cc -+libvamos_world_la_LIBADD = \ -+ ../geometry/libvamos-geometry.la \ -+ ../track/libvamos-track.la \ -+ ../body/libvamos-body.la - - pkginclude_HEADERS = \ - Atmosphere.h \ -@@ -26,26 +30,25 @@ - - EXTRA_DIST = $(pkginclude_HEADERS) - --AM_CXXFLAGS = -fPIC -Wall -pedantic -+AM_CXXFLAGS = -Wall -pedantic -+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) - - # Python Module - if HAVE_PYTHON --pyexec_LTLIBRARIES = world.la -+pkgpyexec_LTLIBRARIES = world.la - else --pyexec_LTLIBRARIES = -+pkgpyexec_LTLIBRARIES = - endif - - world_la_SOURCES = bp-world.cc --world_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) - world_la_LDFLAGS = -avoid-version -module - world_la_LIBADD = \ -- $(top_srcdir)/body/libvamos-body.la \ -- $(top_srcdir)/geometry/libvamos-geometry.la \ -- $(top_srcdir)/media/libvamos-media.la \ -- $(top_srcdir)/track/libvamos-track.la \ -- $(top_srcdir)/world/libvamos-world.la \ -- -l$(PYTHON_LIB) \ -- -l$(BOOST_PYTHON_LIB) -+ ../body/libvamos-body.la \ -+ ../geometry/libvamos-geometry.la \ -+ ../media/libvamos-media.la \ -+ ../track/libvamos-track.la \ -+ libvamos-world.la \ -+ $(PYTHON_LIBS) - - # Unit Tests - if DO_UNIT_TESTS -@@ -67,6 +70,6 @@ - check-local: $(UNIT_TESTS) - for test in $(UNIT_TESTS); do \ - echo $$test; \ -- $(top_srcdir)/world/$$test; \ -+ ../world/$$test; \ - done - endif diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch b/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch deleted file mode 100644 index 95c90995f194..000000000000 --- a/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix building in C++14 mode. -See also: https://bugs.gentoo.org/show_bug.cgi?id=600774 - ---- a/media/Ac3d.cc -+++ b/media/Ac3d.cc -@@ -892,7 +892,7 @@ - m_rotation (rotation) - { - std::ifstream is (m_file.c_str ()); -- if (is == 0) -+ if (!is) - { - throw No_File (m_file); - } ---- a/media/XML_Parser.cc -+++ b/media/XML_Parser.cc -@@ -391,7 +391,7 @@ - { - m_file = file; - mp_stream = new std::ifstream (file.c_str ()); -- if ((mp_stream == 0) || (*mp_stream == 0)) -+ if ((mp_stream == NULL) || (!(*mp_stream))) - { - throw No_XML_File (m_file); - } diff --git a/dev-games/vamos/metadata.xml b/dev-games/vamos/metadata.xml deleted file mode 100644 index 56d1bba2cf08..000000000000 --- a/dev-games/vamos/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">vamos</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-games/vamos/vamos-0.7.1.ebuild b/dev-games/vamos/vamos-0.7.1.ebuild deleted file mode 100644 index c057f2d8e74e..000000000000 --- a/dev-games/vamos/vamos-0.7.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="an automotive simulation framework" -HOMEPAGE="http://vamos.sourceforge.net/" -SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs" - -RDEPEND="virtual/opengl - virtual/glu - media-libs/freeglut - media-libs/libpng:0 - media-libs/libsdl[joystick,video] - media-libs/openal - dev-libs/boost - media-libs/freealut" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-as-needed.patch \ - "${FILESDIR}"/${P}-gcc46.patch -} - -src_configure() { - econf \ - --disable-unit-tests \ - $(use_enable static-libs static) -} - -src_install() { - default - dobin caelum/.libs/caelum - newdoc caelum/README README.caelum - dodoc AUTHORS ChangeLog README TODO - prune_libtool_files -} diff --git a/dev-games/vamos/vamos-0.8.2.ebuild b/dev-games/vamos/vamos-0.8.2.ebuild deleted file mode 100644 index ef0530a204c7..000000000000 --- a/dev-games/vamos/vamos-0.8.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) - -inherit autotools python-single-r1 - -DESCRIPTION="An automotive simulation framework" -HOMEPAGE="http://vamos.sourceforge.net/" -SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - media-libs/freealut - media-libs/freeglut - media-libs/libpng:0= - media-libs/libsdl[joystick,video] - media-libs/openal - virtual/glu - virtual/opengl" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2016.09.16 - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.2-fix-buildsystem.patch - "${FILESDIR}"/${PN}-0.8.2-fix-c++14.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --with-x \ - --disable-static \ - --with-boost-python="${EPYTHON#python}" \ - $(use_enable test unit-tests) \ - PYTHON="${EPYTHON}" -} - -src_install() { - MAKEOPTS="${MAKEOPTS} -j1" default #646014 - - dobin caelum/.libs/caelum - newdoc caelum/README README.caelum - - find "${D}" -name '*.la' -delete || die -} |