Sync with portage [Thu May 3 08:24:03 MSK 2018].

Manifest

@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28986 BLAKE2B a836a51cbe7bac7d4fbe53f9970bef452e86594b9354b8be7c7c6ac108d019585df07d7a5de0b05a565b48f3a1dffb64f98fdd6607e5ddf81a28f843c3425e7b SHA512 d51d102f9baf229b76a3ae2d25fd91529e1a833a867e4b36ab8db13f06b350c3e312d5ac4da6a8934717940d273852b8be50005464693c379f560926fd610ed6
-TIMESTAMP 2018-05-02T18:38:42Z
+MANIFEST Manifest.files.gz 29027 BLAKE2B f9438256eb90dfcd76965d2ffc782248dfbacb17b234709fb4c6508d39b56cdd9d6399b66af16761d7ef76df3df04c81beeb6aae7d96e5946ef8583a4404cb14 SHA512 f0fbe2ab9a6e942b54f683617375628519c95ad5b8516187671b533d277b3eccc8c6b7080f8300171c252854f4e60cc0eacd37f0f57efdd31926ec6eac6691bf
+TIMESTAMP 2018-05-03T04:38:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrqBbJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrqkk9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA+QQ//WX4QlUC8cFv8wSMG/anHC+q2vG0m6SoWxgnUnOeKcfuw0ohD2Pdgam2o
-GEO5wUr/IZsgLsos1uk98Lij++9hRocikYAfXp34dBw/q9khE3ZUhJ57Og0yXjaB
-Pmj3Ks2CeYYpqfXsP8sK0CR8IxDZguID7XXig9QOJEPpd6G99EOQVNiGtc6lMLyz
-Oa9QfTlavNphSUO49NOD7x4VPIAGhbSGktjAXXilukXZOAGNDLKeYOgkUC0MCUSi
-vkigxCRnJjtedXo2aY1q/M458/3jqB5/7kWZ4KHdVXJm9Yq0xSvc4sM1ym8m/bk/
-6mkY8v6xv5Gbj344uFGnLfagEuL7YvI4+E9dNRv6d1wHernveD6hzkMdhvb/Ln6i
-dn3AxlzDX6sJ0QlCAWTyLmiEovCju68JyK0wALqxkQX3uJRzai71BJWUraTKX8y7
-WtG9eDPmm6VOCGXTh3x1YAYbQHKcXpMqjuvqb/AdV1iRyGo13hCWSu+g9uZq00VR
-Arfct/hb2WGNNp/1WbVDjn1oE/sY4AL7Dy8Ju0qOoI5Z+rrMdf3DnWvmFjBH+/7r
-CGwiFRMIfKGXfA7bXZsDvHOMDFeiws7UvAg4Ptb68J8xiNTZkKNs/GLmd+Pupwe4
-VdrIzw3J7zoHHaF6ndPPlAjZ5Qrmu9QYp71Xha9Itctb66px7XM=
-=UqMp
+klCOUA/8CKvx95laszQwpu/7Z7hKYR3zQcEO/uw8kVqvcDaEZGGKvQovp1964uUf
+qWV7zEs3F+rj8hNUgeiB8eUfkXmX7HslM4LmVadayFXgCuGr2Fa/Q2szFZlYoZsW
+uefV9+N1wKdNMveHhBiCK+hxKl7tM/Cz6da6917TvP0JjHgaSPwaqqxEDOEfLuMf
+Gg6cGqVEXbKICNrJMY5lZlz/QH+kZgvrqYWubic1BJV9FoH+mMVaU1YiuhfH+uRQ
+z1avhtCdBOEDk26r2S3w7WCP4Q1KR4oEAdEHoIm2wOedHeR5QY3NFFbqOZC4rHK+
+/VKvCybfuDq1ulyaZF9TwfIATQu3sXnG6ytUU6UOcmELE5ge75vGsr6BwR7Qpq8M
+5B/loNSIt//BZpO95xeZf+zZZgnPC9lgY62RtBTy/Wey+ojZasQvBjbKFL3Eoj49
+7BoeetiqWMTX4yuQRthHdhwDzpfILQ4MQsYtLKEmA0OMxkbUVRXI5oIJbUPOIeYt
+kqS5cKveca5i7tx46orfzS3pW5gKolDH9e8wtZD43UtTx0ABhy/aF9Mmt5ZdC2ec
+85DC/dqfu44T5Vcjk4mnX9Re1VVw6/5IMdXwaQIswcw2w0Hezit86dsJVyMGvXzG
+wenAXZP3bXznIa5iAFWDYqt3xEV8VZ7k8j3GhVXL+zluE3G1feM=
+=iKAG
 -----END PGP SIGNATURE-----

app-antivirus/clamav/Manifest

@@ -23,7 +23,7 @@ DIST clamav-0.100.0.tar.gz 16036757 BLAKE2B c51edfb05726e16e2ff1ef1fee9f174af5a0
 DIST clamav-0.99.2.tar.gz 16067497 BLAKE2B 4155e3125ccc45cc6828033f207b6b8d3514253dfb8156428ad4096c0901d5a8500f9dd253b8f40afdc49a6039b647627868f75d51829ab7bd247ada5f3b8383 SHA512 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44
 DIST clamav-0.99.3.tar.gz 16082645 BLAKE2B 3be06e563f17a07e4c7e95eb3efbb61e80858bcb3dffc584f13ec30dc2ef9c5257aec78605f1c03e183b4b7ed5b08343a25b579b2b12e54458694eff624aa01e SHA512 0d3c75d571ed4aa4937ef2b743a39a9a144f5adfd6f56f71046e5a8387b8ed7c3c4d9a4196aa85750f9ec4dc545720fdd659289d0cce086ab13a7cc505a0ab3e
 DIST clamav-0.99.4.tar.gz 16083015 BLAKE2B 3c2e7d11ee05fe846f75c3fb6501b5fd809a2e58f8e69c82e493e32fcbc87ca0e5b5f7ab83a0d7e251a5dc8e84aed1475c87c1248b393fa04b6924a2ab32b9bf SHA512 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d
-EBUILD clamav-0.100.0.ebuild 5278 BLAKE2B ae52d1981c0b716e0cab0efcf3527249e22804eda15a6152265ff77b38b208858e2e0779ec4885c565094d80081a33a6b1737c77460bbcd7be45aebf44f89064 SHA512 e38d842ecdd9a130627b6788409502ebc1bc9fe3edd0b2595f1ee9e249f4246b6dd08e86db4efa9e823d2df6b89396e572ef48871eb9b6c67d2a1741dc958da2
+EBUILD clamav-0.100.0.ebuild 5283 BLAKE2B cf763850e3f2f18ded10a64c4fc9b8560d6d41493a7e82df9daf600d1168a7cd1467a6985c54afec70dcd187f52a3a1cc389fa39b44cb1cd88b8bdde692a8925 SHA512 ff5996f75aff40333d3b6187c6d47e05fcf84550bb835055cdf343df60d43175cb92d3cf5c5e133e2d8cf4d261afee83ab8d773acd1710e65c40fbeccfe2959f
 EBUILD clamav-0.99.2-r1.ebuild 5127 BLAKE2B 2080e66c0ca3c55535d4faee04228169df1b6e8aa87db55b79172fd626e5a078ad3344c44d77a1134da13588bfbbf576091648141d9cd05b97a9d7bc44601e90 SHA512 2ea3c877a47c1fceed4661fc6ea5e037e4e78fffe8241444e39ab30a2268aac3b21c1922836f449550c55f315b2649169efe6aa4a8446068762c9120dcf12ba0
 EBUILD clamav-0.99.2-r3.ebuild 5184 BLAKE2B 0d4ba1b9b8267fa8ef1727c3bc79a8c5ac3c76ae4ee14e10468a117314c1f01d50cc145f2e39509108ea89dd6c1b96ff11eb55fa2f69cd2a5819415c2ee3fe3a SHA512 6d38505706417b50aa6f654cf32eb963bdbf4b76f2a1858ea72431aec884fceaec3a2e098bbf1f6d3a4a36f066d1cdc8a3ef8acf8ce98d3e9cbb934bf1f65ee0
 EBUILD clamav-0.99.3-r1.ebuild 5240 BLAKE2B acf2728a1698b609396e35ccd4521d1c11fdb9121dd1961e932c5b28431bb1064fcc27c1da7050ea47bea7c464ecc4f3bb6b564581246f062e613544fda99c19 SHA512 3957d4890ad9198104b83dda84f3cab117b051d699d2f69773f7d380fb62e32ac916b11d02fffba93fef791cf03092300807a57c9a4528f4e5dc034e0eb275e2

app-antivirus/clamav/clamav-0.100.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )

app-arch/cfv/Manifest

@@ -1,3 +1,3 @@
 DIST cfv-1.18.3.tar.gz 68030 BLAKE2B 72372ebf7fa2d72a68b20cc0bf82823e973de5e8acacdcded85f50ad0e2f3e867c6924828b0a4ee42663e623d0d6d2e55b3f4b94addd83a703e4502edb1dda35 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71
-EBUILD cfv-1.18.3-r1.ebuild 810 BLAKE2B 4fc792317780d24cdb27e0a9c0e0cb46db3ac26c319bc344afc720b37774e12ce93c24a4522646a1bab31e458b0696f749b89487892990b71f5652c48c951e41 SHA512 a88789502fc23d53ca977d7afb043a720a3f48d42e0da5e0d2694956c074d8c4b6b58749ec81fc88360db3d14a240bfc01e5a7cbf46de608d6e9b70835ebcc66
+EBUILD cfv-1.18.3-r1.ebuild 755 BLAKE2B ce83067a0e8d6b00912f732055b8b0620943e7e33cd4ac00bbac8b41067a2702ff53453a72c2b105dd9634f49413f3ce0d870765a2480c453514cf4674c95d3d SHA512 49bc02ea03ffbb88f468baf359352578eacd7694f8eaa1410a342fa9ea056f9a6d22b5c93ec1da995731a98a2a5fd33b80f967e8f5ef0e8ed33eeb8b1be9218b
 MISC metadata.xml 581 BLAKE2B bc30bbb35470c1ab89641e3da14813f964ff2e4d2aeb6f37abd4bba0e4b5e5288b21637927fb0a8c04066653a09a66d00d3fcbd67a65d4b18e59cd1c31eefa1d SHA512 ac57bc554978a1f62b0ecef157853b66a00aa7098be0f5e42e01e5cf9546a8aec259dca9037d6698defea3e2e265ef7827e9e9cc73db98d6584896a3755b9d56

app-arch/cfv/cfv-1.18.3-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,12 +19,7 @@ KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-maco
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	dev-python/python-fchksum[${PYTHON_USEDEP}]
-	bittorrent? (
-		|| (
-			net-p2p/bittorrent[${PYTHON_USEDEP}]
-			net-p2p/bittornado[${PYTHON_USEDEP}]
-		)
-	)"
+	bittorrent? ( net-p2p/bittornado[${PYTHON_USEDEP}] )"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 

app-vim/vimpress/Manifest

@@ -1,5 +1,5 @@
 DIST vimpress-2.1.5.tar.gz 11341 BLAKE2B 4376c187b22fdd937ea88e3454e8058daf1eb2614376babc9689e8358be629a04894410300f1e48dc550de2e64ceb1c56c87efd4e45392866e03450d0680eaef SHA512 34bbf205ecc92dee4ab897bd3d3d34fc808acdd0a60eb3c3e763056aa2c0487d9423a1e5e9fe252d0da5a8ecaaa7a64a3dc406bea472942a35ada4875b30db47
 DIST vimpress-3.2.0.tar.bz2 11456 BLAKE2B 39be21c2a65418f8e9e370997db5c64fc79f6ae608a85ba8c19ea2e0010823002caa35e1f7fb887fd20176eb987c23a7719b14c4a7a8acb9818dc3802d35557a SHA512 793f013ccc42180e095c2e8cc847719479418cc0b184688924520f0782ee27e99a7fc64e44bf5c25f2a720b19dd813a4756fc90b87c18e13766ef0ce7772334a
-EBUILD vimpress-2.1.5.ebuild 662 BLAKE2B 9d7309722d7a2499897d4e67d29fe775841b945e93546fab19a71c1447c6a235db7150534d26cab699098876cab202b43ae6e0e5eeb72ebd7050cc437baa6a5d SHA512 e562580442672164c142ac58799d8ef25f935f4563b575beeba031f370609ec52a224b98acdca0f797cb9fc892546f05b6ccc856d30c34edf2d5eed3b8c624e9
+EBUILD vimpress-2.1.5.ebuild 635 BLAKE2B 34b161dd2c3b25c6f270352d5e8936006c7dec8aca77c752f0b25d2ad6278524b2fc19d3b799964696a204f54f34c215c6dba5f96d5fe47ae5dc214ffcfce85c SHA512 e18dc336db615eb40f73a426cbe71c8f604aaeee2104eacca0b8ee6006daeb67e1561f43ce71e57933aa7ca977ba350df61d0c8a1c59ad60e5910a87b198e1ea
 EBUILD vimpress-3.2.0.ebuild 573 BLAKE2B 8f9d3ab01e72512eeee14e5d6f28545df4f74dfb5e8b481a2c4c8f22799a37fd669cddf47c4f8e9de7ed05adeb970c3b71046e1099e34ae05144dc1a5956f1a0 SHA512 8d3f43cdb27cf936b7ab7d9247b974b956bd3876dbbbcaec5fe02b0e5bc5766bdc19b802454c67ba9ee7c01fc65cc20b674b1b6c1279c6becd777dc344149b2b
 MISC metadata.xml 336 BLAKE2B 5154fbe13f738bf9020da237e4e8bafc26c160f0bcee4f042263e17d34f9bfdc9fc673e5a7ee15f8221dc6b1530131c1567049822c5540c34c2362b6b37316b5 SHA512 f2f18b31a5a60c51d7d563d8a53814625a6310ad2925ef297275a75ed5b40f475a25aa7089a0f641335e2c73d889d39e6473f224644c572ffe3118cf03fe4c90

app-vim/vimpress/vimpress-2.1.5.ebuild

@@ -14,7 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-lang/python:2.7
 	dev-python/markdown"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"

dev-libs/json-c/Manifest

@@ -4,6 +4,6 @@ DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2
 DIST json-c-0.13.tar.gz 634720 BLAKE2B f83876921f94fca1eb0a3473315d4dc75bb52e36499b265dd60e9dfa46d5417a958725aa3a6da3aa50f2a64f2cd5308af2685ca18bb3f5becd464fc570313735 SHA512 7375e1678e40f79298226d070db4ac3dab8a94c9d2438db1bbbcf668284ab30236fc77d841207c25f71cc2cebc596e1b8116d480434d829c8d96007a32ddf636
 EBUILD json-c-0.12.1.ebuild 1003 BLAKE2B 0ed22e1e1f8562ba0350ddaa3976a5ac66bd6edd97cacebbc6ee51ca401f7a78e3a566ee8865fa75b20352c1ba3053e64d4c2fa9f8a38441a0420b8d47628c1c SHA512 8b3fb8790b71761fa8dfc0634ab10887696255f7fe9856b7f9f043dc378a9c73794b95add30b698fd17d4c3f79e75f64d659454488cc39d5223bdc34668ec71f
 EBUILD json-c-0.12.ebuild 934 BLAKE2B 7ce3932192a70416f32220d08a86da5e889d50a4aed197c12926748bd3cc825a8f93cacaeaf242d99ea800169e4d75a6769ad0197562b32f54d104d81d4a8c88 SHA512 dcd19ea54f182d8d73dace713d3c364d394e83615c4912fdc9ad23980fa39801cfe04848f033578287ae533e9a87af8d13c35d00717f7c874ee2be4753d5904b
-EBUILD json-c-0.13.1.ebuild 1000 BLAKE2B aff80acbf394a6265134716b5b02653d45c48c0bbcad85e73cf571edca5e73a4deb9c3b95c077df1a8d703a9b989b9188e602435bd619211d86ebd5f3653a147 SHA512 c6bc1704afbac9eff41168f218089260ad7914ec5119a52a7ddaf4bfb1050d170836b1bca29ee16e07640505f87b878253d090d9cbb3701e0918f44148ff6e42
+EBUILD json-c-0.13.1-r1.ebuild 1000 BLAKE2B 1629144920cf22b40d23598382afbb3b33a5946da9daca9806ae615d8fef77870df6cc8865cde090b50bd07bdd8cd20034d0afca1a7416b1f979503bc2f37764 SHA512 3e62acbce184a908b8b581ab3d42c31fabd5d908f020ba9d30172e2a5bb12030a255c3b4f70a4dbea29d672cbbda49d6bbca649e680fe110ca828825b614317c
 EBUILD json-c-0.13.ebuild 1000 BLAKE2B 8c2b018dc6783ebac76ecbb777a628ef59d8796752038f28e1e57437c28fd72145a930af858e16c52e70b0a173b0cf4bb9f476364c39df6da26d5bd360e43300 SHA512 d3719bb33500ea92f7376c4b2f6ba994a4c8a18281c525eaf8a7b81da6eb8e8b4a77caf47fa02bb6df6a771619a36b77fd236e976cd2f83c701ce15a44aa0181
 MISC metadata.xml 693 BLAKE2B 70ce2577d4c34f376a26b1180103c7bd4105338e2e876f991d0a8db39c8affedc63a34d637b0339c7bb1a130f1869f4c16d087e6632e97d11cdb9e97353dd0fb SHA512 83445296602d14fed7857d99008c596d06a55ee4a1a9382afb5b2a2a80b0810861cd9a95e9ee5903cac082a338358bbbff7b936087875e407602496a50d3ebd5

