reinit the tree, so we can have metadata

8 files changed, 552 insertions, 0 deletions

diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest
new file mode 100644
index 000000000000..f743ceac75e7
--- /dev/null
+++ b/dev-games/vamos/Manifest
@@ -0,0 +1,11 @@
+AUX vamos-0.7.1-as-needed.patch 468 SHA256 cf2d4760c9a9a52f9dadf6569e6030b637327c932de846616c925d58ec7f237d SHA512 e06aca9c628b6fd58b63c1808c52d2222b4f99ccde17c07ffb5c6ef0895a940de37ffc36d4d8fe1c382a71b2d3b4ce49007a301903ff6713ebbc34f5871bc164 WHIRLPOOL 23ea8acbcd215f918aa4274adb4d3514d67281d33f7b1f3d85827f2768b4569f499b657f6dafc133c303f6c739c9fe3c766d28e927ef032d86503cebbc57e692
+AUX vamos-0.7.1-gcc46.patch 246 SHA256 4742492fb9ed4f06a866836030e56ea485c1f8caad4284c000e958212a6897a0 SHA512 0ae32707a87d94ba5f1bf3dc085e8109fc1b0f8bc4cf7bdf3997d7b47e65ebc10cbdee667d076cff41f65c461a16519f8615b5b704be66d6863aadd5a971e11b WHIRLPOOL 010224cf5148275693cb9766f0a860aeed39d323db8c3055de951b81bb2663290f2e741ea82136ea73317dc560dfcc6a4cbc3f4d62bbcf38676dd27e5e8349fb
+AUX vamos-0.8.2-fix-buildsystem.patch 9650 SHA256 2be370537209123089fd28ec4f1429013585f8e7cd901c3838c50aec3b9e4924 SHA512 147cc9f7ecf918dd92da85903a4ec6055ae97b45a9850c3c190e72f7f2d3eaaf43c45b155d2e2629d4e4e08cb08463073f27b2d3fa6f0e741055479d64307ba4 WHIRLPOOL 0895819450a43b68195003d22b46d0773f04d8f1235ea021c25a37d05e09c76b0e78f198efb4fc95337da07cb0c98701a2cc98c581f9da0cba1c6fd1b7943e02
+AUX vamos-0.8.2-fix-c++14.patch 554 SHA256 e6b9ae145ea1113afd9b71cf60814d3098bd34aad27587380b6a39b0ba814054 SHA512 b5fb978bfa0a1d3d7986800e3a9d83bd7eb92b2f6b0060f171d4f388acac3714e397cc966641fbe70297534849010081a8d58b7d3eea6549625f952d3fe81179 WHIRLPOOL 98756e1ca49eaf7c54a9aa1f6340829a92588450cacb6c02d1be84fa294fc84b41310a967c38d10547724a8e37c13d1793bce752c68e425d78571fe104fe0c07
+DIST vamos-0.7.1.tar.gz 1681074 SHA256 c81930b5ea376431c0abf868bf23153440eb6c44c1c47e3d9a53a5a15ab35824 SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2 WHIRLPOOL 925b0038ae1638d270f54b7fee81526589bb4e2a67817834d17678063d2587da753d4e75237d610c4c111fabb1fcdb6b6e42417893f78245cd5f04100d7ada09
+DIST vamos-0.8.2.tar.gz 2148278 SHA256 d4c2d16b4947b5afc46b4f5dcf797d11173ed86b4a599e78223c227a882b8f1d SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880 WHIRLPOOL 75173076be9739282d56713517a1083155f57b2c4cf5a5379a61de952613671a0fd03820a48682082d29c98c7b44bebfef86d17ab9164b5d8b43e1a522bab36e
+EBUILD vamos-0.7.1.ebuild 887 SHA256 5493ba29decbbe5ebb3c31e82a171e8846420aad67d8195c661c789129ef67e4 SHA512 785311b6f0e3fecfbca8b0151fbb8ca2981c880d8eb2776deea9114faa4dda9acffe21eb87ab9225296c9c82ab3359e732a4f9e44e09c4c6efb42dbab8328fda WHIRLPOOL f4ff806f7a09dc8619a6c094d7e8dfb4230385025d19f9adff7376a69c0e7c18c44fb2fff8f23e4fca78691c747d4420241d0b29d8ba539d10bd429f144c80f7
+EBUILD vamos-0.8.2.ebuild 1166 SHA256 7c22f5bb6d3fed01392b64f2c903e8c43857d7ecbbecc4fcd177e0dce721ac5a SHA512 260c7eb011f3b7f66c800930592077ef7f91e9e7c9267825307d3075333ecfde78d334f98f922d745e9d4660e0c06f90c7337671dba7798aaf471d73cc935097 WHIRLPOOL fabaa38f071b67296ddafff5bdc4a0e596755b29f0336e8eb006f6ea968a1a78eb3a1bcb1ff1be8b30a0e0432a03955b6bc918502d3310e16c5d47631d73d4ec
+MISC ChangeLog 2492 SHA256 09da7ae9837c13b5336bf645151b7e41da7116446a65019d625aab0cf86f8aed SHA512 7721bbc13525fe0f68b67e359899dbf7f4a0d83b0baa57b0be4413d5dbbaa6151711be80bc903040db0d3893e0c49fb1215e42f51e763705694b29fe1d4b5472 WHIRLPOOL fc47f253ba4ef1c1053398fa739991027d0cad31854274ce6939693a9142528682179d3c178b554af287801d248a0434f86f71415924d0ef7aa8eab525e4aeb6
+MISC ChangeLog-2015 3897 SHA256 bca16fed77619404a4687d89132415502e4e2f5df629c1dbaaa96445a9fd7d0b SHA512 c03f7d288799b24d6f5d1fa0d9734f3401e2e130fbc039c303c02405d3663488bc4f7720b77157503a5d9934e1da357073a8203ee7ea7552591df1721cea3c63 WHIRLPOOL 1dcf71c508a0a8421a0b35a6b7f7dfde3da941ed15ff5a8d4a40548532a305084f6b84d48fa0cc6bb2b723adaaf0b8ca4452f06013c19625e878de7405259c14
+MISC metadata.xml 328 SHA256 08658aea6deb64194070163d0b443ec71f79d890d87b9a2a8d8bb1639351edb2 SHA512 698c72452fe860f88cff1cb1de6a46902e02fe685081693c2dacbd5c9843fe717128cb9a706849adf19359bba1f809863fe62d569e776649bf5f8b5190663cb4 WHIRLPOOL 6ad690f33a669c6a424bf28eaee370a522e95409ac050c385c19b2cbbf086941bb3fb71da4a48d1dda29dc8c6dedd7939ea8f56890f50b9b09fac3617cd6e5d7
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..60687c852c86
--- /dev/null
+++ b/dev-games/vamos/vamos-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+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() {
+	default
+
+	dobin caelum/.libs/caelum
+	newdoc caelum/README README.caelum
+
+	find "${D}" -name '*.la' -delete || die
+}