gentoo resync : 14.07.2018

4 files changed, 23 insertions, 28 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 9714646e8be0..19ca4a0b2b8f 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,13 +1,13 @@
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
-AUX fix-build-transpal.patch 719 BLAKE2B ce6334dbd4b70a97ea4595693c6548214bb4de53853adc1a54d82df8bbd06c93086f197c45b404ced8f85cacf05eeff83baa6223c39541c583feac5819828bea SHA512 c378913d34a2297412afbcca9877bc38f3ab1a632c80cc24c452dccacc61cc3ca361b9c627bacfb5d9fe660933a4477be7a47068fde6cd334ac960c5cf162eb5
 AUX log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
 AUX search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
 DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35
 DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c17b1163107e1f8c6eab4be2b5a2ed74f302604f5769d3bb71d3ce8355b69b75352dc470918ebd5c0c73d68665 SHA512 e98f3bbfb2055fa72c4376ebbdb64814b1bca7c66968ffea8ca4d980d432f59f6ae013c889a57a28b2961bbeca2cc80b83b573dc0cbc2550cd9f428cf9d2a625
+DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20180508-6885.tar.xz 14703224 BLAKE2B 8b90bf5771c2c27701316df8b9e738082d03552dddbd4d8be7e25195fd2da746afb2857e166ac6e6c0c78ad43e3c21f809538f0c54936ce82b5f2a3f93f80f94 SHA512 2b1be82a1bfbb0cf2a9b7bb0b73e69232bc2ce7adf343e25319b16c4240a6b3acf0fb8708e6ab8c7daa18f5a3039772472fd6542f6ea6dbe0530c8c3361c791c
-EBUILD eduke32-20180508.6885.ebuild 5653 BLAKE2B be4dd6f9b63aac67499b35a36b0a72324ea60eda8b1b7b1f3bed681b9d5738209b097c162bed8301d2dcb98b12447f90be4a49164f55a29a7a9cc05ab437b180 SHA512 70e3a215dc32bcbd3227c07e58cfd66469c7630c3bd813ed6db5798b242aba156aeec6ebfa2000ed7faac42125e2b97cbb3b94dc9ecd2166b59751628961226d
-MISC metadata.xml 1659 BLAKE2B 2114f1b5ec7101a54c8506bb2d3877453f58057de782f399cd8126f82d8e390d9816a2d0f706d2f98ef13e54169d22eaa8de3cf8509884a145c9b602e37a2c36 SHA512 6ba7e12733147190ed307b02c80ba7224be49b30a795d04e5b4c466e929665b75690be81c8aea80cfc754981edbc9bfdabd93c1c6424ecc92a8d645c5b13484d
+DIST eduke32_src_20180702-6937.tar.xz 14703496 BLAKE2B b1028551621bf12cbf8e6b0626cfb9634aa096d59a9dcc173cdb89614e68006d56468e2507e8f44f9c7a81e3c2bb392b79ccdafda420d456e169f135f78e106b SHA512 f219c30c6b5892846cc1f2a025e192d868610607213671658a62bcc833a5e0d8f5a3841681475574451e9938a8b8f47410e5f7f34267b618d03a2f154539cfef
+EBUILD eduke32-20180702.6937.ebuild 6076 BLAKE2B e3e92d3a8fbca3591855495294ec06bedd7b545f8d618f3730e9544df02a7559229291915db32ed0ae236fdcd0c9eb058c3ee2ec6345daabfe7c469e20ab88e2 SHA512 ab65151e77139a4805a6a2292540e6c30c8eec695195bc28d2ff294ddac29fbbac42eacc00a35e61e4270aa25dbfe483b2c0448cb265421e1d5b1439d2c5e2d5
+MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20180508.6885.ebuild b/games-fps/eduke32/eduke32-20180702.6937.ebuild
index d0de4c73bf6f..c42e95c4417b 100644
--- a/games-fps/eduke32/eduke32-20180508.6885.ebuild
+++ b/games-fps/eduke32/eduke32-20180702.6937.ebuild
@@ -12,12 +12,14 @@ MY_PN_HRP="duke3d_hrp"
 MY_PN_OPL="duke3d_musopl"
 MY_PN_PSX="duke3d_psx"
 MY_PN_SC55="duke3d_music-sc55"
+MY_PN_VOXELS="duke3d_voxels"
 MY_PN_XXX="duke3d_xxx"
 
 MY_PV_HRP="5.4"
 MY_PV_OPL="2.01"
 MY_PV_PSX="1.11"
 MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
 MY_PV_XXX="1.33"
 
 DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