dev-libs/json-c/json-c-0.13.1-r1.ebuild

@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/json-c/json-c/wiki"
 SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/3"
+SLOT="0/4"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 

dev-libs/libmspack/Manifest

@@ -1,5 +1,5 @@
 AUX libmspack-0.5_alpha-CVE-2017-6419.patch 1483 BLAKE2B ffe990fcdc0783fa3988564b50f734127e6e90be7c76b31ffb2f53a5749cd038193fd650eed0d08da99f58b696adca3d1a7f872c254f425468533430aa575c2d SHA512 b6aafe82630d3bb1254fcce9a8bc528b0f375a2e7eec5f729e04c2d9816feb23ba12a0275efcf5ced6578789c4ef83b4364104b4cc35c2c146f4fb527c8dbf4a
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
-EBUILD libmspack-0.6_alpha.ebuild 1152 BLAKE2B 152a52b4441ae7d8b807c2aac18f5c2ea76faac37f0c8486a9ed7a728e67425faaca55a4ec84a1669386ca92406e6f971249c5c369113eafddcee07e375fe9e8 SHA512 8c6c002b89d49ebd13510790e4ac553dc09c9f3fc382fda44130220b8d70a9e8cdfd1dca6a12f237d97b2baa5f73063c4e0d788dbe8efadbf25f1533c29d59f3
+EBUILD libmspack-0.6_alpha.ebuild 1157 BLAKE2B 98ebc782e3bb2320c075809dbac5211e6445cb49f4b1eb1b96e5f1a9397c03a4a023f13e7b8abf2189e338c3f7bba92c6be8e88d1de5aef68b92af29483816ce SHA512 9b74b108818c374164ed133656e34ebbb8225a5180704989f3a7a25e04a69538401f732b3388fa3a319b34258997888d7f116f90d713b67b6be0423d7232d4b3
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1

dev-libs/libmspack/libmspack-0.6_alpha.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~ia64 x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""

dev-lisp/clozurecl/Manifest

@@ -1,6 +1,5 @@
 AUX ccl-1.11-glibc-2.26.patch 1532 BLAKE2B d1f3d73b589990f96583ecfd7454929f79c0c43a21cd495a35dd5d57769a661444276769ef32e22bdbd20c433fc5e3eeca28936bc3fe2cca74ccbdf4d014256d SHA512 b1522eb84d84187c826075814bb0f663fe78fb61a14b010e2c2033b388809a9626aa3be26ac9d6ad84d81ca66581589363559e31ef6122379ba9e4d41d6c6961
 AUX ccl-format.patch 4281 BLAKE2B 50b25c6369f8db45e66344ceeb482af88b3e7d6a665112ac96f3a228e0867a8da0b42031bd1124006f4bdb17391824397aa347d47e22427bcba983fe837a296e SHA512 61bc053d0b7bdfcb9d81fd472e2569bb3d2805f87afff57855ba5a86f745141190b1804067628d2e70ec399585a66289c10fdaf3ffdc81bd2b442b1873c75e1a
-DIST ccl-1.10-linuxx86.tar.gz 43796090 BLAKE2B 75cbe2745ff6022a503e79e95a68d9ce2abd1b496fb4bc8b7180028f83223ceab36c6b40edb8f107e5fab8a194abc677a788867e53d09c089274b5b531066e4d SHA512 10504e2569a99ba8b6fc4ac745312435c6be646c86ec3916a3750f823f79b3b8ec87fe53ba2410151feeaaed0609e1760ee3d37a77f01d815d1ec13c2394258e
 DIST ccl-1.11-darwinx86.tar.gz 152989219 BLAKE2B 73a1ceed3ff1a22d76f593fb35a850c8c449cec7646368cd306a2c63ae85e22e02a6d604dc115e3e0a02f69a0fd6b8e29721c5e58704101779bf6a6924a48741 SHA512 21107ab0cf6f5abee21fc561680eb722fbb0a0515ea99a1d02be091a85519b1a91444317d92117ad509a25dca97adaba9b2d8026a7214f58aa03172ada2ea340
 DIST ccl-1.11-linuxarm.tar.gz 23044178 BLAKE2B 509fbf0bd83a41d8115b87f4b79db799e063fb9f2dd21e58db24ec065101e6946315442104feaa61b1175c80ccaf5f5926fc73c2a3a87d4c3e5ba659269a644d SHA512 b8034569f0c47106107fee6bd859051052d43c3bcd625a1956eae467ef0225425d5429678e3584136adc929ccfbbe4b800bffa66ea758cd2b734aa3ed55a9dda
 DIST ccl-1.11-linuxx86.tar.gz 42482877 BLAKE2B d1a6977d7dd934c77db4dd0deb2ab53a85c0d118037e147ced09027578e5356770145da317f1887a8d7d25309b146864a62f54b0d5e841470c86da99c38cbd4b SHA512 34008654fd3ceca55a33413a768c398395141e26b9ea09204739ca7e998fdbe94ab92507eda14cf9bcbb9f76e6c3cae3006d7f2c9f48749c66e1f1281febb409
@@ -10,7 +9,6 @@ DIST ccl-1.11.5-linuxarm.tar.gz 40288609 BLAKE2B 5217de314e6c59e5bbee7d5608b4e92
 DIST ccl-1.11.5-linuxx86.tar.gz 50652181 BLAKE2B 2ed6e747a72816c6f79f58715261c41a1c3b98fa84ef4ee82ca5683383741777a46a566c7884d7fdc3dcd2e5959dab2f3fde9432945a4dc73bcece8f741ed753 SHA512 b6c16d9bba27a901f942237ed42d6b3e832910951270820a2a3d61afe2a8e7f59d383c854382cfcaa0bf8253c8d624be66d905b4170211ea39a106ca85b9a23d
 DIST ccl-1.11.5-solarisx86.tar.gz 59139069 BLAKE2B db1a904dd4e794127e7c966a9734aa92bb0415520a6af35d92008fd785004bd2ea04deb66f600b1d1dd60c0b95519e86d412b208878aaa6c2f9f8c05a27efe38 SHA512 4ae7cee7e35de41ab20d79e073b12b6bd98a23beea95c0de7d882a1f4e1ea3f9f3162844df0578aeeadb671d30a0a488092ee93b35245c693051a4ab9193fc5b
 DIST ccl.html 962003 BLAKE2B fc95ec5abbea7c2f5f247293691a5c5a7eddaa049156c38766ec9df4d1920fdee902c89db976cc6687535aef5ddda3c672b62156bf0f61b6369ade548dcb0141 SHA512 0cb9ee8f7eb6007e08241a0797519ff3bfc3d3adc0b5ac86e6a2e9e8b2e316fc421bea3b04159decc0a2b37ff7098147e25266946cc3c1ac367b93e4821a8b64
-EBUILD clozurecl-1.10.ebuild 2604 BLAKE2B 917bdd6038202b997a8e2fd2d799119cdd3231bccf2130d0894646fd8a9e5b17d5644d2c25c5dc6722a8b5a1f617b2cb1212984976d5386f5085c907182ec751 SHA512 d3f3320ecd56acdcc14df672369996fecdc9664a949cc9c61664de1e2b27b382bf10aff74f313dca7ccaf2ca3d4720424f1cf64fa7a48d948477e0179ecfd470
 EBUILD clozurecl-1.11-r1.ebuild 2703 BLAKE2B ed1b25828a838ba671c943040d9a41c9d61826b1e9b3e45c45d93bb032b80eaf93f4a18c4085c7a1fd59cd20f66c6c02aa10914531e4c44b66fd792a35904514 SHA512 c6995ba3ffeed8b8a2584b6b76a907104097314f28ad8cf536a176de0ec16e7e82e3641d7d64f43efa76a685e47ffe187fe5f97b89f604c5966e72f393eef33a
 EBUILD clozurecl-1.11-r2.ebuild 3291 BLAKE2B 42228949acb214ab92d2a53ceecc82a89b2b893149e4bcde1c33e06bf2f77063760e4c1f5cd8e3cfdb25fc3eb3ac0830c4b3a2d0c0d8f589c197962b9f191633 SHA512 6d6b62b08c9a81a82a1c75ace997409eaa48644cac79b9eee90e117d22324594b3a0f57d842393085f4ef43969bac6032768a4f0ef20f98fbd10fe523f67b765
 EBUILD clozurecl-1.11-r3.ebuild 3432 BLAKE2B 1a8f3e332865a6b78a1799f151dc07ba8b77e57dad9f91edd2dd01a1120f83979b0d3af7117626c117ece71605960b4cdb3115421bd52ec604b7cdb55802eb54 SHA512 e65afe0b3d77cde76976cdfefdde3426925e0e029afa8506dc7af08f320231e72f6f0765d2936ed671af809007192cb67ecdbf2bf7ca73cea3b874d29c427dfc

dev-lisp/clozurecl/clozurecl-1.10.ebuild

