Preserves enet bundled libs, bug #542608

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xA8C8FBCF

3 files changed, 17 insertions, 11 deletions

diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index 00778b2d4bac..8541f35bc0d8 100644
--- a/games-emulation/dolphin/ChangeLog
+++ b/games-emulation/dolphin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/dolphin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.30 2015/02/09 00:00:07 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.31 2015/03/09 21:00:42 twitch153 Exp $
+
+  09 Mar 2015; Devan Franchini <twitch153@gentoo.org> dolphin-9999.ebuild:
+  Preserves enet bundled libs, bug #542608
 
 *dolphin-4.0.2-r4 (09 Feb 2015)
 
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 55d1e67f0044..cb9e3718e0e6 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -8,17 +8,17 @@ DIST 4.0.zip 23439392 SHA256 a698caf05f47a55c30e09d0aab053a412df683de2e139a63481
 EBUILD dolphin-3.5-r1.ebuild 3988 SHA256 e6bceabd745f06505ab114497e665e34927faa40e383fe2a3f637d3c84993557 SHA512 cd47aaed6efaa82298f9cbf1c7fe466b3be6d2cd2c6eecb095aef964847975b96468f2fdbe53a0b9b63a0fe3ba8354a91ace1df5a71328449e04748ed8f2fc70 WHIRLPOOL b29515fa86e025ad0751df7db5dbce285b482c2fb3f86311f0d75e5e699a8106026ecac55f64d5e150199f2a9b6f68bfd092d8a219a7c0379ecc1b1cb94ffd42
 EBUILD dolphin-4.0-r1.ebuild 3479 SHA256 71d1ce2409035d1609ee1cfd391fb8dd7a4efdcbd998372fe037502b47d9d52a SHA512 5a1eb2e46dfd953b69e0b601d6625cf921df8dfbf9a797332da3d01c6f8be3b2b57f1e3150ebdb3fe66ec75d053c5d4831dfe42606e2252dff1bd855c4027bf6 WHIRLPOOL f927358871ea326c6113a8d7bac9b88ff07918210d003c057b6b094fa462e412a83a8510eaee72e7051dc5087b88e6f219c92820ec0a50b28da27d934d0a133e
 EBUILD dolphin-4.0.2-r4.ebuild 3478 SHA256 5bce5578062a5e970af28fa29396d4f77f99eb37a7bd5058819b1f190ea7b4e8 SHA512 4733ebd9a70432a1895dd398d1666dfd0efeb53c30a6eaa5f5bcc9e093dacb77ced0fe85bafecea6255bc2a5200fbd991333b5da3daff14ed059fdcda0ffc6e9 WHIRLPOOL 10dd903dde3ebd2cda975a9670b375056ada250f60f6768d9837ceec63ed71bcc20168ee97a377461fe75110fd4a8ba555ecd90852b496121ce7261f015e4250
