| 1 |
commit: af95aa2cfc893669f48b8dd27b7ad7439a74972c |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 30 20:25:04 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 30 20:25:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af95aa2c |
| 7 |
|
| 8 |
dev-games/vamos: Remove from tree |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/646014 |
| 11 |
Closes: https://bugs.gentoo.org/691162 |
| 12 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-games/vamos/Manifest | 2 - |
| 16 |
dev-games/vamos/files/vamos-0.7.1-as-needed.patch | 11 - |
| 17 |
dev-games/vamos/files/vamos-0.7.1-gcc46.patch | 10 - |
| 18 |
.../vamos/files/vamos-0.8.2-fix-buildsystem.patch | 378 --------------------- |
| 19 |
dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch | 25 -- |
| 20 |
dev-games/vamos/metadata.xml | 11 - |
| 21 |
dev-games/vamos/vamos-0.7.1.ebuild | 45 --- |
| 22 |
dev-games/vamos/vamos-0.8.2.ebuild | 61 ---- |
| 23 |
profiles/package.mask | 6 - |
| 24 |
9 files changed, 549 deletions(-) |
| 25 |
|
| 26 |
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest |
| 27 |
deleted file mode 100644 |
| 28 |
index 1449cf9f133..00000000000 |
| 29 |
--- a/dev-games/vamos/Manifest |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,2 +0,0 @@ |
| 32 |
-DIST vamos-0.7.1.tar.gz 1681074 BLAKE2B 6d7c132fc65d1ba59c12d98699e82bd4d6029c0f6bb88e2c661d14ab602dc3aa0fe15b30cb8cc70d5b4c7e81f9d5a27c96b53f450098fb164806618d0ed7d35b SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2 |
| 33 |
-DIST vamos-0.8.2.tar.gz 2148278 BLAKE2B a8afa661295bd646c0ee1d826dcee452f9788ecea7364116b0026f4950286280ef57d1b0179cb51b5f54c2788ca66f16b97bbc07142e0c92468638ebfbd81975 SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880 |
| 34 |
|
| 35 |
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 |
| 36 |
deleted file mode 100644 |
| 37 |
index 868e9318cae..00000000000 |
| 38 |
--- a/dev-games/vamos/files/vamos-0.7.1-as-needed.patch |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,11 +0,0 @@ |
| 41 |
---- vamos-0.7.0.orig/media/Makefile.in |
| 42 |
-+++ vamos-0.7.0/media/Makefile.in |
| 43 |
-@@ -71,7 +71,7 @@ |
| 44 |
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
| 45 |
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" |
| 46 |
- LTLIBRARIES = $(lib_LTLIBRARIES) |
| 47 |
--libvamos_media_la_LIBADD = |
| 48 |
-+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la |
| 49 |
- am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo \ |
| 50 |
- XML_Parser.lo |
| 51 |
- libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS) |
| 52 |
|
| 53 |
diff --git a/dev-games/vamos/files/vamos-0.7.1-gcc46.patch b/dev-games/vamos/files/vamos-0.7.1-gcc46.patch |
| 54 |
deleted file mode 100644 |
| 55 |
index bf2ec3c6f6a..00000000000 |
| 56 |
--- a/dev-games/vamos/files/vamos-0.7.1-gcc46.patch |
| 57 |
+++ /dev/null |
| 58 |
@@ -1,10 +0,0 @@ |
| 59 |
---- vamos-0.7.1.orig/geometry/Parameter.h |
| 60 |
-+++ vamos-0.7.1/geometry/Parameter.h |
| 61 |
-@@ -21,6 +21,7 @@ |
| 62 |
- #define PARAMETER_H |
| 63 |
- |
| 64 |
- #include <vector> |
| 65 |
-+#include <cstddef> |
| 66 |
- |
| 67 |
- /// A container for numbers passed from the command line. |
| 68 |
- namespace Vamos_Geometry |
| 69 |
|
| 70 |
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 |
| 71 |
deleted file mode 100644 |
| 72 |
index f78ac1c4f05..00000000000 |
| 73 |
--- a/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch |
| 74 |
+++ /dev/null |
| 75 |
@@ -1,378 +0,0 @@ |
| 76 |
-Fix buildsystem: |
| 77 |
-* Prevent pollution of python site-packages root dir |
| 78 |
-* Fix underlinking in modules |
| 79 |
-* Remove broken AX_* macros |
| 80 |
-* Add workaround for parallel install issue with automake |
| 81 |
- |
| 82 |
---- a/body/Makefile.am |
| 83 |
-+++ b/body/Makefile.am |
| 84 |
-@@ -21,6 +21,10 @@ |
| 85 |
- Tire.cc \ |
| 86 |
- Transmission.cc \ |
| 87 |
- Wheel.cc |
| 88 |
-+libvamos_body_la_LIBADD = \ |
| 89 |
-+ -l$(BOOST_PYTHON_LIB) \ |
| 90 |
-+ ../geometry/libvamos-geometry.la \ |
| 91 |
-+ ../media/libvamos-media.la |
| 92 |
- |
| 93 |
- pkginclude_HEADERS = \ |
| 94 |
- Aerodynamic_Device.h \ |
| 95 |
-@@ -46,24 +50,23 @@ |
| 96 |
- |
| 97 |
- EXTRA_DIST = $(pkginclude_HEADERS) |
| 98 |
- |
| 99 |
--AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 100 |
-+AM_CXXFLAGS = -Wall -pedantic |
| 101 |
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 102 |
- |
| 103 |
- # Python Module |
| 104 |
- if HAVE_PYTHON |
| 105 |
--pyexec_LTLIBRARIES = body.la |
| 106 |
-+pkgpyexec_LTLIBRARIES = body.la |
| 107 |
- else |
| 108 |
--pyexec_LTLIBRARIES = |
| 109 |
-+pkgpyexec_LTLIBRARIES = |
| 110 |
- endif |
| 111 |
- |
| 112 |
- body_la_SOURCES = bp-body.cc |
| 113 |
--body_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 114 |
- body_la_LDFLAGS = -avoid-version -module |
| 115 |
- body_la_LIBADD = \ |
| 116 |
-- $(top_srcdir)/body/libvamos-body.la \ |
| 117 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 118 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 119 |
-- -l$(PYTHON_LIB) \ |
| 120 |
-- -l$(BOOST_PYTHON_LIB) |
| 121 |
-+ libvamos-body.la \ |
| 122 |
-+ ../geometry/libvamos-geometry.la \ |
| 123 |
-+ ../media/libvamos-media.la \ |
| 124 |
-+ $(PYTHON_LIBS) |
| 125 |
- |
| 126 |
- if DO_UNIT_TESTS |
| 127 |
- UNIT_TESTS = \ |
| 128 |
-@@ -81,7 +84,7 @@ |
| 129 |
- test_Aerodynamic_Device_SOURCES = test_Aerodynamic_Device.cc |
| 130 |
- test_Aerodynamic_Device_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 131 |
- test_Aerodynamic_Device_LDADD = \ |
| 132 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 133 |
-+ ../geometry/libvamos-geometry.la \ |
| 134 |
- Frame.lo \ |
| 135 |
- Particle.lo \ |
| 136 |
- Aerodynamic_Device.lo \ |
| 137 |
-@@ -89,35 +92,35 @@ |
| 138 |
- test_Car_SOURCES = test_Car.cc |
| 139 |
- test_Car_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 140 |
- test_Car_LDADD = \ |
| 141 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 142 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 143 |
-- $(top_srcdir)/body/libvamos-body.la \ |
| 144 |
-+ ../geometry/libvamos-geometry.la \ |
| 145 |
-+ ../media/libvamos-media.la \ |
| 146 |
-+ ../body/libvamos-body.la \ |
| 147 |
- -lboost_unit_test_framework |
| 148 |
- test_Frame_SOURCES = test_Frame.cc |
| 149 |
- test_Frame_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 150 |
- test_Frame_LDADD = \ |
| 151 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 152 |
-+ ../geometry/libvamos-geometry.la \ |
| 153 |
- Frame.lo \ |
| 154 |
- -lboost_unit_test_framework |
| 155 |
- test_Particle_SOURCES = test_Particle.cc |
| 156 |
- test_Particle_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 157 |
- test_Particle_LDADD = \ |
| 158 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 159 |
-+ ../geometry/libvamos-geometry.la \ |
| 160 |
- Frame.lo \ |
| 161 |
- Particle.lo \ |
| 162 |
- -lboost_unit_test_framework |
| 163 |
- test_Rigid_Body_SOURCES = test_Rigid_Body.cc |
| 164 |
- test_Rigid_Body_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 165 |
- test_Rigid_Body_LDADD = \ |
| 166 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 167 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 168 |
-- $(top_srcdir)/body/libvamos-body.la \ |
| 169 |
-+ ../geometry/libvamos-geometry.la \ |
| 170 |
-+ ../media/libvamos-media.la \ |
| 171 |
-+ ../body/libvamos-body.la \ |
| 172 |
- -lboost_unit_test_framework |
| 173 |
- |
| 174 |
- if DO_UNIT_TESTS |
| 175 |
- check-local: $(UNIT_TESTS) |
| 176 |
- for test in $(UNIT_TESTS); do \ |
| 177 |
- echo $$test; \ |
| 178 |
-- $(top_srcdir)/body/$$test; \ |
| 179 |
-+ ../body/$$test; \ |
| 180 |
- done |
| 181 |
- endif |
| 182 |
---- a/configure.ac |
| 183 |
-+++ b/configure.ac |
| 184 |
-@@ -19,7 +19,7 @@ |
| 185 |
- AC_PROG_INSTALL |
| 186 |
- AC_PROG_MAKE_SET |
| 187 |
- |
| 188 |
--AC_PROG_LIBTOOL |
| 189 |
-+LT_INIT |
| 190 |
- |
| 191 |
- AC_PATH_X |
| 192 |
- |
| 193 |
-@@ -28,9 +28,6 @@ |
| 194 |
- |
| 195 |
- AC_CONFIG_FILES([vamos/vamos], [chmod +x vamos/vamos]) |
| 196 |
- |
| 197 |
--dnl Python |
| 198 |
--AX_PYTHON |
| 199 |
-- |
| 200 |
- dnl Boost |
| 201 |
- AX_BOOST_BASE([1.46.0],, AC_MSG_ERROR([Boost >= v1.46.0 is required.])) |
| 202 |
- AX_BOOST_PYTHON([1.46.0]) |
| 203 |
---- a/geometry/Makefile.am |
| 204 |
-+++ b/geometry/Makefile.am |
| 205 |
-@@ -15,6 +15,7 @@ |
| 206 |
- Three_Vector.cc \ |
| 207 |
- Two_Vector.cc \ |
| 208 |
- Parameter.cc |
| 209 |
-+libvamos_geometry_la_LIBADD = -l$(BOOST_PYTHON_LIB) |
| 210 |
- |
| 211 |
- pkginclude_HEADERS = \ |
| 212 |
- Calculations.h \ |
| 213 |
-@@ -39,22 +40,21 @@ |
| 214 |
- |
| 215 |
- EXTRA_DIST = $(pkginclude_HEADERS) |
| 216 |
- |
| 217 |
--AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 218 |
-+AM_CXXFLAGS = -Wall -pedantic |
| 219 |
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 220 |
- |
| 221 |
- # Python Module |
| 222 |
- if HAVE_PYTHON |
| 223 |
--pyexec_LTLIBRARIES = geometry.la |
| 224 |
-+pkgpyexec_LTLIBRARIES = geometry.la |
| 225 |
- else |
| 226 |
--pyexec_LTLIBRARIES = |
| 227 |
-+pkgpyexec_LTLIBRARIES = |
| 228 |
- endif |
| 229 |
- |
| 230 |
- geometry_la_SOURCES = bp-geometry.cc |
| 231 |
--geometry_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 232 |
- geometry_la_LDFLAGS = -avoid-version -module |
| 233 |
- geometry_la_LIBADD = \ |
| 234 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 235 |
-- -l$(PYTHON_LIB) \ |
| 236 |
-- -l$(BOOST_PYTHON_LIB) |
| 237 |
-+ libvamos-geometry.la \ |
| 238 |
-+ $(PYTHON_LIBS) |
| 239 |
- |
| 240 |
- # Unit Tests |
| 241 |
- if DO_UNIT_TESTS |
| 242 |
-@@ -110,6 +110,6 @@ |
| 243 |
- check-local: $(UNIT_TESTS) |
| 244 |
- for test in $(UNIT_TESTS); do \ |
| 245 |
- echo $$test; \ |
| 246 |
-- $(top_srcdir)/geometry/$$test; \ |
| 247 |
-+ ../geometry/$$test; \ |
| 248 |
- done |
| 249 |
- endif |
| 250 |
---- a/media/Makefile.am |
| 251 |
-+++ b/media/Makefile.am |
| 252 |
-@@ -7,6 +7,7 @@ |
| 253 |
- Texture_Image.cc \ |
| 254 |
- Two_D.cc \ |
| 255 |
- XML_Parser.cc |
| 256 |
-+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la |
| 257 |
- |
| 258 |
- pkginclude_HEADERS = \ |
| 259 |
- Ac3d.h \ |
| 260 |
-@@ -19,23 +20,27 @@ |
| 261 |
- |
| 262 |
- EXTRA_DIST = $(pkginclude_HEADERS) |
| 263 |
- |
| 264 |
--AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 265 |
-+AM_CXXFLAGS = -Wall -pedantic |
| 266 |
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 267 |
- |
| 268 |
- # Python Module |
| 269 |
- if HAVE_PYTHON |
| 270 |
--pyexec_LTLIBRARIES = media.la |
| 271 |
-+pkgpyexec_LTLIBRARIES = media.la |
| 272 |
- else |
| 273 |
--pyexec_LTLIBRARIES = |
| 274 |
-+pkgpyexec_LTLIBRARIES = |
| 275 |
- endif |
| 276 |
- |
| 277 |
- media_la_SOURCES = bp-media.cc |
| 278 |
--media_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 279 |
- media_la_LDFLAGS = -avoid-version -module |
| 280 |
- media_la_LIBADD = \ |
| 281 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 282 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 283 |
-- -l$(PYTHON_LIB) \ |
| 284 |
-- -l$(BOOST_PYTHON_LIB) |
| 285 |
-+ ../geometry/libvamos-geometry.la \ |
| 286 |
-+ libvamos-media.la \ |
| 287 |
-+ $(PYTHON_LIBS) |
| 288 |
-+ |
| 289 |
-+# workaround for broken parallel install support in automake with LTLIBRARIES |
| 290 |
-+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 |
| 291 |
-+install_pkgpyexecLTLIBRARIES = install-pkgpyexecLTLIBRARIES |
| 292 |
-+$(install_pkgpyexecLTLIBRARIES): install-libLTLIBRARIES |
| 293 |
- |
| 294 |
- # Unit Tests |
| 295 |
- if DO_UNIT_TESTS |
| 296 |
-@@ -54,6 +59,6 @@ |
| 297 |
- check-local: $(UNIT_TESTS) |
| 298 |
- for test in $(UNIT_TESTS); do \ |
| 299 |
- echo $$test; \ |
| 300 |
-- $(top_srcdir)/media/$$test; \ |
| 301 |
-+ ../media/$$test; \ |
| 302 |
- done |
| 303 |
- endif |
| 304 |
---- a/track/Makefile.am |
| 305 |
-+++ b/track/Makefile.am |
| 306 |
-@@ -6,6 +6,9 @@ |
| 307 |
- Road_Segment.cc \ |
| 308 |
- Strip_Track.cc \ |
| 309 |
- Strip_Track_Reader.cc |
| 310 |
-+libvamos_track_la_LIBADD = \ |
| 311 |
-+ ../geometry/libvamos-geometry.la \ |
| 312 |
-+ ../media/libvamos-media.la |
| 313 |
- |
| 314 |
- pkginclude_HEADERS = \ |
| 315 |
- Gl_Road_Segment.h \ |
| 316 |
-@@ -17,24 +20,23 @@ |
| 317 |
- |
| 318 |
- EXTRA_DIST = $(pkginclude_HEADERS) |
| 319 |
- |
| 320 |
--AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 321 |
-+AM_CXXFLAGS = -Wall -pedantic |
| 322 |
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 323 |
- |
| 324 |
- # Python Module |
| 325 |
- if HAVE_PYTHON |
| 326 |
--pyexec_LTLIBRARIES = track.la |
| 327 |
-+pkgpyexec_LTLIBRARIES = track.la |
| 328 |
- else |
| 329 |
--pyexec_LTLIBRARIES = |
| 330 |
-+pkgpyexec_LTLIBRARIES = |
| 331 |
- endif |
| 332 |
- |
| 333 |
- track_la_SOURCES = bp-track.cc |
| 334 |
--track_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 335 |
- track_la_LDFLAGS = -avoid-version -module |
| 336 |
- track_la_LIBADD = \ |
| 337 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 338 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 339 |
-- $(top_srcdir)/track/libvamos-track.la \ |
| 340 |
-- -l$(PYTHON_LIB) \ |
| 341 |
-- -l$(BOOST_PYTHON_LIB) |
| 342 |
-+ ../geometry/libvamos-geometry.la \ |
| 343 |
-+ ../media/libvamos-media.la \ |
| 344 |
-+ libvamos-track.la \ |
| 345 |
-+ $(PYTHON_LIBS) |
| 346 |
- |
| 347 |
- # Unit Tests |
| 348 |
- if DO_UNIT_TESTS |
| 349 |
-@@ -50,14 +52,14 @@ |
| 350 |
- test_Road_Segment_SOURCES = test_Road_Segment.cc |
| 351 |
- test_Road_Segment_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 352 |
- test_Road_Segment_LDADD = \ |
| 353 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 354 |
-+ ../geometry/libvamos-geometry.la \ |
| 355 |
- Road_Segment.lo \ |
| 356 |
- -lboost_unit_test_framework |
| 357 |
- test_Strip_Track_SOURCES = test_Strip_Track.cc |
| 358 |
- test_Strip_Track_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 359 |
- test_Strip_Track_LDADD = \ |
| 360 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 361 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 362 |
-+ ../geometry/libvamos-geometry.la \ |
| 363 |
-+ ../media/libvamos-media.la \ |
| 364 |
- Road_Segment.lo \ |
| 365 |
- Gl_Road_Segment.lo \ |
| 366 |
- Strip_Track.lo \ |
| 367 |
-@@ -68,6 +70,6 @@ |
| 368 |
- check-local: $(UNIT_TESTS) |
| 369 |
- for test in $(UNIT_TESTS); do \ |
| 370 |
- echo $$test; \ |
| 371 |
-- $(top_srcdir)/track/$$test; \ |
| 372 |
-+ ../track/$$test; \ |
| 373 |
- done |
| 374 |
- endif |
| 375 |
---- a/vamos/Makefile.am |
| 376 |
-+++ b/vamos/Makefile.am |
| 377 |
-@@ -9,12 +9,12 @@ |
| 378 |
- EXTRA_DIST = Options.h |
| 379 |
- |
| 380 |
- cvamos_LDADD = \ |
| 381 |
-- $(top_srcdir)/world/libvamos-world.la \ |
| 382 |
-- $(top_srcdir)/body/libvamos-body.la \ |
| 383 |
-- $(top_srcdir)/track/libvamos-track.la \ |
| 384 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 385 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 386 |
-+ ../world/libvamos-world.la \ |
| 387 |
-+ ../body/libvamos-body.la \ |
| 388 |
-+ ../track/libvamos-track.la \ |
| 389 |
-+ ../geometry/libvamos-geometry.la \ |
| 390 |
-+ ../media/libvamos-media.la \ |
| 391 |
- -lboost_system \ |
| 392 |
- -lboost_filesystem |
| 393 |
- |
| 394 |
--AM_CXXFLAGS = -fPIC -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\" |
| 395 |
-+AM_CXXFLAGS = -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\" |
| 396 |
---- a/world/Makefile.am |
| 397 |
-+++ b/world/Makefile.am |
| 398 |
-@@ -10,6 +10,10 @@ |
| 399 |
- Sounds.cc \ |
| 400 |
- Timing_Info.cc \ |
| 401 |
- World.cc |
| 402 |
-+libvamos_world_la_LIBADD = \ |
| 403 |
-+ ../geometry/libvamos-geometry.la \ |
| 404 |
-+ ../track/libvamos-track.la \ |
| 405 |
-+ ../body/libvamos-body.la |
| 406 |
- |
| 407 |
- pkginclude_HEADERS = \ |
| 408 |
- Atmosphere.h \ |
| 409 |
-@@ -26,26 +30,25 @@ |
| 410 |
- |
| 411 |
- EXTRA_DIST = $(pkginclude_HEADERS) |
| 412 |
- |
| 413 |
--AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 414 |
-+AM_CXXFLAGS = -Wall -pedantic |
| 415 |
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 416 |
- |
| 417 |
- # Python Module |
| 418 |
- if HAVE_PYTHON |
| 419 |
--pyexec_LTLIBRARIES = world.la |
| 420 |
-+pkgpyexec_LTLIBRARIES = world.la |
| 421 |
- else |
| 422 |
--pyexec_LTLIBRARIES = |
| 423 |
-+pkgpyexec_LTLIBRARIES = |
| 424 |
- endif |
| 425 |
- |
| 426 |
- world_la_SOURCES = bp-world.cc |
| 427 |
--world_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 428 |
- world_la_LDFLAGS = -avoid-version -module |
| 429 |
- world_la_LIBADD = \ |
| 430 |
-- $(top_srcdir)/body/libvamos-body.la \ |
| 431 |
-- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 432 |
-- $(top_srcdir)/media/libvamos-media.la \ |
| 433 |
-- $(top_srcdir)/track/libvamos-track.la \ |
| 434 |
-- $(top_srcdir)/world/libvamos-world.la \ |
| 435 |
-- -l$(PYTHON_LIB) \ |
| 436 |
-- -l$(BOOST_PYTHON_LIB) |
| 437 |
-+ ../body/libvamos-body.la \ |
| 438 |
-+ ../geometry/libvamos-geometry.la \ |
| 439 |
-+ ../media/libvamos-media.la \ |
| 440 |
-+ ../track/libvamos-track.la \ |
| 441 |
-+ libvamos-world.la \ |
| 442 |
-+ $(PYTHON_LIBS) |
| 443 |
- |
| 444 |
- # Unit Tests |
| 445 |
- if DO_UNIT_TESTS |
| 446 |
-@@ -67,6 +70,6 @@ |
| 447 |
- check-local: $(UNIT_TESTS) |
| 448 |
- for test in $(UNIT_TESTS); do \ |
| 449 |
- echo $$test; \ |
| 450 |
-- $(top_srcdir)/world/$$test; \ |
| 451 |
-+ ../world/$$test; \ |
| 452 |
- done |
| 453 |
- endif |
| 454 |
|
| 455 |
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 |
| 456 |
deleted file mode 100644 |
| 457 |
index 95c90995f19..00000000000 |
| 458 |
--- a/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch |
| 459 |
+++ /dev/null |
| 460 |
@@ -1,25 +0,0 @@ |
| 461 |
-Fix building in C++14 mode. |
| 462 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=600774 |
| 463 |
- |
| 464 |
---- a/media/Ac3d.cc |
| 465 |
-+++ b/media/Ac3d.cc |
| 466 |
-@@ -892,7 +892,7 @@ |
| 467 |
- m_rotation (rotation) |
| 468 |
- { |
| 469 |
- std::ifstream is (m_file.c_str ()); |
| 470 |
-- if (is == 0) |
| 471 |
-+ if (!is) |
| 472 |
- { |
| 473 |
- throw No_File (m_file); |
| 474 |
- } |
| 475 |
---- a/media/XML_Parser.cc |
| 476 |
-+++ b/media/XML_Parser.cc |
| 477 |
-@@ -391,7 +391,7 @@ |
| 478 |
- { |
| 479 |
- m_file = file; |
| 480 |
- mp_stream = new std::ifstream (file.c_str ()); |
| 481 |
-- if ((mp_stream == 0) || (*mp_stream == 0)) |
| 482 |
-+ if ((mp_stream == NULL) || (!(*mp_stream))) |
| 483 |
- { |
| 484 |
- throw No_XML_File (m_file); |
| 485 |
- } |
| 486 |
|
| 487 |
diff --git a/dev-games/vamos/metadata.xml b/dev-games/vamos/metadata.xml |
| 488 |
deleted file mode 100644 |
| 489 |
index 56d1bba2cf0..00000000000 |
| 490 |
--- a/dev-games/vamos/metadata.xml |
| 491 |
+++ /dev/null |
| 492 |
@@ -1,11 +0,0 @@ |
| 493 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 494 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 495 |
-<pkgmetadata> |
| 496 |
- <maintainer type="project"> |
| 497 |
- <email>games@g.o</email> |
| 498 |
- <name>Gentoo Games Project</name> |
| 499 |
- </maintainer> |
| 500 |
- <upstream> |
| 501 |
- <remote-id type="sourceforge">vamos</remote-id> |
| 502 |
- </upstream> |
| 503 |
-</pkgmetadata> |
| 504 |
|
| 505 |
diff --git a/dev-games/vamos/vamos-0.7.1.ebuild b/dev-games/vamos/vamos-0.7.1.ebuild |
| 506 |
deleted file mode 100644 |
| 507 |
index c057f2d8e74..00000000000 |
| 508 |
--- a/dev-games/vamos/vamos-0.7.1.ebuild |
| 509 |
+++ /dev/null |
| 510 |
@@ -1,45 +0,0 @@ |
| 511 |
-# Copyright 1999-2014 Gentoo Foundation |
| 512 |
-# Distributed under the terms of the GNU General Public License v2 |
| 513 |
- |
| 514 |
-EAPI=5 |
| 515 |
-inherit eutils |
| 516 |
- |
| 517 |
-DESCRIPTION="an automotive simulation framework" |
| 518 |
-HOMEPAGE="http://vamos.sourceforge.net/" |
| 519 |
-SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz" |
| 520 |
- |
| 521 |
-LICENSE="GPL-2" |
| 522 |
-SLOT="0" |
| 523 |
-KEYWORDS="amd64 x86" |
| 524 |
-IUSE="static-libs" |
| 525 |
- |
| 526 |
-RDEPEND="virtual/opengl |
| 527 |
- virtual/glu |
| 528 |
- media-libs/freeglut |
| 529 |
- media-libs/libpng:0 |
| 530 |
- media-libs/libsdl[joystick,video] |
| 531 |
- media-libs/openal |
| 532 |
- dev-libs/boost |
| 533 |
- media-libs/freealut" |
| 534 |
-DEPEND="${RDEPEND} |
| 535 |
- virtual/pkgconfig" |
| 536 |
- |
| 537 |
-src_prepare() { |
| 538 |
- epatch \ |
| 539 |
- "${FILESDIR}"/${P}-as-needed.patch \ |
| 540 |
- "${FILESDIR}"/${P}-gcc46.patch |
| 541 |
-} |
| 542 |
- |
| 543 |
-src_configure() { |
| 544 |
- econf \ |
| 545 |
- --disable-unit-tests \ |
| 546 |
- $(use_enable static-libs static) |
| 547 |
-} |
| 548 |
- |
| 549 |
-src_install() { |
| 550 |
- default |
| 551 |
- dobin caelum/.libs/caelum |
| 552 |
- newdoc caelum/README README.caelum |
| 553 |
- dodoc AUTHORS ChangeLog README TODO |
| 554 |
- prune_libtool_files |
| 555 |
-} |
| 556 |
|
| 557 |
diff --git a/dev-games/vamos/vamos-0.8.2.ebuild b/dev-games/vamos/vamos-0.8.2.ebuild |
| 558 |
deleted file mode 100644 |
| 559 |
index ef0530a204c..00000000000 |
| 560 |
--- a/dev-games/vamos/vamos-0.8.2.ebuild |
| 561 |
+++ /dev/null |
| 562 |
@@ -1,61 +0,0 @@ |
| 563 |
-# Copyright 1999-2019 Gentoo Authors |
| 564 |
-# Distributed under the terms of the GNU General Public License v2 |
| 565 |
- |
| 566 |
-EAPI=6 |
| 567 |
- |
| 568 |
-PYTHON_COMPAT=( python3_{5,6} ) |
| 569 |
- |
| 570 |
-inherit autotools python-single-r1 |
| 571 |
- |
| 572 |
-DESCRIPTION="An automotive simulation framework" |
| 573 |
-HOMEPAGE="http://vamos.sourceforge.net/" |
| 574 |
-SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz" |
| 575 |
- |
| 576 |
-LICENSE="GPL-2" |
| 577 |
-SLOT="0" |
| 578 |
-KEYWORDS="amd64 x86" |
| 579 |
-IUSE="test" |
| 580 |
- |
| 581 |
-RDEPEND=" |
| 582 |
- ${PYTHON_DEPS} |
| 583 |
- dev-libs/boost:=[python,${PYTHON_USEDEP}] |
| 584 |
- media-libs/freealut |
| 585 |
- media-libs/freeglut |
| 586 |
- media-libs/libpng:0= |
| 587 |
- media-libs/libsdl[joystick,video] |
| 588 |
- media-libs/openal |
| 589 |
- virtual/glu |
| 590 |
- virtual/opengl" |
| 591 |
-DEPEND="${RDEPEND} |
| 592 |
- >=sys-devel/autoconf-archive-2016.09.16 |
| 593 |
- virtual/pkgconfig" |
| 594 |
- |
| 595 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 596 |
- |
| 597 |
-PATCHES=( |
| 598 |
- "${FILESDIR}"/${PN}-0.8.2-fix-buildsystem.patch |
| 599 |
- "${FILESDIR}"/${PN}-0.8.2-fix-c++14.patch |
| 600 |
-) |
| 601 |
- |
| 602 |
-src_prepare() { |
| 603 |
- default |
| 604 |
- eautoreconf |
| 605 |
-} |
| 606 |
- |
| 607 |
-src_configure() { |
| 608 |
- econf \ |
| 609 |
- --with-x \ |
| 610 |
- --disable-static \ |
| 611 |
- --with-boost-python="${EPYTHON#python}" \ |
| 612 |
- $(use_enable test unit-tests) \ |
| 613 |
- PYTHON="${EPYTHON}" |
| 614 |
-} |
| 615 |
- |
| 616 |
-src_install() { |
| 617 |
- MAKEOPTS="${MAKEOPTS} -j1" default #646014 |
| 618 |
- |
| 619 |
- dobin caelum/.libs/caelum |
| 620 |
- newdoc caelum/README README.caelum |
| 621 |
- |
| 622 |
- find "${D}" -name '*.la' -delete || die |
| 623 |
-} |
| 624 |
|
| 625 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 626 |
index 9951eb1776c..99d3da639c1 100644 |
| 627 |
--- a/profiles/package.mask |
| 628 |
+++ b/profiles/package.mask |
| 629 |
@@ -347,12 +347,6 @@ x11-libs/guile-gtk |
| 630 |
# Removal in 30 days. Bug #639530. |
| 631 |
net-p2p/multibit |
| 632 |
|
| 633 |
-# David Seifert <soap@g.o> (2019-08-01) |
| 634 |
-# Dead upstream, last release over 5 years ago, |
| 635 |
-# broken build system, fails with boost 1.70, |
| 636 |
-# removal in 30 days. Bug #646014, #691162 |
| 637 |
-dev-games/vamos |
| 638 |
- |
| 639 |
# David Seifert <soap@g.o> (2019-08-01) |
| 640 |
# Last touched over 3 years ago, broken tests, |
| 641 |
# fails with boost 1.70, removal in 30 days. |
Archives