@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com/"
-SRC_URI="
-	x86?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-	amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )"
-	# ppc?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
-	# ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}
-		!dev-lisp/openmcl"
-
-S="${WORKDIR}"/${MY_PN}
-
-ENVD="${T}"/50ccl
-
-src_configure() {
-	if use x86; then
-		CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
-	elif use amd64; then
-		CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
-	elif use ppc; then
-		CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
-	elif use ppc64; then
-		CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
-	fi
-}
-
-src_prepare() {
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
-}
-
-src_compile() {
-	emake -C lisp-kernel/${CCL_KERNEL} clean
-	emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
-	unset CCL_DEFAULT_DIRECTORY
-	./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
-	# remove non-owner write permissions on the full-image
-	chmod go-w ${CCL_RUNTIME}{,.image} || die
-
-	esvn_clean
-}
-
-src_install() {
-	local install_dir=/usr/$(get_libdir)/${PN}
-
-	exeinto ${install_dir}
-	# install executable
-	doexe ${CCL_RUNTIME}
-	# install core image
-	cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
-	# install optional libraries
-	dodir ${install_dir}/tools
-	cp tools/*fsl "${D}"/${install_dir}/tools || die
-
-	# until we figure out which source files are necessary for runtime
-	# optional features and which aren't, we install all sources
-	find . -type f -name '*fsl' -delete || die
-	rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
-	cp -a compiler level-0 level-1 lib library \
-		lisp-kernel scripts tools xdump contrib \
-		"${D}"/${install_dir} || die
-	cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
-
-	make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
-
-	echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
-	doenvd "${ENVD}"
-
-	dodoc doc/release-notes.txt
-	dohtml doc/ccl-documentation.html
-	use doc && dohtml -r examples
-}

games-strategy/freesynd/Manifest

@@ -1,4 +1,4 @@
 AUX freesynd-0.7.1-cmake.patch 931 BLAKE2B 0ad1994ad923355fdcae7c472a1440c88a848c409d5cc17b43d4d42e6307eb5c9f362efae5d81227d6ed6a7a4ecd5a7ec3492086e11f2208473190f2713fdd89 SHA512 994d12a2f079582bda03a600888c2d7ed2043468d69ce752e64deb45d156de5a7556edabd00d2635acc2c39882a8074193dc559e423e8e0181e9d4ea9d8b8b6f
 DIST freesynd-0.7.1.tar.gz 2576695 BLAKE2B 11b8f1d25768cdef6cf6894e8141cd13562a133a3253aa5b19034f0c54f114081dd97d41d230c74b5b1aaf66d84ad45d0c09ca5cdc72fb1de00a39ff23ad1272 SHA512 b87e6adaf71206532b4f90cd230ca6be00438fe26f000c5a0bfebf2839fea80d78d98ddc27331a2224874338c3e14ffbfa58b8c5bdbdc53c93bba8d6a9e6b7b4
-EBUILD freesynd-0.7.1.ebuild 1691 BLAKE2B 9ce42c87966e3108b7782a6d72320f13e9af343449e6412637bf46b042741f6a5d8e98cc2b9a7bde5b9cc305a37c303b270e0063dc5c9627c96655eda5d4eadf SHA512 bbc20b033504b95f9d45759c83ac02294a87fdcc58c5f7ac74df00e762d5f8610c663f56258b3398ff2c68abc39bb30d0ccfc3fb54f010ea94ae6d5bd1438060
+EBUILD freesynd-0.7.1-r1.ebuild 1640 BLAKE2B 2191d33a02ad08dc458bf5df63371f068014a63a3e6c6273296003d7ad7f53b7df7e37531176c20f2f97b733e18c0f3003849dbf2a2691c4bd8d7a7b34966c8a SHA512 8883509215a0c8bcf61d740f11b971bfff09cdffd0ef15fc3e7ccb526db7748cfde2d5c0b0e889874eaf8360df52f3f7e1a123a0709afacd923a10b04a455c0a
 MISC metadata.xml 401 BLAKE2B e83ee7425bd7de156c4ce45903a7fe00a12ad94f9e8bfe8ab0547458d2cf3f883fbbb319494a40bdabbadf2d85e74d0a929c43973d27550a7198bfd2c0e7add7 SHA512 5750ad5bed978d8a906a3cea47f3602257b5390bb87096c1e005d0c2bd1921b9033bdfb87f14506e88e8929268a9c9bb0003c9b343d0a0040b30df2058726152

games-strategy/freesynd/freesynd-0.7.1-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils cmake-utils gnome2-utils games
+inherit eutils cmake-utils gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="A portable reimplementation of engine for the classic Bullfrog game, Syndicate"
 HOMEPAGE="http://freesynd.sourceforge.net/"
@@ -13,23 +13,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug devtools"
 
-RDEPEND="media-libs/libogg
-	media-libs/libpng:0
+RDEPEND="
+	media-libs/libogg
+	media-libs/libpng:0=
 	media-libs/libsdl[X,sound,video]
 	media-libs/libvorbis
 	media-libs/sdl-mixer[mp3,vorbis]
-	media-libs/sdl-image[png]"
-DEPEND=${RDEPEND}
+	media-libs/sdl-image[png]
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 CMAKE_IN_SOURCE_BUILD=1
 
+DOC_CONTENTS="
+	You have to set \"data_dir = /my/path/to/synd-data\"
+	in \"~/.${PN}/${PN}.ini\".
+"
+
 src_prepare() {
 	cmake-utils_src_prepare
 
 	sed \
-		-e "s:#freesynd_data_dir = /usr/share/freesynd/data:freesynd_data_dir = ${GAMES_DATADIR}/${PN}/data:" \
+		-e "s:#freesynd_data_dir = /usr/share/freesynd/data:freesynd_data_dir = /usr/share/${PN}/data:" \
 		-i ${PN}.ini || die
 }
 
@@ -42,37 +49,28 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
-	dogamesbin src/${PN}
-	use devtools && newgamesbin src/dump ${PN}-dump
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin src/${PN}
+	use devtools && newbin src/dump ${PN}-dump
+	insinto /usr/share/${PN}
 	doins -r data
 	newicon -s 128 icon/sword.png ${PN}.png
 	make_desktop_entry ${PN}
 	dodoc NEWS README INSTALL AUTHORS
-	prepgamesdirs
+	readme.gentoo_create_doc
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	elog "You have to set \"data_dir = /my/path/to/synd-data\""
-	elog "in \"~/.${PN}/${PN}.ini\"."
-
+	gnome2_icon_cache_update
 	if use debug ; then
 		ewarn "Debug build is not meant for regular playing,"
 		ewarn "game speed is higher."
 	fi
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {

games-strategy/galaxyhack/Manifest

@@ -1,10 +1,10 @@
-AUX galaxyhack-1.74-boost-1.50.patch 3190 BLAKE2B 019a0f3a22376c5f78ac899a1819e73e402200b30aed49b4e523e00998b38cc35dba25be3212c614efc534ed481ce962f921391c11975d76868beda9cb5c6456 SHA512 72a715cbfcfd8faa7cbe3aa6def2f66f80194cacb50411c3b1a1995f04cdcb5d4d42d3dc8295a50d7969c20ae6e1ca31ad44ff0447f0b2782df27726e8a77de8
+AUX galaxyhack-1.74-boost-1.50.patch 3206 BLAKE2B c97b67ac602a440eb90ae481e0ef5837e64cf9ad3c07e722899b7e1c6701536df1af3dca5e7e645dc13bd3622b8bf7e1a274c0c0de24cb9f39287f1af2e5e14f SHA512 ce441bd44c44000b28520bba3c76b4e3d37fef5b424ddae1be4ee2e0675859ce22090c9e79a7fca37f46b16312b581201eb413d89cdddab3d6169c97ec0d6304
 AUX galaxyhack-1.74-boost.patch 245 BLAKE2B afb356c6fb7d2f5243466f84d5605e1cc13da00b842c2bc554d791f20de6c37ab6b563e3320b3f0f6ca242987c75ffe6fbaba5ba236bd833a3bc86361be689b9 SHA512 19a6ef4ee430edab619d60d4410d318e07ba3dd75b48036331029ff0de11ad5ccc73970825708764a7da9870d9ae8a7708a22176aa6698fdd4c2837bf3a91885
-AUX galaxyhack-1.74-destdirs.patch 386 BLAKE2B 8a9c60a773fd3bded4fb228d3aed5e144d6f4a71be57b375a9ce76c0442ec8607855e84334d33aa691e1d1507007d60dbddddf549dc1fdc015a5c4995ecf67a1 SHA512 d48bbc0b55baccbf290e81fce500436e9b13958d8028171608c220da05ecc676c4e3d3e78141d097569715fa7c4e8d4ea7a380fbd485bee1ea85178a6b3235b7
-AUX galaxyhack-1.74-format.patch 1764 BLAKE2B de91a08e31c75a0b3912bf5678577f56c823b6bf20350e6a650e583cdfec6ca282268036cfb3fe22637a11a8e4d78ccf01f35e90f4fb1dcf86dd080f3aaf43c0 SHA512 2a2eadc378761c2827e7519f41805d202867c6df60d66bc3ff6dc2ae26ea7a4acc5b804c04d4c5d91bc9f3d6d8ee4b785f715e60c26197f649c78dad63c8bd4c
+AUX galaxyhack-1.74-destdirs.patch 390 BLAKE2B 5c807a22493528f472e3d5e9366ab4b8bacfb7d3a7c31291a3a1e8cf872fcd2cf9c3e373e53bffa9d92af68bf9549c6ebf44a6aaa8d6cd10f6afcfd6e6906690 SHA512 d154eb0b0116fa1e067bae12db82cef5eb3bf882683f624becb54244ffa744a3bdc7ebe77fe6e87c634f42f649cc8dd0fb7067aa5d2cb5b8a72cf50cdbfe7702
+AUX galaxyhack-1.74-format.patch 1768 BLAKE2B 5a0ee8e935c557ac25b470e1914f242da093352321ba34c067ca3997e3892aff3f6330b827bc7d08c7541cc1e9e0cb2e0b4e0d938ddd1f9cfd21916b11f978e3 SHA512 e38280f9a06426a77abea3a10de6ce23868dd2d4df0c398832856bfa5e39c329cf39b39bd4ff766c54fd72813933c502ca9a63750b7a4160e536a40a08bc0ba3
 AUX galaxyhack-1.74-gcc43.patch 309 BLAKE2B f8af1b8b2d4d50bb37eb13237915638d746a79daa621d81958bf99d7071178d3402989fa0fbeb9d67abffea4a15a97d1da263855b5ac17b1caf96213ebddcb31 SHA512 21169edbaf8f4c0d8f4fcd44a494e0121fb332b42cf14ba09818cf871cfdb792e4bbe00c7ae1b9ddc9094c96edda785f2763c76a70dcf92ec7ea163e3248aaa0
-AUX galaxyhack-1.74-gentoo.patch 988 BLAKE2B 41e809c49632ba24c51485b0176e98cbfeefc623ab56e1c705a4fbc1524947591ffff77a89e91019d4e9abc54a50257e30b8f0f40ec661c9f98268b1ea8e2874 SHA512 5cff46c4443d402e835eb6bebb6f037bd9c443b6522c6d05cc1abc101d0ad52d625fe2039bf2bc508b08bff9403dbfd6afa8e3dcefc0201d07596b5ac431a70e
+AUX galaxyhack-1.74-gentoo.patch 992 BLAKE2B 63ca6fee15f9f088e2c8a73566d5a7579ed4636d8048771ee01aa40a6f8edd1013e1d6a710d45caa951311709c19ed3d670014bfd1513982c317d6ea5d1b4d34 SHA512 e268019e57c95caf6f24331e0c1f6bb0f47507940e8621cf5307f5cdd24cdd9ab49307208f6914558df35bedd725db38374c04b4f887c89814896ce9902f7b0a
 DIST galaxyhack-1.74.tar.bz2 9948336 BLAKE2B 2029e4a27e2995ebd8bb4f7e9192fc353b22a0246e5bca5294a9a09ee936c0050682dcff52a233b87d659a6a4e98f56fcd4b563fb1159b52f6f596a5413a687b SHA512 d708494b1ad572c0243da9e7168b4707112ec3c99a09498b87f8e0cb2e4e5bc9df8dc4631e3fb4d3cd7517ec4b17e937798dec3fcf770de9d0fc1b5e29a0bd58
 DIST galaxyhack.png 819 BLAKE2B c19a6c05313eedfd118de0b02b688e98dc011a760da10c5edc6ee15eea3668e7dbf19fcbc7546807221b3b727056c5d5075c91cae699300c6d7b19c939b0f2b6 SHA512 b8ab4dd1c18c079ec3f60b3d04843fbb7a892feb8f872d498c20eb3142e7de26bff90c93b308656e1afe5ee77074fcb3f78542dfd175c27a9b865a512e0b0200
-EBUILD galaxyhack-1.74.ebuild 1578 BLAKE2B 8a35bc46379c642eca5ff1b24c113078a965322511a3eea13d833a10ef8b43c8e5282e3902ce4004d794d25b24e5c8c1aa33159b7264aef2e4f85aa95ea6ce8e SHA512 f22e19012eacbf09429983540abbfa5c8433ae98604c7badd3eebbf365d28aad172dbf7a4859daeb9f470c42089b8d6afd7e86632ca08f3ae76f927b3e57bc7e
+EBUILD galaxyhack-1.74-r1.ebuild 1592 BLAKE2B afde825de3df81f6b18cce5376f30059763dfeab87c154a8b3f7fa9c4a7d011a66cd53b2a3df165bd3c05eb858317c1f9ee20545b10295fb76eca3691a5c265d SHA512 abd828bf419949722c7261439c6bb386b9f6813da6bd6c68c91d8084ae4a0d04f2b6f6660116a8cc969a742ed62ce05bec3306fa58bca93d79186af3d00c4072
 MISC metadata.xml 1383 BLAKE2B b358635bd0e1f15560dc84368bc32eb1de4a487ca377924d82f3d2b28912ec702a07fa34565fea4fdf77280599403187b670a103d3d158e0c5ccfa3265257725 SHA512 1857f21b7f01d16e5eaa7fd6f3b653c820837d5b47022bf47c02af44c5bb00f0010c36c722aa1225d0cf0cdec8d85c4f6f14e5c7c0785da8706ea9886a72b285

games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch

@@ -1,5 +1,5 @@
---- ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
-+++ ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
+--- a/ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
++++ b/ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
 @@ -1596,15 +1596,15 @@
  	fs::directory_iterator directoryEnd; // default construction yields past-the-end
  	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {
@@ -20,8 +20,8 @@
  		
  		fs::copy_file(*iter, destPath.string() + "/" + destFile);
  	}
---- Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
-+++ Main.cpp	2012-08-20 17:50:51.000000000 +0200
+--- a/Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
++++ b/Main.cpp	2012-08-20 17:50:51.000000000 +0200
 @@ -339,12 +339,6 @@
  
  void GameInit(char* argv[]) {
@@ -35,8 +35,8 @@
  	
  	FindHomePath();
  	LoadSettings(argv);
---- Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
-+++ Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
+--- a/Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
++++ b/Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
 @@ -206,7 +206,7 @@
  
  	fs::directory_iterator directoryEnd; // default construction yields past-the-end
@@ -64,8 +64,8 @@
  
  		if (filename.find('.') == filename.npos)
  			continue;
---- Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
-+++ Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
+--- a/Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
++++ b/Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
 @@ -657,7 +657,7 @@
  	fs::directory_iterator directoryEnd; // default construction yields past-the-end
  	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {

games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch

@@ -1,5 +1,5 @@
---- Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
-+++ Main.cpp	2006-07-28 00:08:28.000000000 +0200
+--- a/Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
++++ b/Main.cpp	2006-07-28 00:08:28.000000000 +0200
 @@ -184,7 +184,7 @@
  #ifndef WIN32
  	string settingsPath = userHomePath + "settings.dat";

games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch

@@ -1,5 +1,5 @@
---- JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
-+++ JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
+--- a/JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
++++ b/JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
 @@ -47,14 +47,14 @@
  	if (!globalSettings.batch) {
  		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {

games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch

@@ -1,5 +1,5 @@
---- Makefile.old	2009-02-11 22:21:26.000000000 +0100
-+++ Makefile	2009-02-11 22:20:58.000000000 +0100
+--- a/Makefile.old	2009-02-11 22:21:26.000000000 +0100
++++ b/Makefile	2009-02-11 22:20:58.000000000 +0100
 @@ -6,12 +6,11 @@
  # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
  #

games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=6
+inherit eutils flag-o-matic readme.gentoo-r1
 
 DESCRIPTION="Multiplayer AI script based strategy game"
 HOMEPAGE="http://galaxyhack.sourceforge.net/"
@@ -14,47 +14,55 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[video]
+RDEPEND="
+	media-libs/libsdl[video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[mod,vorbis]
-	>=dev-libs/boost-1.34"
-RDEPEND=${DEPEND}
+	>=dev-libs/boost-1.34
+"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}/src
+S="${WORKDIR}/${PN}/src"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Settings will default to those found in
+/usr/share/galaxyhack/settings.dat
+Per user settings can be specified by creating
+~/.galaxyhack/settings.dat
+
+Additional user submitted fleets can be downloaded from
+http://galaxyhack.sourceforge.net/viewfleets.php
+"
 
 src_prepare() {
+	default
 	edos2unix Makefile
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-destdirs.patch \
 		"${FILESDIR}"/${P}-boost.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-boost-1.50.patch \
 		"${FILESDIR}"/${P}-format.patch \
 		"${FILESDIR}"/${P}-gentoo.patch
-	sed -i "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
+	sed -i "s:@GAMES_DATADIR@:/usr/share:" \
 		Main.cpp || die
-	sed -i "/Base data path/s:pwd:${GAMES_DATADIR}/${PN}:" \
+	sed -i "/Base data path/s:pwd:/usr/share/${PN}:" \
 		../settings.dat || die
 }
 
 src_install() {
-	dogamesbin "${PN}"
+	dobin "${PN}"
 	cd ..
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r fleets gamedata graphics music standardpictures \
 		settings.dat
 	dodoc readme.txt
+	readme.gentoo_create_doc
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} GalaxyHack
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	elog "Settings will default to those found in"
-	elog "${GAMES_DATADIR}/galaxyhack/settings.dat"
-	elog "Per user settings can be specified by creating"
-	elog "~/.galaxyhack/settings.dat"
-	elog "Additional user submitted fleets can be downloaded from"
-	elog "http://galaxyhack.sourceforge.net/viewfleets.php"
+	readme.gentoo_print_elog
 }

games-strategy/glob2/Manifest

@@ -1,8 +1,8 @@
-AUX glob2-0.9.4.4-gcc44.patch 184 BLAKE2B 4db1a71f4458ff28f263855c61639d60fe0203b6d9bc3267556257d4e16c2cfa659e03e01fcc9082b33dac01dbce2807d5d7ec644d83be042e880e5e475dd51b SHA512 e3d5d84c4c9240806ec97eace315b92288da4cbb28da230f91e3dc9aa224d4b7e010d4e132b53a538ae7d477a72320b27b482e9423182d1496751dbec58f461f
+AUX glob2-0.9.4.4-gcc44.patch 188 BLAKE2B bd6fc1a3ad79eb29e070d53099079c403553add1e8fcf513d8c5cf58902120ff0735ad0cc78d396329ababf64d94355c21b9e2269046467b8a68069cee0afdc4 SHA512 c341e484311fa508f9a034d216729fa7a8251e6fb710fe6417bd0a000b89a870cf5a24850e6126a704f160fee064fa7211973da8f3720dbd9a96df86adcd67fd
 AUX glob2-0.9.4.4-gcc49.patch 907 BLAKE2B f7ad515c19660af0713ca8c79c40a4c225372da85d17dfa58bc4a31e65bdced9a24ae9ff3f8f57f623da0011b24d841618bfc8fe09000703db94bc9e89a66971 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac
 AUX glob2-0.9.4.4-gcc6.patch 1767 BLAKE2B 41716842d1d0552e4ea05e4ae189b92ea600ca5e31604bf19e5659ca6690c7e394d25f11baf3fee07b9bdfcba6a748586b152a0141312daad89ab76946ea4d82 SHA512 d2eddfe657f81a1ec085298f09aafb904d22a80d601aca6405d92d6f17b28d0f3f3b5b445a9423988b7bc8869ca41698783e4139928f9f2ba33093ded6a3cb02
-AUX glob2-0.9.4.4-scons-blows.patch 904 BLAKE2B 45368edec58d1e5421b195eb29eb9a410d45b79a90516e8064f883759d80d34ff7d63e1d3acd73e196b0c37b2d9491ca6e9d83a4163604a1d6caa2b07a330b2c SHA512 1018f2481d82df9b5e8ddd497fc1878a58a13e54c369e3e3f3a9f541f5140a92fec54460da5ff76c6913ad202385c53534d4c88e0140b8d4f65b759e23393a7b
+AUX glob2-0.9.4.4-scons-blows.patch 908 BLAKE2B 6d677c0588dbad9f44307579549946c8979b956331be3ef667fb4bbcd6fdf3e9889b22cd4c9458a76f487b12bc73ae73dfba03e0c1f86fb228e1934b1d4e67cc SHA512 0d805014200c76ca571ecc97c284b9168f280df0e88060c880b284b8e3d5490c1512708857bb22a0b2a4e4b78716d98ae26ae552531f661bb38f6dd75af474d3
 AUX glob2-0.9.4.4-underlinking.patch 672 BLAKE2B 59fbd0afacd468cc6a2e6e18336c524653697f42404124d9b2347246130ba390a202cb2b88fa223bd80063e6555211a5065cbf08dd4d113b7dadd2e0ad9a3f41 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21
 DIST glob2-0.9.4.4.tar.gz 11338986 BLAKE2B 047f27385c9b819c6ca2614406d340ff2cb7dcc26c8a20a205b11dce234af4ea52cb4eb04b7ed5b695382b17b34b5dd50387d61cfecaced16ee61b3c69c2921f SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca
-EBUILD glob2-0.9.4.4-r1.ebuild 1359 BLAKE2B 58ceb47c146236b1f413f7fa9ba467a33c099fb71cacdc59abd9f86bd9d4755147b9ba2f4d45252fe89867a405cbce651c9e62ddad9c4864fcb1144cb99c332d SHA512 ebdd3dcc79fb25babdfd3ff81323ef778a9da2b9c4980edc7e059eb19d8fc7037a1bec7b9b56ab05992accf0d50b552ec90896a7188c031f43b51995698d9457
+EBUILD glob2-0.9.4.4-r2.ebuild 1251 BLAKE2B 41c2a82cecb07b7e544d457519af07829702584b083990933ac2f2a64024cc10e3a5bd9546dcf9712fa762560efbae6bf3ffdd3d53d45ffc3259d3d145947f39 SHA512 aff57e535f19cae25e86dd0f85edbcccec499951d5e12c2c718bc83f70f061de9b6b5f705a4da86e0d2dee51f815383e73f6495e0644a9eb5fed9c4396876e36
 MISC metadata.xml 637 BLAKE2B 405198c067618ace05cf22e6b790a356eb643cddf921f07a37516cc661f37706adab72edde18639abaa5b23ebfe771877ced14f1eacb3d9da83ed5c9e32213f5 SHA512 af021418808275511478f34bcbd4a3fadd193a583c7e94c676e94d39d10fb23c8d2de7b3ef5c8da81f2f6291a3bf9d0cc09448aea1b16959e7c811ba38d64e66

games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch

@@ -1,5 +1,5 @@
---- libgag/include/StreamBackend.h.old
-+++ libgag/include/StreamBackend.h
+--- a/libgag/include/StreamBackend.h.old
++++ b/libgag/include/StreamBackend.h
 @@ -28,6 +28,9 @@
  #ifdef putc
  #undef putc

games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch

@@ -1,5 +1,5 @@
---- SConstruct.orig
-+++ SConstruct
+--- a/SConstruct.orig
++++ b/SConstruct
 @@ -1,6 +1,7 @@
  EnsureSConsVersion(0, 96, 92)
  import sys

games-strategy/glob2/glob2-0.9.4.4-r2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils scons-utils games
+EAPI=6
+inherit desktop gnome2-utils scons-utils
 
 DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
 HOMEPAGE="http://globulation2.org/"
@@ -23,17 +23,16 @@ RDEPEND="
 	media-libs/sdl-ttf
 	media-libs/speex
 	virtual/glu
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch )
 
 src_configure() {
 	myesconsargs=(
-		INSTALLDIR="${GAMES_DATADIR}"/${PN}
-		DATADIR="${GAMES_DATADIR}"/${PN}
+		INSTALLDIR=/usr/share/${PN}
+		DATADIR=/usr/share/${PN}
 	)
 	escons data
 }
@@ -43,23 +42,20 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin src/${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin src/${PN}
+	insinto /usr/share/${PN}
 	doins -r campaigns data maps scripts
-	find "${D}/${GAMES_DATADIR}"/${PN} -name SConscript -exec rm -f '{}' +
+	find "${ED}"/usr/share/${PN} -name SConscript -exec rm -f '{}' +
 	newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png
 	make_desktop_entry glob2 "Globulation 2"
-	dodoc README*
-	prepgamesdirs
+	einstalldocs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 

games-strategy/knights-demo/Manifest

@@ -1,3 +1,3 @@
 DIST knights-demo-1.32.run 31667235 BLAKE2B ee9c63a261aaea93122b790ef3d4df21b30b53d8f47e2f1549c3e6aaf7a09f04b5f7985e6d26e395266176fa9135cb7257bfc5c6f5eba7524da19758ab241715 SHA512 f53cf9524811b4a83ec2531f62ea251fc5a939cb09445ab850c7bbac85301e8b8275dda12a8dc991e4412eb4358d7597d0c007bd9263fd875289b039b941ed9c
-EBUILD knights-demo-1.32-r1.ebuild 1214 BLAKE2B 2922e3b244a176a7aa2e86f65c3121931c41b83a557765d6220cfc97608ba303234e03ff79eccf50460c31bb99a35b3861ee28ddc3c4b5f70f84fc0d0b7b849a SHA512 8f0d92229c3d11e1f62d23be5070d5a15a419ea61b89edf08e5d0708bf7fd609ad6011a318a68395f2475ea47a7e177eb1de3b71d5fd8f450d1be070da8b0e0d
+EBUILD knights-demo-1.32-r2.ebuild 1183 BLAKE2B 7474ab747a641cb6913a5aa26d4fcaf1e0fd319b5db9e50d133ba05af9828a6caf76318f66d627ce23b19880c92fc2e2ef27e12b3511e298d57995844a4005ce SHA512 213b7a7f8fe80e919077ad35fa68ed7d7c111ef408917e55ab307afade34ea4843bf6a0f2d6ac4a01f2d10768fd57d8bd670c04f3a20389e8d6a2485a8a8b231
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118

games-strategy/knights-demo/knights-demo-1.32-r2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker games
+EAPI=6
+inherit eutils unpacker
 
 DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
 HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
@@ -11,18 +11,19 @@ SRC_URI="mirror://gentoo/${P}.run"
 
 LICENSE="knights-demo"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
-RDEPEND="sys-libs/glibc
+RDEPEND="
+	sys-libs/glibc
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
 	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]"
-
-S=${WORKDIR}
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+"
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack_makeself ${P}.run
@@ -32,7 +33,7 @@ src_unpack() {
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 
 	exeinto "${dir}"
 	doexe bin/Linux/x86/${PN}{,.dynamic}
@@ -42,8 +43,7 @@ src_install() {
 	doins EULA icon.xpm README{,.licenses}
 
 	# We don't support the dynamic version, even though we install it.
-	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
 	newicon icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Knights and Merchants (Demo)" ${PN}
-	prepgamesdirs
 }

games-strategy/lgeneral/Manifest

@@ -1,4 +1,4 @@
 DIST lgeneral-1.3.1.tar.gz 1678892 BLAKE2B 701b22a8967c037e2385a1f1bbb2e91703cbffc7fff6383f3d593fab07dc01fa352f9ec3ee25dfbbdd5172c4e8cd804bd7f9fa2a84a3c6a22f581884c8d7d9d9 SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5
 DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516
-EBUILD lgeneral-1.3.1-r1.ebuild 2022 BLAKE2B f42273e255ff9045a550a039f4eaa2a99f74928c7f55c63658187301b712a458d1e4f9243756b0e7a292aff422b5c42bf10cd2ad9a0482317756774ece18102b SHA512 1cc1b63ea06323231b8d7e8e473e6c356e49f6f6bf51fab62dde095477eaf0c4700c9c591633057974647bf6152ea27aa1732e3d31dc3304b59c4259647e4fb8
+EBUILD lgeneral-1.3.1-r2.ebuild 1922 BLAKE2B 743229424c55bc5581c30bcccf727efe5720294f8449e58113acf4a3b83a4a5c101430aad7ac12c0a1fbea35a053e93b5f05138b3a5d36ab22d9a662d2a86ee2 SHA512 5edbe0077b8fcca017235986c57c481ac88798494830015feaf57efee555614562fab26f17a51b9cd65621846e906ccac8e8657956af76db3e48c0ddefd10585
 MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb

games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools gnome2-utils games
+EAPI=6
+inherit autotools desktop gnome2-utils
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/beta-}"
@@ -16,15 +16,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="media-libs/libsdl[sound,video]
+RDEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/desktop_DATA/d' \
 		-e '/icon_DATA/d' \
@@ -38,26 +42,25 @@ src_prepare() {
 	# Build a temporary lgc-pg that knows about ${WORKDIR}:
 	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die
 	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share:" \
 		-e "s:@D@::" \
 		{lgc-pg,src}/misc.c || die
 
 	cd "${WORKDIR}"/tmp-build || die
 	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share:" \
 		-e "s:@D@:${D}:" \
 		{lgc-pg,src}/misc.c || die
 }
 
 src_configure() {
-	egamesconf \
-		$(use_enable nls)
+	econf $(use_enable nls)
 
 	# Build the temporary lgc-pg:
 	cd "${WORKDIR}"/tmp-build || die
-	egamesconf \
+	econf \
 		--disable-nls \
-		--datadir="${D}/${GAMES_DATADIR}"
+		--datadir="${D}/usr/share"
 }
 
 src_compile() {
@@ -70,26 +73,23 @@ src_compile() {
 
 src_install() {
 	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
+	keepdir /usr/share/${PN}/{ai_modules,music,terrain}
 
 	# Generate scenario data:
-	dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901
+	dodir /usr/share/${PN}/gfx/{flags,units,terrain} #413901
 	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg --separate-bridges \
 		-s "${WORKDIR}"/pg-data \
-		-d "${D}/${GAMES_DATADIR}"/${PN} || die
+		-d "${D}"/usr/share/${PN} || die
 
 	doicon -s 48 lgeneral.png
 	make_desktop_entry ${PN} LGeneral
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 

games-strategy/lightyears/Manifest

@@ -1,4 +1,4 @@
-AUX lightyears-1.4-gentoo.patch 1276 BLAKE2B afa822f2840070097644fdf6f6b6c25ba88dff59ef9a6fdc7b578aed266ea60f8dd797f7ae705e28d9bbfa65b9ca7fcf60af2b511b95890486779f8649df1866 SHA512 3388a5bbb384cbaaef29776f3f05c789df8955a86ead9ccb88dbcc48c623ae16a3cb2c498c48db49e87f57ae8a8bd174219ae14cb848903394331bb4635f0b61
+AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
 DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
-EBUILD lightyears-1.4-r1.ebuild 1110 BLAKE2B 0bbaa058ca140091bc57a0ccd15a26c08705dab81339eefa02a255195a3cb08a88c2ae062d30388ef968d9f0b36eb93bf0534e0e64bcd00387e164f8a213c3ae SHA512 29d991cfd0261ec7f7441e13afbd23e9e85861009ee5f74ea069a894c7a87971cf69328da8535a2989a6be71696953806d47266d106a150b81c8dcb708245824
+EBUILD lightyears-1.4-r2.ebuild 1020 BLAKE2B d692c8e1087689b67a62a8785869d5c66511bdfd8114e9b27378ab0c3b35418b733eb8c4d37bfcfa25a2943a035207648d0e39eb39b3ec3b318f4c3197491e9e SHA512 1721d4023d7a275d67f691e867d857200d7c9e71b871b4b7fec34302707324ebf8d88c47d03d0331e149ca9ace89daceece333415c45225f690220574cdae087
 MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13

games-strategy/lightyears/files/lightyears-1.4-gentoo.patch

@@ -1,5 +1,5 @@
---- lightyears
-+++ lightyears
+--- a/lightyears
++++ b/lightyears
 @@ -1,7 +1,6 @@
  #!/usr/bin/python
  

games-strategy/lightyears/lightyears-1.4-r1.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="a single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org/20kly/"
-SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		${PN} || die
-	python_fix_shebang .
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	insinto "$(games_get_libdir)/${PN}"
-	doins code/*.py
-
-	dodoc README.txt
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r audio data manual
-
-	python_optimize "${D}$(games_get_libdir)/${PN}"
-
-	newicon data/32.png ${PN}.png
-	make_desktop_entry ${PN} "Light Years Into Space"
-	prepgamesdirs
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}

games-strategy/lightyears/lightyears-1.4-r2.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="A single-player game with a science-fiction theme"
+HOMEPAGE="http://www.jwhitham.org/20kly/"
+SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${P}"-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		${PN} || die
+	python_fix_shebang .
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/"$(get_libdir)/${PN}"
+	doins code/*.py
+
+	einstalldocs
+
+	insinto "/usr/share/${PN}"
+	doins -r audio data manual
+
+	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
+
+	newicon data/32.png ${PN}.png
+	make_desktop_entry ${PN} "Light Years Into Space"
+}

games-strategy/liquidwar/Manifest

@@ -1,6 +1,6 @@
-AUX liquidwar-5.6.4-exec-stack.patch 430 BLAKE2B 712aedee771cd1958ec252852d6f889f867c4264ec81b10e833257ee4c9d7f33977b1729b20c19940d9ae35d3a08df12e4302c6efa538c16934f5a9c1cd311fb SHA512 e5f068a73bc8a13f85350823fb12264adaaa2e4ad7b19dcba6d3bb81c8ff70818a274adb9827665208bc5d63cde59a7ec5c2bc83fd3449b4e8fbffd4d8ef5ce7
-AUX liquidwar-5.6.4-ovflfix.patch 696 BLAKE2B 5117cd7286b75cdba47a9849a6c1dd65339682b9a387a374bb25340c09daea66bcf983022c66ca2fb92ff81083ed10f11fce24346a949e6a7cf40c69de767cad SHA512 2d1b72ac481ef9c742e4b22e012805161e628fcdbebc8b55084c03fae63f0fd88da92ce1827ad08c27da2ca2c0ec3482726e4524887385cf4fc75f202c302102
-AUX liquidwar-5.6.4-underlink.patch 438 BLAKE2B c57af7199c560f3b82cc007c20a8d525aceb4d1f8867df207711a3ecd3c31013f88677734d9283b9ee0a67122b550efcd84cd9bde180c26ad1afe3c93ab89753 SHA512 c4795242e102566d208ca57d68fdb60d3c69d0aec5c8a2f196e4bcbfa91e64c07cb8b06d82e870c059405967f8563090a8910ace3bad17b9591047329ccbe3d5
+AUX liquidwar-5.6.4-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a
+AUX liquidwar-5.6.4-ovflfix.patch 700 BLAKE2B d0a46b244008d78eaa67cba8f8a39a710c8b75d64876a9e7eae86b168c94f8111326739795b061a2209c70fbb05399291cfdfa6f580c3439e7a68768e9049def SHA512 0d242ff7ba17af4b5d61e040b37fbf363d5c4bec615af21e2b2ea77f7cef4633f66a870196e40b590c6609ed15c90208172154b4e613b6ea0d4fe0f2189bb294
+AUX liquidwar-5.6.4-underlink.patch 442 BLAKE2B bfd7beea85546fca013de4229bbd0b1a658f87a608d1340e2463304c72b1d6e82917a95052488f53be40e3bfcafcf23b13007d8f86d541c8236e6dbaeec1c948 SHA512 3835cad62e8141774c5675d1dbc22103cb41a6af0d4a0a70b23e96d88fe72f49b872823bfb9f35294b8d1bec5d6e89942b37928ee92bb53ecb177a560fe8559d
 DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
-EBUILD liquidwar-5.6.4-r1.ebuild 1535 BLAKE2B dfec55beda94bfc7783644f15e53d98d926d4eb0c8f83a2846522312018770819fe32da0799deb816a30c43a728e8f5bda57fd81d8eaad71e6e4593eb6cb33f4 SHA512 4ceaf10463625f3d484e2e95d4097bd92133889216b9c1a3828ad99ce004a91e9b6cfe9459d29e8647acb9fa989570a8a3dea2df635f010d435a62722beb4248
+EBUILD liquidwar-5.6.4-r2.ebuild 1650 BLAKE2B 92597eae770aa2a1063101a383eb406922c969b9adf8187b812fa98ae04d6135b29dcb90440190c0a02d2637d3f06752894c7a122aac3c88a62a3a67fa08558f SHA512 4adc6c05c0f9c319ba75c3720679040bdf5e2b2e269ed1208cf155a44b26b14d015943b5520233adcb86156f007b16840f8696d1d150933b1e8cc1b89f5c86c9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118

games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch

@@ -1,5 +1,5 @@
---- src/glouglou.s
-+++ src/glouglou.s
+--- a/src/glouglou.s
++++ b/src/glouglou.s
 @@ -240,3 +240,6 @@
  
     ret
@@ -7,8 +7,8 @@
 +#ifdef __ELF__
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- src/monster.s
-+++ src/monster.s
+--- a/src/monster.s
++++ b/src/monster.s
 @@ -972,3 +972,6 @@
     ret                              # retour au c
  
@@ -16,8 +16,8 @@
 +#ifdef __ELF__
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- src/spread.s
-+++ src/spread.s
+--- a/src/spread.s
++++ b/src/spread.s
 @@ -957,3 +957,6 @@
  
  

games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch

@@ -1,5 +1,5 @@
---- src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
-+++ src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
+--- a/src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
++++ b/src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
 @@ -100,12 +100,12 @@
  
    data->privacy = privacy;

games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch

@@ -1,5 +1,5 @@
---- src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
-+++ src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
+--- a/src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
++++ b/src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
 @@ -223,7 +223,7 @@
      EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
  else

games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild

@@ -1,30 +1,32 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
-DESCRIPTION="unique multiplayer wargame"
+DESCRIPTION="Unique multiplayer wargame"
 HOMEPAGE="http://www.ufoot.org/liquidwar/"
 SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="nls"
+IUSE=""
 RESTRICT="test"
 
 RDEPEND=">=media-libs/allegro-4.2:0[X]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-exec-stack.patch \
+	default
+
+	eapply "${FILESDIR}"/${P}-exec-stack.patch \
 		"${FILESDIR}"/${P}-ovflfix.patch
 	sed -i \
 		-e 's:/games::' \
 		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
 		-e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
-		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applnk/Games/:' \
+		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
 		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
 		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
 		-e '/install/s:-s ::' \
@@ -36,11 +38,11 @@ src_prepare() {
 		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
 		-e 's:/games::' src/Makefile.in \
 		|| die "sed src/Makefile.in failed"
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	eapply "${FILESDIR}"/${P}-underlink.patch
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--disable-doc-ps \
 		--disable-doc-pdf \
 		--disable-target-opt \
@@ -54,7 +56,9 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install_nolink
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	use nls || rm -f "${D}"/usr/share/doc/${PF}/README.*
-	prepgamesdirs
+	einstalldocs
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+	# Provided desktop file is completely obsolete
+	rm -f "${ED}"/usr/share/applications/liquidwar.desktop
+	make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
 }

games-strategy/majesty-demo/Manifest

@@ -1,3 +1,3 @@
 DIST majesty_demo.run 36582366 BLAKE2B f972f5d98eb0a907d7b34dd09c8a1eabb67ded08287e147f08125a6b6e833e4e7c18f8374873b532f765a6c121a6885a46f06645eddb4245db93e801f5a67328 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79
-EBUILD majesty-demo-1.0.0.ebuild 1089 BLAKE2B 2d3957f4ec11fb251798c205826415df45da5a03e51e2a047ad760584975ae6b2714bdb075c88a021cb35e21d724e78b5a534bbe70824316a99f35cfbb276bf4 SHA512 a1046e24279cbe5f48e1a0dd09fa96d3ca18935ec2e56ae712f68cc5d39c7d3b923d62866f11847d42072ee0ca4f025f9e8dca15d2416602943eadb2bd251cae
+EBUILD majesty-demo-1.0.0-r1.ebuild 1029 BLAKE2B 129421df38286b45c02fdafbbc4dac32b8f23ce76ee1c7c8a57fbe9383687f15341c2187ee9ec95259b4b550ac3f97ade3ea10a663af2509c89e65221d87b378 SHA512 e6c950304ea53be9627c53fbfbe37bfe57d4a3338375ee675cf5c4a5bc53cb9cd1c5f378f121ba102ba2d98d35370f0e50cf76c1ac9e7378ac880bb1be27d8c2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118

games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker games
+EAPI=6
+inherit eutils unpacker
 
 DESCRIPTION="Control your own kingdom in this simulation"
 HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=8&"
@@ -14,30 +14,30 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist strip"
 
-RDEPEND="sys-libs/glibc
+RDEPEND="
+	sys-libs/glibc
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]"
+	x11-libs/libXdmcp[abi_x86_32(-)]
+"
+DEPEND=""
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
+dir="/opt/${PN}"
+Ddir="${D}/${dir}"
 QA_PREBUILT="${dir:1}/maj_demo"
 
 src_install() {
-	dodoc README*
+	einstalldocs
 	insinto "${dir}"
 	exeinto "${dir}"
 	doins -r data quests
 	doins majesty.{bmp,xpm} majestysite.url
 	newicon majesty.xpm majesty-demo.xpm
 	# only installing the static version for now
-	if use x86 || use amd64; then
-		doexe bin/Linux/x86/maj_demo
-	fi
-	games_make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
-	prepgamesdirs
+	doexe bin/Linux/x86/maj_demo
+	make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
 	make_desktop_entry maj_demo "Majesty (Demo)"
 }

games-strategy/naev/Manifest

@@ -1,4 +1,4 @@
 DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
 DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
-EBUILD naev-0.6.1.ebuild 1613 BLAKE2B 57d2ba59bc2f19844237c470571514c568c74bf7ccee7096f6039ee8053050e5abe7018c11c10e822742c3a27d539be68d6a6136fa5b125ddf8032cf483768d8 SHA512 7ac47a9bdb8d43193b77e9c6164e186020267e27463e84bbb9bb46a98c57deb025e9ab982aaa09eb71ad18d183689fa2e06cdd65adee65c0baff505fb370a940
+EBUILD naev-0.6.1-r1.ebuild 1545 BLAKE2B 44c10dd5764f76cfb8c693d5b75072d0262f91ee88e1d0769cc931508b494f710536b6c4bf922b9a97de65f04752a8c4d416ec2323e26677900321725f6a2da9 SHA512 787650821eb5ca41c6c816961fee73b30ed915c2c2ad1fc95c1b389e32230ce809f41e92d601aa662af867db361b6404ebb66f85902b1de4b178cf52268272a0
 MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62

games-strategy/naev/naev-0.6.1-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit flag-o-matic gnome2-utils games
+EAPI=6
+inherit flag-o-matic gnome2-utils
 
 DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
 HOMEPAGE="http://blog.naev.org/"
@@ -14,26 +14,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +mixer +openal"
 
-RDEPEND="media-libs/libsdl2[X,sound,video]
+RDEPEND="
+	media-libs/libsdl2[X,sound,video]
 	dev-libs/libzip
 	dev-libs/libxml2
-	>=media-libs/freetype-2
+	>=media-libs/freetype-2:2
 	>=media-libs/libvorbis-1.2.1
-	>=media-libs/libpng-1.2:0
+	>=media-libs/libpng-1.2:0=
 	virtual/glu
 	virtual/opengl
 	dev-lang/lua:0
 	mixer? ( media-libs/sdl2-mixer )
-	openal? ( media-libs/openal )"
+	openal? ( media-libs/openal )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_unpack() {
 	unpack ${P}.tar.bz2
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--docdir=/usr/share/doc/${PF} \
 		--enable-lua=shared \
 		$(use_enable debug) \
@@ -52,8 +55,7 @@ src_install() {
 		appdatadir=/usr/share/appdata \
 		Graphicsdir=/usr/share/applications \
 		install
-
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	newins "${DISTDIR}"/ndata-${PV}.zip ndata
 
 	local res
@@ -62,17 +64,13 @@ src_install() {
 	done
 
 	rm -f "${D}"/usr/share/doc/${PF}/LICENSE
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 

games-strategy/netherearth/Manifest

@@ -1,10 +1,10 @@
 AUX Makefile 1003 BLAKE2B 53264f4ebfcb11142d6c503263d47825cb9f3370a9e291551043aab616da09fb936e293a01eb5f4916ebd29690e315004b0dfa2303f2853963b3e80e0b260d59 SHA512 72cb6f6cb31beb79d91ac3b60eff1cb4046fcecd83621c42ff34a145eefbf484b8bc87ed3c2792bec7d1587d2578c95b4a4b925f9a032c8eefe9a9208a96fcdb
-AUX netherearth-0.52-freeglut.patch 367 BLAKE2B 688a05a5727592641025ef383bf5d2d369b2b2bdf786882151b1143292ab9f6a9965a6fc26136530c3972a1c47fbd58f0215c4c5a9d90ea701ed480ac44282a1 SHA512 c430a2e409c8b1be98a6d9147d429e98a8333541fdbf7e070c87230b85b43bdde9e6665338281d6a984f20a6af29127b9a165086d0c5a2a33ab392649f762c9d
+AUX netherearth-0.52-freeglut.patch 371 BLAKE2B 3b480c96a2ce423213e870a3310a2d0411717662b1f557268ceaf46a4ca7710044a82f7df0f9d2128006a0e7dcad6322be86b91260d4f4f2a6a2215ec66b4c02 SHA512 125c27de71d4c600f78ca3c6f86e6431a6ae20cfc2b12238f3fdfca99bc77bbe90ffb5f3b98ee58d987d8852b154d63342f1677eae99eeebff07b0b2d810edfa
 AUX netherearth-0.52-gentoo-paths.patch 4356 BLAKE2B 59b2320ab0e5dadd23a6d9559e45da2f9ede1daa78b97ba3ebde6a74db4d8fe3281ed7244f180e7d863022f0350c481d9e7c800d524fcc1d763d5aa33e16d77f SHA512 55fe5ddc2e4d783eb3b930600168c1c106562c84e4532f84dbfe44afb44e9134bb32f0c5cc8dea520cc86d661cf984122d4e82da8d624d03bd6fb42e67ba45ca
 AUX netherearth-0.52-glibc-212.patch 410 BLAKE2B 3aaf59a8ed6c02df5cf5e5037c92d3b51866be06bc28e79980cdddc983c6da5be8f298139a651f625e17011426fed85d86dbff075b1a8980134cf0a3e052ec1e SHA512 fe33f1b9220a8538490316880bfbb671ad65c0a55a896aaa624791a9c094cbded0e5ac182f87750bd58300550a9dbcb10da6453b531c2d58582780a10838ecef
-AUX netherearth-0.52-ldflags.patch 329 BLAKE2B f61fd8d747bb13cd432aa93deee3aa0583478491b3cd188138896e1c6e7623dff8a87959ea7a4bbbb1e67316d598ee21d4564bf7ca09f5e97609a1a539753b7b SHA512 fef30a64dc693973d4e037fc57a47d3a8fb7cfa0f31f98165b1486d48433b4f21361d077e15eda3df26ffceda536c679786103c047be604878ebc92bddfb9209
+AUX netherearth-0.52-ldflags.patch 333 BLAKE2B 557e8519d0dafe902a0713d91c539b4ddf7b11d8a05a3ce22a2c5d4c806f6c54e29a77c371991a8dbc5c2afa88f85cc4792e2e5966c606ad95217e997e80f8dc SHA512 39aab126a7110590d8fa77d7f1e1d695a16af43809ac128a01a06f6f583f7a80435d40e1f341c945b3279a17c51348a5c5744954588740106549e292721743a9
 AUX netherearth-0.52-linux.patch 1255 BLAKE2B 5389c41fa27426a89c904605ca058620636ebccbdf6a2c74988f7b777618e4892a9e352bf54d851da739dceba7721807b3113126da9825d3efe8257fabfe65cd SHA512 fd5e4385798a3027bb6fe89b92939e0e9d7f463420cb1d47d1606bd2fabc12d1f755892cb1523062a07eb5d2138156aabfcb801daaff7b5f1fdbba8d079ef56f
 DIST netherearth052.zip 872397 BLAKE2B 091a5f9e6773450e3796daebf0d40e1796ca97682aa8092dd669deb3dcf4161a9f6f408d5e43bcce847375ad61c7cb43a90acf382898a0ddd36b3da55917cbb1 SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5
 DIST sources.zip 75918 BLAKE2B 23142db81e0fca94948cfc6d6443daf1f7909c1dc2334b73897c1e07d1eb39c0c05cedb7cb0b1c8681990a0a0b6632e4666e67128379e14da23fbbe90b9ae641 SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75
-EBUILD netherearth-0.52.ebuild 1850 BLAKE2B 4e5d31a7aa1285ff8c3050dce511235b06255ae8b5011283e679e9196dcc1ff28ee93d5189cc1c766181119b330d713969ad64c56279e08bd81d0e73acb9210b SHA512 59135e42c52f2c79a74fa84a3d7905bf65054f0440f176a2c0191d6ed42a582d8e7a2ab8f705acb3e0ed01c32712ad7869449665e4638980818125688043e8c3
+EBUILD netherearth-0.52-r1.ebuild 1959 BLAKE2B 062404ba75e3c292cab09260d201244b6d1c8126f8446f0a5d1471a74308138e553455d765c3f8e26d794eb3e06e1ef3a4c8cf9b510218aba61ea31fbb6b5f59 SHA512 4f92ffd97841c6759002571031eb01b1f9c7732cd0888962faf28d0d470e97fd315eeaf07fedf80d81ce31816ae8dbba9d9cc6d6ac95937a6b258d8948f22b6a
 MISC metadata.xml 530 BLAKE2B a306a4d5741d0e7e1bfca697f04e8aed8337c7658cf910c213eee9541510484019ded391b4d884bda58cbd30a47a913a5eb1ac8b298cb4dfd4ba733fda64818a SHA512 4ec339e99b397a71a0f5b6ffccf7f9cefafdee1ce0627c9c5e5f8b00c0158fd7e73e7d0d9612c8f653ea30113905ad6b4efbec694fcd4c05b3ab59439d558868

games-strategy/netherearth/files/netherearth-0.52-freeglut.patch

@@ -1,5 +1,5 @@
---- main.cpp
-+++ main.cpp
+--- a/main.cpp
++++ b/main.cpp
 @@ -8,6 +8,7 @@
  
  #include <stdio.h>

games-strategy/netherearth/files/netherearth-0.52-ldflags.patch

@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-12 09:30:19.000000000 +0200
-+++ Makefile	2010-10-12 09:30:38.000000000 +0200
+--- a/Makefile.old	2010-10-12 09:30:19.000000000 +0200
++++ b/Makefile	2010-10-12 09:30:38.000000000 +0200
 @@ -17,4 +17,4 @@
  all: $(TARGET)
  

games-strategy/netherearth/netherearth-0.52-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 MY_PV="${PV/./}"
 DESCRIPTION="A remake of the SPECTRUM game Nether Earth"
@@ -12,19 +12,22 @@ SRC_URI="http://www.braingames.getput.com/nether/sources.zip
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
-RDEPEND=">=media-libs/libsdl-1.2.6-r3
+RDEPEND="
+	>=media-libs/libsdl-1.2.6-r3
 	>=media-libs/sdl-mixer-1.2.5-r1
-	media-libs/freeglut"
+	media-libs/freeglut
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/sources
+S="${WORKDIR}/sources"
 
-data=../nether\ earth\ v${PV}
+data="../nether earth v${PV}"
 
 src_unpack() {
 	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die
@@ -32,19 +35,21 @@ src_unpack() {
 }
 
 src_prepare() {
-	DATA_DIR=${GAMES_DATADIR}/${PN}
+	default
+
+	DATA_DIR=/usr/share/${PN}
 
 	cp "${FILESDIR}/Makefile" . || die
 
 	# Fix compilation errors/warnings
-	epatch "${FILESDIR}"/${P}-linux.patch
+	eapply "${FILESDIR}"/${P}-linux.patch
 
-	epatch "${FILESDIR}"/${P}-freeglut.patch \
+	eapply "${FILESDIR}"/${P}-freeglut.patch \
 		"${FILESDIR}"/${P}-glibc-212.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
 
 	# Modify dirs and some fopen() permissions
-	epatch "${FILESDIR}/${P}-gentoo-paths.patch"
+	eapply "${FILESDIR}/${P}-gentoo-paths.patch"
 	sed -i \
 		-e "s:models:${DATA_DIR}/models:" \
 		-e "s:textures:${DATA_DIR}/textures:" \
@@ -66,7 +71,7 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin nether_earth
+	dobin nether_earth
 
 	cd "${data}"
 
@@ -76,5 +81,6 @@ src_install() {
 
 	dodoc readme.txt
 
-	prepgamesdirs
+	newicon textures/nuclear.bmp ${PN}.bmp
+	make_desktop_entry nether_earth "Nether Earth" /usr/share/pixmaps/${PN}.bmp
 }

games-strategy/outerspace/Manifest

@@ -1,6 +1,6 @@
 AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7a23fbfcc20dbe6e8c8e2427a4e561960b338def2bd0c28f37f5fdcfcbfc1983b740f3f2a1f3 SHA512 fd20d9de084fef162eec391d68dc973df566b62fd2254fe8ad92c91b073341ca17f96844e0cae28592a7a4d05cc6e3744d66cd37dce9b70319678b91db8d8a1b
-AUX outerspace-0.5.68-setup.patch 1644 BLAKE2B 5b7d11b5ff9b12cbdb2564aed706ffece0c9065f8532caa3110a0f0ebba88ebc33db75564239e5c6cdd2f1c1da1594428e1e9ec7052d97b55d42de8fdb0e4d92 SHA512 3b583e3fbb0a2a26ee18edd6734d2adac07401376c5a96213f6fddaac18a0df6128007dc9947a77a0c9e12fafea368acff8cb5eef13d55206530bf55b28640c2
+AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
 DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
 DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
-EBUILD outerspace-0.5.68.ebuild 1718 BLAKE2B f0c9501b49495b8c7e73a9f53b04524c468d910211b2516234c004fdb39d53dbaa8c3161b3c567756c8ae64cfb34478568df08f7b8d731da50c9f16ef64dfd56 SHA512 25f544b374fe0e71c119d40e59cbad84f67f2b5de77ed4c50af63c7fac2f5996a608b7ae20a52ac6228a9309f44f4fba61fd0788c5c2bb91f62a719740bd82c8
+EBUILD outerspace-0.5.68-r1.ebuild 1565 BLAKE2B 54cfa44e8dbd0288c3d047f5ff5b13e5801f52c51f204c24e38141c29f15f3250de1e6702167e7410c2679a864e8dec892b4f7b459038659dcd221dc8df9946a SHA512 dbddbb02721b8bccc6486b178ede4c08e72d92bba22bb3606167b19d64f423f57f311f9c7af45a50509bbc2bd2bd6087e047197aa0c573b649614ee760d67143
 MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e

games-strategy/outerspace/files/outerspace-0.5.68-setup.patch

@@ -1,5 +1,5 @@
---- setup.py
-+++ setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -42,12 +42,7 @@
  
  # collect data files
@@ -42,8 +42,8 @@
 -        os.remove(path)
 -
 -shutil.rmtree("libsrvr", onerror = onerror)
---- osc.py
-+++ osc.py
+--- a/osc.py
++++ b/osc.py
 @@ -23,12 +23,36 @@
  # tweak PYTHONPATH
  import sys

games-strategy/outerspace/outerspace-0.5.68-r1.ebuild

@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils gnome2-utils distutils-r1 games
+inherit desktop gnome2-utils distutils-r1
 
-MY_PN=${PN/outerspace/Outer Space}
-DESCRIPTION="on-line strategy game taking place in the dangerous universe"
+MY_PN="${PN/outerspace/Outer Space}"
+DESCRIPTION="On-line strategy game taking place in the dangerous universe"
 HOMEPAGE="http://www.ospace.net/"
 SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz -> ${P}.tar.gz
 	mirror://sourceforge/ospace/Client/${PV}/outerspace_${PV}-0ubuntu1_all.deb"
@@ -18,8 +18,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygame-1.7"
+DEPEND=""
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_unpack() {
 	default
@@ -28,8 +29,8 @@ src_unpack() {
 
 python_install() {
 	distutils-r1_python_install \
-		--install-scripts="${GAMES_BINDIR}" \
-		--install-data="${GAMES_DATADIR}/${PN}" \
+		--install-scripts="/usr/bin" \
+		--install-data="/usr/share/${PN}" \
 		--install-lib="$(python_get_sitedir)"
 
 	# source tarball is missing files
@@ -39,40 +40,31 @@ python_install() {
 }
 
 src_prepare() {
+	default
+
 	# fix setup script
 	# rework python start script to avoid shell-wrapper script
-	epatch "${FILESDIR}"/${P}-setup.patch
+	eapply "${FILESDIR}"/${P}-setup.patch
 
 	sed -i\
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
 		osc.py || die "sed failed"
 
 	distutils-r1_src_prepare
 }
 
-src_compile() {
-	distutils-r1_src_compile
-}
-
 src_install() {
 	distutils-r1_src_install
-	newicon -s 48 res/icon48.png ${PN}.png
+	newicon res/logo-login.png ${PN}.png
 	make_desktop_entry "osc.py" "${MY_PN}"
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
-
-	einfo
-	einfo "start the game via 'osc.py'"
-	einfo
 }
 
 pkg_postrm() {

games-strategy/s25rttr/Manifest

@@ -6,5 +6,5 @@ AUX s25rttr-0.8.1-gcc6.patch 1504 BLAKE2B 6cbb0fcd59ebedbb0e9faf49bc192944b70cee
 AUX s25rttr-0.8.1-miniupnpc-api-14.patch 1385 BLAKE2B a5fe9c6937dfe154685ac1e0debab0b5ef3e6c3e27a792f947e1c5a93f772f2d9829602c87db76d9a421d723e652c01f3e015643801d0c136002164f366a5fca SHA512 163a83ac734ff2accca133c20c0e15f7f21140e41661add4229f2a878baebebf09eb82420b2d0b0a7a77042be35608bd00c30006265395e842ae28d64b8986f6
 AUX s25rttr-0.8.1-soundconverter.patch 763 BLAKE2B 98b4d316ae398f2a51304f77ca81e493f18369268e6682da407ad6fb0075c20f6a0f2f56aeb25bdab3d28afa4e8bc8f2440d92478016b920e5e058546f97c65d SHA512 0f16e86057cb1574b8dd2303c49547ce855897683de3af52a437da9304c7bc821bcd3278dae6652fb8a0a358e64c1fa4c0eaec88323ab2dc5a0c56da3ce61afe
 DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
-EBUILD s25rttr-0.8.1-r2.ebuild 2655 BLAKE2B b25d585fce1197cbb68525ddfa7d11628964472baaeee9bc029ec42b8f2f4243e48dff59767082ef193627438a68cf29e089a4beca967c2aaf21cb34ca88c629 SHA512 b9b426aa2019f8550d46d350bc20853a6c5ee54ee8f56d1c24c5b2fa1c3108ebe02d704b23260c2a17e0f7a2f0395b6087df87f53ac3a9387c0f658c1191b8b6
+EBUILD s25rttr-0.8.1-r3.ebuild 2582 BLAKE2B 73c58b320bdfdd511b149ff331b8adf454da2cfd8313b1c681873bda39745bcb03faedec1b08547e51b0f1643789111e2017564b4004bca856eb71039e57ba95 SHA512 140839837c4815bc7a984497824290367e7a6e87bff958eee1c496a11401874585917703e245b4ef36121132db65611cf75f728b6b48d44f46cf0f5e302b2975
 MISC metadata.xml 463 BLAKE2B 33a0cc242b253cb1a3446cc2705cfb32bf0cd125c990bf0b8d527c3c9de546c390dd8fbad984c2a2a6264a25e0f889b63e86287024aa666dfdac94a5aacc3664 SHA512 dd5ea72d1f7ceda9bb2f033c8482e2978924ebee1a61e00fb515b0b0e846553bb1a4024aa739ae1f51608dcb90d0138d6679df1133a8140bfa2bfdb48163c885

games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils cmake-utils gnome2-utils games
+inherit eutils cmake-utils gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
 HOMEPAGE="http://www.siedler25.org/"
@@ -15,16 +15,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="app-arch/bzip2
+RDEPEND="
+	app-arch/bzip2
 	media-libs/libsamplerate
 	media-libs/libsdl[X,sound,opengl,video]
 	media-libs/libsndfile
 	media-libs/sdl-mixer[vorbis]
 	net-libs/miniupnpc
 	virtual/libiconv
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
@@ -36,9 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 )
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
+DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
 
 src_configure() {
 	local arch
@@ -54,11 +55,11 @@ src_configure() {
 		-DCOMPILEFOR="linux"
 		-DCOMPILEARCH="${arch}"
 		-DCMAKE_SKIP_RPATH=YES
-		-DPREFIX="${GAMES_PREFIX}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DLIBDIR="$(games_get_libdir)/${PN}"
-		-DDRIVERDIR="$(games_get_libdir)/${PN}"
+		-DPREFIX="/usr/"
+		-DBINDIR="/usr/bin"
+		-DDATADIR="/usr/share"
+		-DLIBDIR="/usr/$(get_libdir)/${PN}"
+		-DDRIVERDIR="/usr/$(get_libdir)/${PN}"
 		-DGAMEDIR="~/.${PN}/S2"
 		-DBUILD_GLFW_DRIVER=OFF
 	)
@@ -78,35 +79,32 @@ src_compile() {
 src_install() {
 	cd "${CMAKE_BUILD_DIR}" || die
 
-	exeinto "$(games_get_libdir)"/${PN}
+	exeinto /usr/"$(get_libdir)"/${PN}
 	doexe "${T}"/{sound-convert,s-c_resample}
-	exeinto "$(games_get_libdir)"/${PN}/video
+	exeinto /usr/"$(get_libdir)"/${PN}/video
 	doexe driver/video/SDL/src/libvideoSDL.so
-	exeinto "$(games_get_libdir)"/${PN}/audio
+	exeinto /usr/"$(get_libdir)"/${PN}/audio
 	doexe driver/audio/SDL/src/libaudioSDL.so
 
-	insinto "${GAMES_DATADIR}"
+	insinto /usr/share
 	doins -r "${CMAKE_USE_DIR}"/RTTR
-	dosym ./LSTS/splash.bmp "${GAMES_DATADIR}"/RTTR/splash.bmp
+	dosym ./LSTS/splash.bmp /usr/share/RTTR/splash.bmp
 
 	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
-	dogamesbin src/s25client
+	dobin src/s25client
 	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
-	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
 
-	prepgamesdirs
+	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
+	readme.gentoo_create_doc
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	elog "Copy your Settlers2 game files into ~/.${PN}/S2"
-
 	gnome2_icon_cache_update
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {

games-strategy/uqm/Manifest

@@ -8,5 +8,5 @@ DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814d
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
 DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
-EBUILD uqm-0.7.0-r3.ebuild 2948 BLAKE2B 0a1e059808315f5e838b3886c58fde77b26d89eba25b252661dbe057c249bd20d65ab82c6f3c43105cdbbc3ee2bc3584f1859231643cb2ac3c3d6cc18fcb6117 SHA512 e7344fcb4c306e69317e898ca86f5c43079a9378538a1216d2e2a694d7993a5a3ad1bf1d27d03daa3a23163085fb31fa1d3efe9bd96ad9852dd34226baed2285
+EBUILD uqm-0.7.0-r4.ebuild 2887 BLAKE2B b9bcdc61a47019fefe86f46453e7413efe252a7e7169d9fed3b4d93c00b045228bd0a3956b0d8013388128eb16b30ab2aab1010b8ebce093bd29f70dbd3a9b20 SHA512 2c551fcce44049917d348d04d011c095ed0e92ba2ba7ca38f0430c2ad83e5e13c1c96951b0be0e03a23a49cb044aee4a281815d5dd9c3de7e80b9febd176f58f
 MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1

games-strategy/uqm/uqm-0.7.0-r4.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
 HOMEPAGE="http://sc2.sourceforge.net/"
@@ -20,25 +20,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="music opengl remix voice"
 
-RDEPEND="media-libs/libmikmod
+RDEPEND="
+	media-libs/libmikmod
 	media-libs/libogg
-	>=media-libs/libpng-1.4:0
+	>=media-libs/libpng-1.4:0=
 	media-libs/libsdl[X,sound,joystick,video]
 	media-libs/libvorbis
 	media-libs/sdl-image[png]
 	sys-libs/zlib
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
+	default
+
 	local myopengl
 
 	use opengl \
 		&& myopengl=opengl \
 		|| myopengl=pure
 
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-tempdir.patch \
 		"${FILESDIR}"/${P}-warning.patch
 
@@ -47,10 +52,10 @@ src_prepare() {
 	CHOICE_graphics_VALUE='${myopengl}'
 	CHOICE_sound_VALUE='mixsdl'
 	CHOICE_accel_VALUE='plainc'
-	INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+	INPUT_install_prefix_VALUE='/usr/share'
 	INPUT_install_bindir_VALUE='\$prefix/bin'
 	INPUT_install_libdir_VALUE='\$prefix/lib'
-	INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
+	INPUT_install_sharedir_VALUE='/usr/share/'
 	EOF
 
 	# Take out the read so we can be non-interactive.
@@ -62,7 +67,7 @@ src_prepare() {
 		-e "s/-O3//" build/unix/build.config || die
 
 	sed -i \
-		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
+		-e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
 		build/unix/uqm-wrapper.in || die
 
 	# respect CC
@@ -79,15 +84,15 @@ src_install() {
 	# Using the included install scripts seems quite painful.
 	# This manual install is totally fragile but maybe they'll
 	# use a sane build system for the next release.
-	newgamesbin uqm-wrapper uqm
-	exeinto "$(games_get_libdir)"/${PN}
+	newbin uqm-wrapper uqm
+	exeinto /usr/"$(get_libdir)"/${PN}
 	doexe uqm
 
-	insinto "${GAMES_DATADIR}"/${PN}/content/packages
+	insinto /usr/share/${PN}/content/packages
 	doins "${DISTDIR}"/${P}-content.uqm
-	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
+	echo ${P} > "${ED}"/usr/share/${PN}/content/version || die
 
-	insinto "${GAMES_DATADIR}"/${PN}/content/addons
+	insinto /usr/share/${PN}/content/addons
 	if use music; then
 		doins "${DISTDIR}"/${P}-3domusic.uqm
 	fi
@@ -97,7 +102,7 @@ src_install() {
 	fi
 
 	if use remix; then
-		insinto "${GAMES_DATADIR}"/${PN}/content/addons
+		insinto /usr/share/${PN}/content/addons
 		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
 	fi
 
@@ -107,5 +112,4 @@ src_install() {
 	docinto devel/netplay
 	dodoc doc/devel/netplay/*
 	make_desktop_entry uqm "The Ur-Quan Masters"
-	prepgamesdirs
 }

games-util/dfarc/Manifest

@@ -1,4 +1,4 @@
-AUX dfarc-3.12-nowindres.patch 721 BLAKE2B 1b8cc481f06a728c6024f6d60c54cc6e891ce91c912d7c6983f7852076cbff2a9a940d5eaa39db0823085fca067f7c902f271800a33d6fe1d8423db7e9c9b4b6 SHA512 c5f0f00b6ae313238ac59560b1af0bd890051263c9b1ae97e803c3d4e9d6dad6b83895ee103342ad4b237a93a0756838e04d98a15c33f93f81aa73c58196d754
+AUX dfarc-3.12-nowindres.patch 725 BLAKE2B 2f18e6dac03aea89cc59cdb59d394a1c5cf3b25fda55bdc9742a36d278728ebf9ee5566edf6b671ba2d719d8c3ab193239aea1ce237d7d7c64e8b87eaf9c3491 SHA512 64d6deb8c3bfde0e276b779a000e09803eaea4d3dec86718e23c971f1b4d8d0066fec96d25e881e767ce85f9eddd3c0c2505a34cbd3ca024ecdb6ce1b7ebdffb
 DIST dfarc-3.12.tar.gz 329925 BLAKE2B ebebfdf42fbd8bcc53696777f5fb06a54635e269dafb59c888990250343e0bca0b20d46b051e753b047f008061ef74070456d83ee72eb37018a2bc1b386d1c9f SHA512 e87e89e67e383c3d25a6620edc38c6ab6f90b9df52b84d6e6de20af1ac3b50588b3037575f2f89a14c90c14151053c08a7bb97143f24471e33326f3f2d2574ab
-EBUILD dfarc-3.12.ebuild 1039 BLAKE2B 70bd3498f64c98ea865a8917f9757f199b8e6c87f5975b3363751e10dd0051f48b66ddda34804d87e954f6adc0aca59650599f798264cc09815f8d4abe3b0ca1 SHA512 a381b62ef0c0971bd4a8507714a7db473d46cceda11a666c84a10e1e15a28c381a27d5c683ff2d92fae2a26dc8daa1afa524e63894fc1d9e8967698737fe43f1
+EBUILD dfarc-3.12-r1.ebuild 878 BLAKE2B 1015af2a3ad1bd03aed5659c3cd9e09040d4d6830dffa96bd75feeafa5e64ee1c88745b042edda83f4c0f978c804856c8e025ed027c8c99b24494a29e3b04b9a SHA512 dcbeb8a65243501a72dbf861adee7ba1efd771b9d7777992286674e7d5cbfc0db50be9e689e7083760cb5cf57e1545ec410a47d33ce73a8d39126b23e7ac5a1a
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254

games-util/dfarc/dfarc-3.12-r1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 WX_GTK_VER="3.0"
-inherit eutils gnome2-utils fdo-mime wxwidgets games
+inherit eutils gnome2-utils wxwidgets xdg
 
 DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
 HOMEPAGE="http://www.freedink.org/"
@@ -17,16 +17,16 @@ IUSE="nls"
 RDEPEND="
 	app-arch/bzip2
 	x11-misc/xdg-utils
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
 DEPEND="${RDEPEND}
-	nls? ( >=dev-util/intltool-0.31 )"
+	nls? ( >=dev-util/intltool-0.31 )
+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nowindres.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-nowindres.patch )
 
 src_configure() {
-	egamesconf \
+	econf \
 		$(use_enable nls) \
 		--disable-desktopfiles
 }
@@ -34,23 +34,19 @@ src_configure() {
 src_install() {
 	default
 	dodoc TRANSLATIONS.txt
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
+	xdg_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
+	xdg_pkg_postinst
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 }
 
 pkg_postrm() {
+	xdg_pkg_postrm
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 }

games-util/dfarc/files/dfarc-3.12-nowindres.patch

@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	2016-04-05 12:49:17.997412757 -0400
-+++ src/Makefile.in	2016-04-05 12:50:42.058496766 -0400
+--- a/src/Makefile.in.orig	2016-04-05 12:49:17.997412757 -0400
++++ b/src/Makefile.in	2016-04-05 12:50:42.058496766 -0400
 @@ -100,7 +100,6 @@
  	Package.$(OBJEXT) RecursiveDelete.$(OBJEXT) Tar.$(OBJEXT) \
  	DFArcFrame_Base.$(OBJEXT) Options_Base.$(OBJEXT) \

games-util/uglygs/Manifest

@@ -1,5 +1,6 @@
-AUX 0_rc11-uglygs.conf.patch 2213 BLAKE2B cde96bd6a986e671e1a2c84c91b49993fedc95d55f52d5a16c72da126fbcdd9b6cc1bfb555e9af405d37d61855b1cd5e69fb4e4b5cc9b0e6bcc06eaa71ab002c SHA512 e19ea449992afdf6f5a46352244c97a183a4869e2b018b458e01f02499d48ca95341e94b9704583c8c34a6cda02703de376cf83eb12a406cf145eb98ce7ac88f
-AUX 0_rc11-uglygs.pl.patch 7040 BLAKE2B f415682ade193e0facbfb5966eceac6b6ad6a8a5dec26d824a55c54c1bf93d89772d0ee4d7ec50e4444f02d73e681bd0c5cf73d1a465a5fc9e7aa60453630c86 SHA512 afaee5a46fe17bddc497e4cbdafda3b461e0f1710368dce8057d276c523eae674c3069ec2a86d4386da7d9412a551debebea9c9fe32eae7eb58cebdc06c73db9
+AUX 0_rc11-uglygs.conf.patch 2217 BLAKE2B 545fde785e66039180b3deed5fd79e8d4b87c82231da03d6fb047fc72b4f2be3e7534855c77888e8c57a15ee71e35d289fe369e55ea28ed01ac87398d3aef42e SHA512 f7a465d28c042637af1ea45d6f04d809384c0d06d582270cc914cea1bcfed476798c65abf1e18ad5743cff33914bd4f8755cddbb727da6346cb0942d43401756
+AUX 0_rc11-uglygs.pl.patch 7048 BLAKE2B ddff45fb72140f68fd5096dfce9930b6fa4a11fa13584841d84bf9600858e60cbf2e56d910fdeb1605ace6afdd290eb7d1dd135f6541cb501ba496259a240da2 SHA512 98fc61108bc660be487419485a0bcd01b6d9cc8ab8986807a349d6da3cbcf97707b6c9561c88ab268e53ad503ae0fae50e36021943737298a628c88b74d5c36c
+DATA servers.cfg 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
 DIST uglygs-rc11.tar.gz 9066873 BLAKE2B 91cc02ecfd6ccb98ac765e5702e13fffc231cce9938fc01950eb7691bc3bef03dee51489cacf3526939ebccfafe06a7cbbb97c653a27a0d9dff19e67b73ab4e0 SHA512 2a57eb7a4562525c00c69a7874d32fa52d5f12cb2926dffcf4bc8ad74e5847a962c464426b476412bff369963ee40120c3dfc9c0b506606f8a4668bca88d1970
-EBUILD uglygs-0_rc11.ebuild 1453 BLAKE2B 8dab957d393d952795c7c0ba2b4b1522b89a4b4c2c0a47e19b0432d80c60c135df27473ff8eac2ed249f2258e8f7936d0adc449aa3d0d1df1fdd11e03dad7459 SHA512 685de258dd6bd1a9fe6405196e9fd63f126181ed5787aae3a4404c817971d3891c4ddb8ceeb641f0aa3e645f27f31bc9c466d40a54edb4ba5b47614293b53bba
+EBUILD uglygs-0_rc11-r1.ebuild 1252 BLAKE2B a1074d3984b3c086215d8f6384e9138115b5ba33fc0e8efa9170c91658af607543fc57bb32ddc228d1c3c150e56f4acc9619b6b785fdf90c98b679cb69ec212a SHA512 9d91148ecc0e5bed6474db3c9d6a25c982b41c5eb4e07249d4359db5acc1e7f80c716c5734d7fbf9f264960aaaff7231414bd2cb84afa73ef976de6562d4dd37
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118

games-util/uglygs/files/0_rc11-uglygs.conf.patch

@@ -1,5 +1,5 @@
---- uglygs.conf.orig	2003-06-30 11:16:57.000000000 -0400
-+++ uglygs.conf	2003-06-30 11:22:50.000000000 -0400
+--- a/uglygs.conf.orig	2003-06-30 11:16:57.000000000 -0400
++++ b/uglygs.conf	2003-06-30 11:22:50.000000000 -0400
 @@ -12,22 +12,23 @@
  $runmode = "loop";                                              # Run mode, Run as a loop or as a cron Executable
  

games-util/uglygs/files/0_rc11-uglygs.pl.patch

@@ -1,5 +1,5 @@
---- uglygs.pl.orig	2003-06-30 11:37:59.000000000 -0400
-+++ uglygs.pl	2003-06-30 11:38:30.000000000 -0400
+--- a/uglygs.pl.orig	2003-06-30 11:37:59.000000000 -0400
++++ b/uglygs.pl	2003-06-30 11:38:30.000000000 -0400
 @@ -8,7 +8,8 @@
  ##########                                      Contact uglygs@uglypunk.com                                    ##########
  #########################################################################################################################
@@ -127,5 +127,5 @@
       while($serverline = <QSTAT>){
       my @data = split(/ /,$serverline);
       if ($data[0] eq "<!--" and $data[1] eq "gamedetails"){
---- uglygs.pl.orig	2003-06-30 13:56:01.000000000 -0400
-+++ uglygs.pl	2003-06-30 13:59:17.000000000 -0400
+--- a/uglygs.pl.orig	2003-06-30 13:56:01.000000000 -0400
++++ b/uglygs.pl	2003-06-30 13:59:17.000000000 -0400

games-util/uglygs/uglygs-0_rc11-r1.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/0_/}"
+DESCRIPTION="Quickly searches the network for game servers"
+HOMEPAGE="http://uglygs.uglypunk.com/"
+SRC_URI="ftp://ftp.uglypunk.com/uglygs/current/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~alpha ~hppa ~x86"
+IUSE=""
+
+DEPEND="net-analyzer/rrdtool[graph]
+	dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${PV}-uglygs.conf.patch
+	sed -i \
+		-e "s:GENTOO_DIR:/usr/$(get_libdir)/${PN}:" uglygs.conf || die
+	eapply "${FILESDIR}"/${PV}-uglygs.pl.patch
+	sed -i \
+		-e "s:GENTOO_DIR:/etc:" uglygs.pl || die
+	sed -i \
+		-e "s/strndup/${PN}_strndup/" qstat/qstat.c || die
+}
+
+src_compile() {
+	emake -C qstat CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	insinto /etc
+	doins uglygs.conf qstat/qstat.cfg
+
+	dobin uglygs.pl
+
+	insinto /usr/"$(get_libdir)"/${PN}
+	doins -r data templates tmp
+	insinto /usr/"$(get_libdir)"/${PN}/images
+	doins -r images/{avp2,bds,default.gif,hls,j2s,mhs,q3s,rws,sf2s,uns,vcs}
+	dosym bds /usr/"$(get_libdir)"/${PN}/images/bdl
+	keepdir /usr/"$(get_libdir)"/${PN}/tmp
+
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe qstat/qstat
+
+	einstalldocs
+}

games-util/uglygs/uglygs-0_rc11.ebuild

@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_P=${P/0_/}
-DESCRIPTION="quickly searches the network for game servers"
-HOMEPAGE="http://uglygs.uglypunk.com/"
-SRC_URI="ftp://ftp.uglypunk.com/uglygs/current/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~hppa ~x86"
-IUSE=""
-
-DEPEND="net-analyzer/rrdtool[graph]
-	dev-lang/perl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-uglygs.conf.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" uglygs.conf || die
-	epatch "${FILESDIR}"/${PV}-uglygs.pl.patch
-	sed -i \
-		-e "s:GENTOO_DIR:${GAMES_SYSCONFDIR}:" uglygs.pl || die
-	sed -i \
-		-e "s/strndup/${PN}_strndup/" qstat/qstat.c || die
-}
-
-src_compile() {
-	emake -C qstat CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto "${GAMES_SYSCONFDIR}"
-	doins uglygs.conf qstat/qstat.cfg
-
-	dogamesbin uglygs.pl
-
-	insinto "$(games_get_libdir)"/${PN}
-	doins -r data templates tmp
-	insinto "$(games_get_libdir)"/${PN}/images
-	doins -r images/{avp2,bds,default.gif,hls,j2s,mhs,q3s,rws,sf2s,uns,vcs}
-	dosym bds "$(games_get_libdir)"/${PN}/images/bdl
-	keepdir "$(games_get_libdir)"/${PN}/tmp
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe qstat/qstat
-
-	dodoc CHANGES README
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Dont forget to setup ${GAMES_SYSCONFDIR}/uglygs.conf and ${GAMES_SYSCONFDIR}/qstat.cfg"
-}

media-gfx/digikam/Manifest

@@ -1,11 +1,3 @@
-AUX digikam-5.7.0-kcalcore-1.patch 1489 BLAKE2B af340a573d5cff28ef6d7fe91564ff858d3f55d0a641e05cbaf2428b3bd6351f04fd09a69bfa27d1b6e17e6ba2576571914923ceef84c4920e549d254af03886 SHA512 da3b1bd9586757174333fcfba927ef6d91e0b45813eaf5e9cde5d1062f1154fc6449b1fb746dbac2ddc05ba5c92ca162198fb6a4e36789786d81179c56770e29
-AUX digikam-5.7.0-kcalcore-2.patch 3221 BLAKE2B 6bd179c65797444a4ddbc133c9a1e3204b8127acd360bdb18a766ecaecc0d8efd5284686c424379c8a80010135f0f1653c4efacd83500018da9724bcce1f1db3 SHA512 1f3b9434a53ac0d6111c8b3c306b30515684ab09eca2f8794cdcf21639af6e8148da881c4fb0fcf5aacb4531be35c1ecf51ee2ee7bb6fde9013736e04ec0f66d
-AUX digikam-5.7.0-kreadconfig5.patch 1068 BLAKE2B 4a19e8c0806e7d4ba6219711385db7865507414203f4a273114e1ece3e62983f36cac3b299c3d498a6118dd608719d18ad1c29d1d66bf4774151f530fcb08e01 SHA512 cc78a318f865a85c5a1b0a89734c6c320367c961313db1f8acac25a340c481aa79154ae0c21683f967e0042008235ccf5c9a28078d359c07aaa3e4244b543871
-AUX digikam-5.7.0-mariadb-10.2-1.patch 1949 BLAKE2B 5af708e8e6296031752acdb579cc20a502968deb791a1bcc305fe2fef72dd67ff8b7d78bc85a6311a301428167d985f1ccb67b322e80b61c2b22e9909d7324c2 SHA512 13b83b1b32d33955f140345a47dda2d8ef0eb9057e154962f382b415e0bc46ca34ccc9b2fa782b4660eb05c947c8555fae6f9e6828a904c41d66e9a032399f82
-AUX digikam-5.7.0-mariadb-10.2-2.patch 3714 BLAKE2B b08c0544def660bfef87c68204bf00dff2661d58877f514fbfbe6bb8c856cfcb72acc10c2f8661a19230b2a4ec92407c401b90af8482ff97fbcce87bd8c7e6d1 SHA512 c7865329b6387f5c4decfa750f3bfeba3d3b61df5c86b35147050d5fbf4c3585cb8ed5e8789b6dcab6f1887dc4322200920b432006d80457edf286cad594ef51
-AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61
-DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
-EBUILD digikam-5.7.0-r3.ebuild 4934 BLAKE2B 95967205db7ba14d2d7ebe29ba6d6b42d63182c73b2deee3b32f2024195a437f41a7947db5f8f76a2f9d7e6a1e56f390dcd47c8657de4f83614ef07fbb12985a SHA512 97a73b97fcc7f898f22fa11fed4eb5c72c74ab1657e2d82f9e3b6ada4cb698d19bab5559b7b01e371b604ccd1a72edf55c72bfb93c9de42c7b9595b13219746f
 EBUILD digikam-5.9.0.ebuild 4761 BLAKE2B c7ed6da8ce64cc0a08329720c9c7b45c6073deaf624611b060f341908afde553e43d581ea1fb4f3276ee0d8240549aebc6a87380f4951c3797fde070ff28e2d0 SHA512 149d691956d8de7db93550ae7da157fd4a3c495d36df17205522105504203906fa224f4b5a28857e23dd805f4eac64fbe6be7331ad6e230e5f34e2596b980a8b
 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab

media-gfx/digikam/digikam-5.7.0-r3.ebuild

@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KDE_HANDBOOK="true"
-	KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-KDE_APPS_MINIMAL="17.12.0"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 x86"
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_BRANCH=stable
-	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'mysql?')
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/expat
-	>=media-gfx/exiv2-0.26:=
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	media-libs/opencv:=[-qt4(-)]
-	|| ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		$(add_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
-	)
-	calendar? ( $(add_kdeapps_dep kcalcore) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	jpeg2k? ( media-libs/jasper:= )
-	kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_kdeapps_dep marble)
-		$(add_qt_dep qtconcurrent)
-		$(add_qt_dep qtnetwork)
-	)
-	mediaplayer? ( media-libs/qtav[opengl] )
-	mysql? ( virtual/mysql[server] )
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads]
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/kipi-plugins:5
-	panorama? ( media-gfx/hugin )
-	!media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt-5.9.3.patch
-	"${FILESDIR}"/${P}-mariadb-10.2-{1,2}.patch
-	"${FILESDIR}"/${P}-kreadconfig5.patch
-	"${FILESDIR}"/${P}-kcalcore-{1,2}.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		# prepare the translations
-		mv "${WORKDIR}/${MY_P}/po" po || die
-		find po -name "*.po" -and -not -name "digikam.po" -delete || die
-		echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
-		echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-		echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-		if use handbook; then
-			# subdirs need to be preserved b/c relative paths...
-			# doc-translated is, in fact, broken, and ignored
-			mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
-			echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
-			echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
-		fi
-	fi
-
-	if ! use marble; then
-		punt_bogus_dep Qt5 Network
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_APPSTYLES=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package openmp OpenMP)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}

media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch

@@ -1,44 +0,0 @@
-From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001
-From: Simon Frei <freisim93@gmail.com>
-Date: Wed, 13 Sep 2017 15:43:49 +0200
-Subject: calendar: Adjust to new KCalCore API (fixes CI)
-
----
- utilities/assistants/calendar/print/calsettings.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
-index b0bed5a..46e995d 100644
---- a/utilities/assistants/calendar/print/calsettings.cpp
-+++ b/utilities/assistants/calendar/print/calsettings.cpp
-@@ -31,12 +31,17 @@
- #include "digikam_debug.h"
- #include "calsystem.h"
- 
--// KCalCore includes
- 
- #ifdef HAVE_KCALENDAR
-+    // KCalCore includes
-+
- #   include <kcalcore/icalformat.h>
- #   include <kcalcore/filestorage.h>
- #   include <kcalcore/memorycalendar.h>
-+
-+    // Qt includes
-+
-+#   include <QTimeZone>
- #endif // HAVE_KCALENDAR
- 
- namespace Digikam
-@@ -290,7 +295,7 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
-         return;
-     }
- 
--    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
-+    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
-     KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
- 
-     qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
--- 
-cgit v0.11.2
-

media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch

@@ -1,79 +0,0 @@
-From dad750fadc926b62603cc9d64009ee5072a46d97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Wed, 13 Sep 2017 16:51:14 +0200
-Subject: Adapt to KCalCore API changes
-
-This change supports both old (pre-QDateTime) and new version.
-
-Differential Revision: https://phabricator.kde.org/D7802
-
-* asturm: Incorporated fix from d204022e191d9377874689bfe4c89f7b83998188
----
- CMakeLists.txt                                      |  3 +++
- app/utils/digikam_config.h.cmake.in                 |  3 +++
- utilities/assistants/calendar/print/calsettings.cpp | 14 ++++++++++----
- 3 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ad686d..e2f28a7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -174,6 +174,9 @@ find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
-              OPTIONAL_COMPONENTS
-              CalendarCore           # For Calendar tool.
- )
-+if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-+    set(HAVE_KCALENDAR_QDATETIME TRUE)
-+endif()
- 
- if(ENABLE_AKONADICONTACTSUPPORT AND NOT KF5AkonadiContact_FOUND)
-     set(ENABLE_KFILEMETADATASUPPORT OFF)
-diff --git a/app/utils/digikam_config.h.cmake.in b/app/utils/digikam_config.h.cmake.in
-index 8a2e8e5..ffd3a22 100644
---- a/app/utils/digikam_config.h.cmake.in
-+++ b/app/utils/digikam_config.h.cmake.in
-@@ -75,6 +75,9 @@
- /* Define to 1 if you have KCalendar core shared libraries installed */
- #cmakedefine HAVE_KCALENDAR 1
- 
-+/* Define to 1 if you have KCalendar core shared libraries with QDateTime support installed */
-+#cmakedefine HAVE_KCALENDAR_QDATETIME 1
-+
- /* Define to 1 if Panorama tool is supported */
- #cmakedefine HAVE_PANORAMA 1
- 
-diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
-index 46e995d..c6554ef 100644
---- a/utilities/assistants/calendar/print/calsettings.cpp
-+++ b/utilities/assistants/calendar/print/calsettings.cpp
-@@ -295,7 +295,13 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
-         return;
-     }
- 
--    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
-+#ifdef HAVE_KCALENDAR_QDATETIME
-+    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone::utc()));
-+    using DateTime = QDateTime;
-+#else
-+    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
-+    using DateTime = KDateTime;
-+#endif
-     KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
- 
-     qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
-@@ -313,9 +319,9 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
-         qLast  = calSys.date(params.year + 1, 1, 1);
-         qLast  = qLast.addDays(-1);
- 
--        KDateTime dtFirst(qFirst);
--        KDateTime dtLast(qLast);
--        KDateTime dtCurrent;
-+        DateTime dtFirst(qFirst, QTime(0, 0));
-+        DateTime dtLast(qLast, QTime(0, 0));
-+        DateTime dtCurrent;
- 
-         int counter                = 0;
-         KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast);
--- 
-cgit v0.11.2
-