@@ -28,21 +30,24 @@ SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src
 	offensive? ( http://www.duke4.org/files/nightfright/related/${MY_PN_XXX}.zip -> ${MY_PN_XXX}-${MY_PV_XXX}.zip )
 	opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> ${MY_PN_OPL}-${MY_PV_OPL}.zip )
 	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> ${MY_PN_PSX}-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/${MY_PN_SC55}.zip -> ${MY_PN_SC55}-${MY_PV_SC55}.zip )"
+	sc-55? ( http://www.duke4.org/files/nightfright/music/${MY_PN_SC55}.zip -> ${MY_PN_SC55}-${MY_PV_SC55}.zip )
+	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> ${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip )"
 
 KEYWORDS="~amd64 ~hppa ~x86"
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
-IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis vpx xmp"
+IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
 REQUIRED_USE="cdinstall? ( !demo )
 	demo? ( !cdinstall )
-	hrp? ( ^^ ( demo cdinstall ) )
+	hrp? ( ^^ ( demo cdinstall )
+		!voxels )
 	offensive? ( ^^ ( demo cdinstall ) )
 	opl? ( ^^ ( demo cdinstall )
 		!sc-55 )
 	psx? ( ^^ ( demo cdinstall ) )
 	sc-55? ( ^^ ( demo cdinstall )
 		!opl )
+	voxels? ( !hrp )
 	vpx? ( opengl )"
 
 S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
@@ -69,7 +74,7 @@ DEPEND="${MY_DEPEND_RDEPEND}
 	app-arch/unzip
 	x86? ( dev-lang/nasm )"
 
-PATCHES=( "${FILESDIR}/fix-build-transpal.patch" "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
+PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
 
 src_unpack() {
 	# Extract only the eduke32 archive
@@ -88,6 +93,9 @@ src_unpack() {
 	if use sc-55; then
 		unzip -q "${DISTDIR}"/${MY_PN_SC55}-${MY_PV_SC55}.zip readme/music_readme.txt || die
 	fi
+	if use voxels; then
+		unzip -q "${DISTDIR}"/${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+	fi
 }
 
 src_compile() {
@@ -198,6 +206,9 @@ src_install() {
 	if use sdk; then
 		doins -r package/sdk
 	fi
+	if use voxels; then
+		doins "${DISTDIR}"/${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip
+	fi
 
 	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
 
@@ -217,6 +228,9 @@ src_install() {
 	if use sc-55; then
 		DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
 	fi
+	if use voxels; then
+		DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+	fi
 	einstalldocs
 }
 
diff --git a/games-fps/eduke32/files/fix-build-transpal.patch b/games-fps/eduke32/files/fix-build-transpal.patch
deleted file mode 100644
index 3c22bc405507..000000000000
--- a/games-fps/eduke32/files/fix-build-transpal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/source/tools/src/transpal.cpp	2017-02-01 11:01:11.000000000 +0100
-+++ b/source/tools/src/transpal.cpp	2018-05-11 00:06:37.329712454 +0200
-@@ -26,7 +26,7 @@
-     r = ((ptr[0]*t+32768)>>16);
-     g = ((ptr[1]*t+32768)>>16);
-     b = ((ptr[2]*t+32768)>>16);
--    return(getclosestcol(r,g,b));
-+    return(paletteGetClosestColor(r,g,b));
- }
- 
- static char gettrans(char dat1, char dat2, int datransratio)
-@@ -39,7 +39,7 @@
-     r = ptr[0]; r += (((ptr2[0]-r)*datransratio+128)>>8);
-     g = ptr[1]; g += (((ptr2[1]-g)*datransratio+128)>>8);
-     b = ptr[2]; b += (((ptr2[2]-b)*datransratio+128)>>8);
--    return(getclosestcol(r,g,b));
-+    return(paletteGetClosestColor(r,g,b));
- }
- 
- int main(int argc, char **argv)
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 801a1769ecb5..15de77d47f59 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="server">Enable support for multiplayer.</flag>
 		<flag name="sdk">Install the SDK files.</flag>
 		<flag name="tools">Install the support tools for mapster32.</flag>
+		<flag name="voxels">Install the Duke Nukem 3D Voxels Pack.</flag>
 		<flag name="vpx">Enable support for <pkg>media-libs/libvpx</pkg>.</flag>
 		<flag name="xmp">Enable support for <pkg>media-libs/exempi</pkg>.</flag>
 	</use>