summaryrefslogtreecommitdiff
path: root/dev-games/vamos
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
commit8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-games/vamos
parent30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-games/vamos')
-rw-r--r--dev-games/vamos/Manifest9
-rw-r--r--dev-games/vamos/files/vamos-0.7.1-as-needed.patch11
-rw-r--r--dev-games/vamos/files/vamos-0.7.1-gcc46.patch10
-rw-r--r--dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch378
-rw-r--r--dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch25
-rw-r--r--dev-games/vamos/metadata.xml11
-rw-r--r--dev-games/vamos/vamos-0.7.1.ebuild45
-rw-r--r--dev-games/vamos/vamos-0.8.2.ebuild61
8 files changed, 550 insertions, 0 deletions
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest
new file mode 100644
index 000000000000..6e5cf2e92edb
--- /dev/null
+++ b/dev-games/vamos/Manifest
@@ -0,0 +1,9 @@
+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 1201 BLAKE2B e7243562ff19b9ef98838af1833b6b0f20078d41579ee0f5d869bdbdd29551cc78d40bc62b534cb125a51c31d760707c7f2b2f7ce09c0c36eac2bfaf0e403574 SHA512 d1e997a6d90e25aee6e70309a1e1936df96581d72c3c38f45d6a6ac0e197be489ab3d8956e3a581f17a53fe4a64bd386c92f555789d46c733df9f41bc16faf25
+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
new file mode 100644
index 000000000000..868e9318cae8
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.7.1-as-needed.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..bf2ec3c6f6aa
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.7.1-gcc46.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..f78ac1c4f055
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch
@@ -0,0 +1,378 @@
+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
new file mode 100644
index 000000000000..95c90995f194
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000000..56d1bba2cf08
--- /dev/null
+++ b/dev-games/vamos/metadata.xml
@@ -0,0 +1,11 @@
+<?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
new file mode 100644
index 000000000000..c057f2d8e74e
--- /dev/null
+++ b/dev-games/vamos/vamos-0.7.1.ebuild
@@ -0,0 +1,45 @@
+# 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
new file mode 100644
index 000000000000..51a6149d8609
--- /dev/null
+++ b/dev-games/vamos/vamos-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,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
+}