media-gfx/digikam/files/digikam-5.7.0-kreadconfig5.patch

@@ -1,28 +0,0 @@
-From bbf087645d426e20ce96fa2accd70ff4198d30ec Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 6 Dec 2017 22:31:29 +0100
-Subject: [PATCH] cleanup_digikamdb: Don't depend on kde-runtime
-
-Summary: This needs to use kreadconfig5 in a Frameworks world.
-
-Differential Revision: https://phabricator.kde.org/D9235
----
- data/scripts/cleanup_digikamdb/cleanup_digikamdb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/scripts/cleanup_digikamdb/cleanup_digikamdb b/data/scripts/cleanup_digikamdb/cleanup_digikamdb
-index 3a68d3d040..9cfcd6ac8d 100644
---- a/data/scripts/cleanup_digikamdb/cleanup_digikamdb
-+++ b/data/scripts/cleanup_digikamdb/cleanup_digikamdb
-@@ -58,7 +58,7 @@ readConfigValue()
- {
-     local config_file="digikamrc"
-     local config_group="Database Settings"
--    local db_dir=$(kreadconfig --file "${config_file}" --group "${config_group}" --key "$1")
-+    local db_dir=$(kreadconfig5 --file "${config_file}" --group "${config_group}" --key "$1")
-     echo "${db_dir}"
- }
- 
--- 
-2.15.1
-