-EBUILD dolphin-9999.ebuild 3860 SHA256 d164cd0458c380f02bd164d9d8d41b3ec4eeebf21ab9e318614898b65a164c6c SHA512 9cd52ff746d69a4454a7a0bf50716fecf49e682e5edef9e009b60a94465207c483189cc7c49b3eea9032e18042b88a5469b4668773a49741655d92ee4c8d349a WHIRLPOOL 786ebc836586401d143f1e12db64aa02067ae8fd0793fc66b7ec6aa1808bc8a7c278148024e7cfd32ca7b67083c1ad0d9aba58c10c43dc146d77e7441193da33
-MISC ChangeLog 5224 SHA256 682356657647cda51da4539757fb731340915764b3a1ab01fc1e1c1cd514b5e1 SHA512 5f70afeb1f9619bce5115459d81f2f0c8651dd113a3c051e0cac4eb4a638e1988f6f7c81048b49a92e8f50f172b7c8a3c895ed21948a5dc611026c6e79f76763 WHIRLPOOL b5e216342f930b039f981317b8a86b92f4fb9d4fb38fbe25319e100150b9774edd36b7cf8b45e02cf8789e59fd14c6ca1c79fbfc16b30be1f5864e67f610e772
+EBUILD dolphin-9999.ebuild 3950 SHA256 cd4b497b82e9586c346b52fa15ce49c66fada039246ed483c8df0877f91d8dd8 SHA512 5379ad01a0679e30864c583159dceace9604a9e4e9f464e924af5b3e0496cdd2ee3be60bfbd683d2060b0e0bb1414558edafab2c579f164e975772b9509707e3 WHIRLPOOL 2f89997a2a8e78db330a1ff444a90b4e6c7cba23755009dfb582fc531ca7799888447b5d2601892abf9cd9a37bcfacb5d4ea0b7c7b6486e2e1691c18075938e9
+MISC ChangeLog 5343 SHA256 1c59c850c0f9fe664a0a816774a852d42f143bccdf01fea052341d0f4fe38c7c SHA512 82ac3d5634b1ae6a98a2319cd8c8bcf323ac6dcd68608468d67d8df09d7a0326c6d03fb88c75a1b2c2ac07241d343746c3c725b45bc681286bbad0acc0828f80 WHIRLPOOL c7f347cb01a094d6a08ffd26c86ec16e2ecd0a2660948a0c0809efcbdf381c4469188573529c78def39106781549c201ff59120add79f64ae0dd5044a3d593dc
 MISC metadata.xml 442 SHA256 11ac55298ad628e589b592a2da00db1cabfd31ff8621c0fea059d714acdce334 SHA512 96abf53048bb8aea1387eacc40b9cda4e6099f079ddeb669fb23458d67880804fb015970207aa10a21227b87c153208a8dfa4bf4ea279ff7e53dcfebf18ac30e WHIRLPOOL e72458e354da2e4bfeb67de52c31d50a61f3b926fe16c0bcf4aae5e599858e413fcc9057fe1b098e43ee18fabe6a0f05dff008f59065cf34bad02da6480fc120
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU1/iPAAoJEEAKp6Qwg9Y3kK0H/R5N1i7zbnVVdBWL93uCMC4A
-r00+Uh8KMOHhZYfazrdEOjW7VksITnQeOpq6I/DIMyaTPm6iibGB4+mzdwmkOo0d
-FO3BNJwv1bwAF2VKWFD0xuUICCzOU/9pyH33JDk/mdkWnbK5Tz9LT929Z2FIyoBv
-sW5J3qwbNFgFGu2RxKPPkz3/wB1SBN3HynLYkliMWNnPvcUXI0IV8BBH/k6mYxvg
-a8ajZlu4h7BCO9gIGhI8jBWnJW/aWVGmBx6X9OGLW86RmAGmdIVheHv+E2xY03YF
-zfwrJIcjE21m8assCAwdEpMUrTVqbzaVWL8Reouw3QgM5mHL5YhBeveyvoxD2Lo=
-=9ty+
+iQEcBAEBCAAGBQJU/goBAAoJEEAKp6Qwg9Y3qlEH/j6x8HattgHGsuNK424LWLgb
+OYpBVRsqP+FbPuD6ZAFuyAlP/0h+nlUFHFZXV7ZpAx1PUoYL5eyAB/sUCXpOu62I
+E2kGwNZpqRXvZl6rsCKdCsfyGS9vHPC6+c4ceq0w3jDex0oQ3R1e6smRuS4Gpa2o
+mkHTDwAnijV1CG8sL40VJgEczugwBcY7Ru6/koBcLk/3iEKpP2TnjS013DMczmuQ
+3iP3/uRUJfK84vURpCd7P8YzrodlgE/4duGn55i4ROX1NNwR3iIE1j9jSVnBnG8z
+lfTzjl0odqWGvZXFx5eSTEknIu14Dczmkj2leVKbzTM/rgNhS96GagUKSA6y3S4=
+=jzBO
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 750cb5c0a14c..faf3eef022bd 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.21 2015/02/09 00:00:07 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.22 2015/03/09 21:00:42 twitch153 Exp $
 
 EAPI=5
 
@@ -92,6 +92,7 @@ src_prepare() {
 	# - SOIL: The sources are not public.
 	# - Bochs-disasm: Don't know what it is.
 	# - GL: A custom gl.h file is used.
+	# - enet: Not fully supported yet.
 	# - polarssl: Not fully supported yet.
 	# - gtest: Their build set up solely relies on the build in gtest.
 	# - xxhash: Not on the tree.
@@ -99,6 +100,7 @@ src_prepare() {
 	mv Externals/Bochs_disasm . || die
 	mv Externals/polarssl . || die
 	mv Externals/GL . || die
+	mv Externals/enet . || die
 	mv Externals/gtest . || die
 	mv Externals/xxhash . || die
 	rm -r Externals/* || die "Failed to delete Externals dir."
@@ -106,6 +108,7 @@ src_prepare() {
 	mv SOIL Externals || die
 	mv polarssl Externals || die
 	mv GL Externals || die
+	mv enet Externals || die
 	mv gtest Externals || die
 	mv xxhash Externals || die
 }