media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-1.patch

@@ -1,58 +0,0 @@
-From 395ab5b02ed7d02736a08e370217c0c96b391bb9 Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 6 Dec 2017 08:09:44 +0100
-Subject: Workaround for the problem mariaDB >= 10.2 and QTBUG-63108
-
----
- libs/album/albummanager.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/libs/album/albummanager.cpp b/libs/album/albummanager.cpp
-index a72acc3..2ea40e9 100644
---- a/libs/album/albummanager.cpp
-+++ b/libs/album/albummanager.cpp
-@@ -162,6 +162,7 @@ public:
-         hasPriorizedDbPath(false),
-         dbPort(0),
-         dbInternalServer(false),
-+        dbFakeConnection(false),
-         showOnlyAvailableAlbums(false),
-         albumListJob(0),
-         dateListJob(0),
-@@ -192,6 +193,7 @@ public:
-     QString                     dbHostName;
-     int                         dbPort;
-     bool                        dbInternalServer;
-+    bool                        dbFakeConnection;
- 
-     bool                        showOnlyAvailableAlbums;
- 
-@@ -391,6 +393,11 @@ void AlbumManager::cleanUp()
-         d->personListJob->cancel();
-         d->personListJob = 0;
-     }
-+
-+    if (d->dbFakeConnection)
-+    {
-+        QSqlDatabase::removeDatabase(QLatin1String("FakeConnection"));
-+    }
- }
- 
- bool AlbumManager::databaseEqual(const DbEngineParameters& parameters) const
-@@ -727,6 +734,13 @@ bool AlbumManager::setDatabase(const DbEngineParameters& params, bool priority,
-     // ensure, embedded database is loaded
-     qCDebug(DIGIKAM_GENERAL_LOG) << params;
- 
-+    // workaround for the problem mariaDB >= 10.2 and QTBUG-63108.
-+    if (params.isMySQL() && !d->dbFakeConnection)
-+    {
-+        QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), QLatin1String("FakeConnection"));
-+        d->dbFakeConnection = true;
-+    }
-+
-     if (params.internalServer)
-     {
-         DatabaseServerError result = DatabaseServerStarter::instance()->startServerManagerProcess(params);
--- 
-cgit v0.11.2
-

media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-2.patch

@@ -1,117 +0,0 @@
-From ba1ceda1448895009ba6524398ca42441695cc3e Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 6 Dec 2017 18:28:32 +0100
-Subject: workaround for QTBUG-63108 now works in all cases
-
----
- app/main/digikamapp.cpp                  |  2 ++
- libs/album/albummanager.cpp              | 30 +++++++++++++++++++++---------
- libs/album/albummanager.h                |  3 +++
- libs/database/utils/dbsettingswidget.cpp |  3 +++
- 4 files changed, 29 insertions(+), 9 deletions(-)
-
-diff --git a/app/main/digikamapp.cpp b/app/main/digikamapp.cpp
-index 4349271..935b786 100644
---- a/app/main/digikamapp.cpp
-+++ b/app/main/digikamapp.cpp
-@@ -383,6 +383,8 @@ DigikamApp::~DigikamApp()
-         DatabaseServerStarter::instance()->stopServerManagerProcess();
-     }
- 
-+    AlbumManager::instance()->removeFakeConnection();
-+
-     m_instance = 0;
- 
-     delete d->modelCollection;
-diff --git a/libs/album/albummanager.cpp b/libs/album/albummanager.cpp
-index 2ea40e9..92a8b37 100644
---- a/libs/album/albummanager.cpp
-+++ b/libs/album/albummanager.cpp
-@@ -393,11 +393,6 @@ void AlbumManager::cleanUp()
-         d->personListJob->cancel();
-         d->personListJob = 0;
-     }
--
--    if (d->dbFakeConnection)
--    {
--        QSqlDatabase::removeDatabase(QLatin1String("FakeConnection"));
--    }
- }
- 
- bool AlbumManager::databaseEqual(const DbEngineParameters& parameters) const
-@@ -734,11 +729,10 @@ bool AlbumManager::setDatabase(const DbEngineParameters& params, bool priority,
-     // ensure, embedded database is loaded
-     qCDebug(DIGIKAM_GENERAL_LOG) << params;
- 
--    // workaround for the problem mariaDB >= 10.2 and QTBUG-63108.
--    if (params.isMySQL() && !d->dbFakeConnection)
-+    // workaround for the problem mariaDB >= 10.2 and QTBUG-63108
-+    if (params.isMySQL())
-     {
--        QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), QLatin1String("FakeConnection"));
--        d->dbFakeConnection = true;
-+        addFakeConnection();
-     }
- 
-     if (params.internalServer)
-@@ -3558,4 +3552,22 @@ void AlbumManager::removeWatchedPAlbums(const PAlbum* const album)
-     d->albumWatch->removeWatchedPAlbums(album);
- }
- 
-+void AlbumManager::addFakeConnection()
-+{
-+    if (!d->dbFakeConnection)
-+    {
-+        // workaround for the problem mariaDB >= 10.2 and QTBUG-63108
-+        QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), QLatin1String("FakeConnection"));
-+        d->dbFakeConnection = true;
-+    }
-+}
-+
-+void AlbumManager::removeFakeConnection()
-+{
-+    if (d->dbFakeConnection)
-+    {
-+        QSqlDatabase::removeDatabase(QLatin1String("FakeConnection"));
-+    }
-+}
-+
- }  // namespace Digikam
-diff --git a/libs/album/albummanager.h b/libs/album/albummanager.h
-index bee58c4..5b24c8d 100644
---- a/libs/album/albummanager.h
-+++ b/libs/album/albummanager.h
-@@ -625,6 +625,9 @@ public:
- 
-     void removeWatchedPAlbums(const PAlbum* const album);
- 
-+    void addFakeConnection();
-+    void removeFakeConnection();
-+
-     //@}
- 
- Q_SIGNALS:
-diff --git a/libs/database/utils/dbsettingswidget.cpp b/libs/database/utils/dbsettingswidget.cpp
-index ca95646..4f1e1a4 100644
---- a/libs/database/utils/dbsettingswidget.cpp
-+++ b/libs/database/utils/dbsettingswidget.cpp
-@@ -65,6 +65,7 @@
- #include "dlayoutbox.h"
- #include "mysqlinitbinary.h"
- #include "mysqlservbinary.h"
-+#include "albummanager.h"
- 
- namespace Digikam
- {
-@@ -669,6 +670,8 @@ bool DatabaseSettingsWidget::checkMysqlServerConnection(QString& error)
- 
-     qApp->setOverrideCursor(Qt::WaitCursor);
- 
-+    AlbumManager::instance()->addFakeConnection();
-+
-     QString databaseID(QLatin1String("ConnectionTest"));
-     QSqlDatabase testDatabase = QSqlDatabase::addDatabase(databaseBackend(), databaseID);
- 
--- 
-cgit v0.11.2
-

media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch

@@ -1,32 +0,0 @@
-From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Tue, 28 Nov 2017 21:29:00 +0100
-Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373
-
-* asturm: Fix build w/ Qt-5.7
----
- libs/database/coredb/coredburl.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libs/database/coredb/coredburl.cpp b/libs/database/coredb/coredburl.cpp
-index 2c0d0eb..b1bdf71 100644
---- a/libs/database/coredb/coredburl.cpp
-+++ b/libs/database/coredb/coredburl.cpp
-@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name,
-                                       const DbEngineParameters& parameters)
- {
-     CoreDbUrl url;
-+    QString path(album);
-     url.setScheme(QLatin1String("digikamalbums"));
--    url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name);
-+
-+    if (path != QLatin1String("/"))
-+        path += QLatin1Char('/');
-+
-+    url.setPath(path + name);
- 
-     QUrlQuery q(url);
-     q.addQueryItem(QLatin1String("albumRoot"),   albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile());
--- 
-cgit v0.11.2
-

media-plugins/kipi-plugins/Manifest

@@ -1,5 +1,3 @@
-DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
-EBUILD kipi-plugins-5.7.0.ebuild 2060 BLAKE2B 42eb5f2d8be5bd55538a894c6a60c0f6060996840f83d1ba9a21bde46b279c0f24d1cd28d61e4f60388e9e7f308e0dd5c4a9585fa3f917da39bfff93cbade8f1 SHA512 79996bbb38050d3bb324c9fa836b6f1ee9f2d725c849fe4b03386500efdb969f521233cbd81fa1d62e9fa7327ae90bb14d5f2d9520b370bc7bbf033ed7ba00b7
 EBUILD kipi-plugins-5.9.0.ebuild 2060 BLAKE2B c08b079e42b76323806452bea9afaa67a467b2a22f43e37359c07a472886de538388cc9fd4533cc4831c6ad4504c0c1d56c40f9b51eca4b3494816abd58bcf2d SHA512 a1d27d1d1ec8501d41519f4cab50cbd5fbacf69032e7fd5e8df1dc123cb3d4cc74797b824c57501d11d32ee6ba9942ba995d04274d8bc91c1c659a4f70f1a498
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9

media-plugins/kipi-plugins/kipi-plugins-5.7.0.ebuild

@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2+"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_BRANCH="unstable"
-	else
-		SRC_BRANCH="stable"
-	fi
-
-	MY_PV="${PV/_/-}"
-	MY_P="digikam-${MY_PV}"
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}/extra/${PN}"
-fi
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkipi '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	flashexport? ( $(add_frameworks_dep karchive) )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( $(add_frameworks_dep kio) )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-plugins/kipi-plugins:4
-"
-
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		if [[ ${SRC_BRANCH} = stable ]]; then
-			# prepare the translations
-			mv "${WORKDIR}/${MY_P}/po" po || die
-			find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die
-			echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-			echo "add_subdirectory( po )" >> CMakeLists.txt || die
-		fi
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package flashexport KF5Archive)
-		$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
-		-DENABLE_KIO=$(usex remotestorage)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
-	)
-
-	kde5_src_configure
-}

metadata/dtd/timestamp.chk

@@ -1 +1 @@
-Wed, 02 May 2018 18:38:37 +0000
+Thu, 03 May 2018 04:38:34 +0000

metadata/glsa/Manifest

@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 422971 BLAKE2B ea5a8afb2444da16a6c088605ba9c8961cc9cd6cb4556e7fd6b341f8cf071cb886137416ae20c139fdcbaf3bc1ed107454ccba1610a638e2bbc802d94d1b0d22 SHA512 326344d87327efd232cbb04fac7cee4d2e42315a8e9fd26f5c155bfacff92f0112a397371bb749b92ab35a58695c81fad3b55fab3e7482a39592891f68a0a5f3
-TIMESTAMP 2018-05-02T18:38:41Z
+MANIFEST Manifest.files.gz 423449 BLAKE2B 490b3d49b1771ae622d89196faa36c2d3d274e6d765ed1a321c6f9c87e1eb16d0203672388185976cbe2316abc3aecaee60e0fd848bbf8c908b233ead62e69f8 SHA512 dbad8dc00d617765448bf9e5b166abdc6106321cb88ddbcbdeb94b96a977fd0d73a2a2806812a142d60c061d18208f0f31b4d01f9b25406ea237913f539f54fd
+TIMESTAMP 2018-05-03T04:38:38Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrqBbFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrqkk5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBFIw/9GLaqYT3Cv52JSh9oW4wEMBulXo7G8PSwbeq/u4p2dAtM+xb15yMfeniM
-eZK9MvKBVhnejaVHYg2hjSJE0FR28iqA7Gzhc/toa1IQSsCPrNx6YGPN+sway9cv
-jxGPNLoH9+qUZedSvuMISDmW037VxI1825rBdaL9Ug6nLtkXJ2FsEuy5w32swPXI
-1hO87bBo2id9Ug4QyGaH5R4pLQRMBbbt3m4rXXG6c4oo6QpJRgNjW0QGtbgXc+Yi
-vhdTbwa6wN5dEmA1UGO5+LVlI+0nc+tc/h41FhMY7KFA2gKJpE+XvXNQzv5Si1Ci
-5zu4dJ9WOzAv/3rkcLHfh49ibPJhRLIqL6bjRptG+jwYmfoEVhb2kmMiEVzOWqIA
-mPeA7XBlJ8mtTWqxQzFvMbVX5NBHq0JiPjXKqBsr8I98CxsEBOFEGDnDHFKoiOlf
-rHhezBlkZjnLmLGBo7I04TMj/yIX4uLFj5VgPCC+OMTeqiLiOCPGBR/czsCnmJMZ
-nZ20SbFwx07+1Mtt+Z6T63MGi2SkvIkGB2hh+c8rkmy8COBrKGdzgmikrSx1vu89
-85KUbmZIsbacEd/C46cReKCLzI0KN760QbUx7W+7uZt3SK2cDt1wd0XUTUgrYCrt
-DKs7fxGVpZA8v4LOdCN0h3UX/gswqQl9rogyMmzbLhlzLLNYeZU=
-=JNth
+klBmXQ//fQnr3VQ3RfS3M5uxFewBo1Q++Rji5U/QXvVYWufbAMaliLveIE4zyrq6
+6p3Gm7gwb1Q1KUoHn4vwa4fR1Fm19Ch5j7p7jJQ8IDqIQPVr++Yv38m/ubyVtET3
+M8yw9+wImaHAlL5x4cFdPf/3qpzyIS/O+/e9Udpna5mHgRL/xU5xSLGXcWQtx9NV
+8gF5gJvRVuNgvFmpmVzrOrIfFGli7JKG8Ei0sSYwtSAbBIc3xQff6ZSnT9/OOBrN
+yqyg8EZdpUwUeRSIOFzxI1nmjLMZmZNHyNhBoyEF84sipG4T1AMLItqlfXe9R0iK
+Zc/8JG0b+6Sqc3E1CXErWN5F02SQJGw56X545rzPm5kyqHu89PSEc+prAQTuGyR9
+FtfAJSD8rdwqrrYP4cDoh9/EX0kyxEe/zgR6C72JDJ5I6ng4StSSrxzj0sXztHQ+
+KMxlFuFiagz2WezXn8ZezBfWXCxE6paKbuV96kEgvNSAg4huHKenvK7AYy76HPKp
+jEkX17W++Vt/oPIAyFkphiWJTQiOkpZuneKyVwYq68AG+/ppzfAXArMTHewnQD37
+n5adpmYj+hTd9twKUJ8KJg0yNWxy13RFM/TTPvYUZBC56ekTS4NK+27mdEPQoqwz
+KYFe94Andw28UMqFnUagMNk3pDEeS5MpQG6fcQvbbg9K4v9IkYE=
+=ZqVB
 -----END PGP SIGNATURE-----

metadata/glsa/glsa-201805-01.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-01">
+  <title>hesiod: Root privilege escalation </title>
+  <synopsis>A vulnerability was discovered in hesiod which may allow remote
+    attackers to gain root privileges.
+  </synopsis>
+  <product type="ebuild">hesiod</product>
+  <announced>2018-05-02</announced>
+  <revised count="1">2018-05-02</revised>
+  <bug>606652</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="net-dns/hesiod" auto="yes" arch="*">
+      <vulnerable range="le">3.1.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>DNS functionality to access to DB of information that changes
+      infrequently.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in hesiod that have
+      remained unaddressed. Please review the referenced CVE identifiers for
+      details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote or local attacker may be able to escalate privileges to root.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>Gentoo has discontinued support for hesiod and recommends that users
+      unmerge the package:
+    </p>
+    
+    <code>
+      # emerge --unmerge "net-dns/hesiod"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2016-10151">CVE-2016-10151</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2016-10152">CVE-2016-10152</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-04-29T17:50:36Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2018-05-02T23:52:01Z">b-man</metadata>
+</glsa>

metadata/glsa/glsa-201805-02.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-02">
+  <title>Python: Buffer overflow</title>
+  <synopsis>A buffer overflow in Python might allow remote attackers to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">python</product>
+  <announced>2018-05-02</announced>
+  <revised count="1">2018-05-02</revised>
+  <bug>637938</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-lang/python" auto="yes" arch="*">
+      <unaffected range="ge" slot="2.7">2.7.14</unaffected>
+      <vulnerable range="lt" slot="2.7">2.7.14</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Python is an interpreted, interactive, object-oriented programming
+      language.
+    </p>
+  </background>
+  <description>
+    <p>A buffer overflow was discovered in Python’s PyString_DecodeEscape
+      function in stringobject.c.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Remote attackers, by enticing a user to process a specially crafted
+      file, could execute arbitrary code.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Python 2 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-2.7.14:2.7"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-1000158">
+      CVE-2017-1000158
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-04-24T00:27:08Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2018-05-02T23:53:50Z">b-man</metadata>
+</glsa>

metadata/glsa/glsa-201805-03.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-03">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Chromium and Google
+    Chrome, the worst of which could result in the execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">chromium, google-chrome</product>
+  <announced>2018-05-02</announced>
+  <revised count="1">2018-05-02</revised>
+  <bug>654384</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">66.0.3359.139</unaffected>
+      <vulnerable range="lt">66.0.3359.139</vulnerable>
+    </package>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">66.0.3359.139</unaffected>
+      <vulnerable range="lt">66.0.3359.139</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+    
+    <p>Google Chrome is one fast, simple, and secure browser for all your
+      devices.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium and Google
+      Chrome. Please review the referenced CVE identifiers and Google Chrome
+      Releases for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-66.0.3359.139"
+    </code>
+    
+    <p>All Google Chrome users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/google-chrome-66.0.3359.139"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-6118">CVE-2018-6118</uri>
+    <uri link="https://chromereleases.googleblog.com/2018/04/stable-channel-update-for-desktop_26.html">
+      Google Chrome Release 20180426
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-05-01T23:39:45Z">chrisadr</metadata>
+  <metadata tag="submitter" timestamp="2018-05-02T23:57:25Z">chrisadr</metadata>
+</glsa>

metadata/glsa/timestamp.chk

@@ -1 +1 @@
-Wed, 02 May 2018 18:38:37 +0000
+Thu, 03 May 2018 04:38:34 +0000

metadata/glsa/timestamp.commit

@@ -1 +1 @@
-33ab85714fe99f05395695e2dec17da4e91d4e4c 1524529671 2018-04-24T00:27:51+00:00
+e5c04f29237a0b5ac8d5c241b6f686f89d46e211 1525305465 2018-05-02T23:57:45+00:00

metadata/md5-cache/app-antivirus/clamav-0.100.0

@@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=6
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc
-KEYWORDS=~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) system-libmspack? ( dev-libs/libmspack ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.100.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25ae4ef6e2a4cd87ad049e31c735be33
+_md5_=60f6031a34ef1c7db88da01f6b8ce1de

metadata/md5-cache/app-arch/cfv-1.18.3-r1

@@ -5,9 +5,9 @@ HOMEPAGE=http://cfv.sourceforge.net/
 IUSE=bittorrent python_targets_python2_7
 KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-fchksum[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] bittorrent? ( || ( net-p2p/bittorrent[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-p2p/bittornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-fchksum[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] bittorrent? ( net-p2p/bittornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/cfv/cfv-1.18.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=998f914741e83fd9dfa43d0cf6c86da2
+_md5_=37346309d0f0d9a4342f90d5ad8240ec

metadata/md5-cache/app-vim/vimpress-2.1.5

@@ -5,8 +5,8 @@ EAPI=4
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3510
 KEYWORDS=amd64 x86
 LICENSE=vim
-RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-python/markdown || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) dev-lang/python:2.7 dev-python/markdown || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/VimRepress/tarball/2.1.5 -> vimpress-2.1.5.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=e324869259bc98581493d674d0effe88
+_md5_=5a896ff47216bd41d0da5b2b40b52fb2

metadata/md5-cache/dev-libs/json-c-0.13.1-r1

@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/json-c/json-c/wiki
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-SLOT=0/3
+SLOT=0/4
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=df7d70b87535d716ca292382b2617bb0
+_md5_=65c08b6a617ac2e20f93199bdacfa01f