gentoo resync : 24.02.2018

3 files changed, 77 insertions, 2 deletions

diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index fe6bd1b37ba8..21050d0e2aa5 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,8 +1,9 @@
 AUX judy-1.0.4-parallel-make.patch 6709 BLAKE2B 95c73d7f1e34ed12f1080c41fd5083a62c5a34d4f6766933409d8f1795a23364607cb6c25091db213ed3cf846feefbbd821d494e7a848b521084b213434c915b SHA512 43ada8c164cd6f0b1e41eed0759062ec1888ee34f32dacfa5492edb7acf28095f1a6ebd4b21acf0e4d2ae3a4f0820b28e72998f604767bc16eaef875cf5cc0c3
+AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d87f3ca39240460d84033123a518bf0b8162be8226bfeea43c08cf810b3ac2219909ff505903d54ebae42c74ee SHA512 191f64d44d444ee238b8cfe589fcd25471c82978f6a5e34736b7a9631dd72e06542c8f748ce2c2cd434ea40793ac5b9f95a32e95c5559fbbc9aee3f2dc2e7aec
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.4.tar.gz 1142724 BLAKE2B 9357a6d37a9f8a15c4e06c304e5496ae271717243d79b7a1287cd6fcea5e130dcac2b1e191fff1530fb141a1d967be404a106afa3ac5005a6c71eb61491b807b SHA512 3a2fcd14a4367910ced5d1da8b46551e2847e02c1faa19c3ecd0ee542bb89c683c8998feb79abee4999a753d26ed5e7bfd9a7e2ed343a7667c7ff0d624ee384f
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
 EBUILD judy-1.0.4.ebuild 678 BLAKE2B 136a23f4eee0c8b4dcc67ac789a07f00bf0345966aa68b60ddc79b2a6519d51aeea9cdef8f86297a4c0d75ef18e842d657191c301e5f633534d006ceb78cd162 SHA512 e5a0445240ec1eb4e1e0b654d7d4722b29224e718374404cbc9a4d452d2b3b73b80c777fab290e94548f6817c3fa1b75bfdca30126fe0cdf6bacd1085ad6e702
-EBUILD judy-1.0.5-r1.ebuild 829 BLAKE2B bc33baa617861b77877510278831e1f0549c5c2c9ceac8040b399bdd47bf99c255bc26640bd9e0c96a75cdfeae15dfa0aeb68fd1ba55c7a382d27eb83adca93d SHA512 b63781286fc52b49cc846643fc0b691d0e6c4e98b68d4ae6b2349455f1ea493502e12a5535113bfe4eefc42a1a8ff776f2a51c1d9ef1ba50964356da4e923ac8
+EBUILD judy-1.0.5-r2.ebuild 868 BLAKE2B a68debbb1c70252e3eb34aaf704126a37e2b147a43f4758622dd04e97a171294bd4ba061bd691248be32ddb80e7b6c8988e2ce263d3339353554a8b527d21017 SHA512 23439b541e31818830b9b63087d82b32dbf93a598335f2b25f91100b07eb61d4ee21345e2e8289ed10ff40b5c8ef7909b4b386c58dcf256f26c6fae50449d9df
 EBUILD judy-1.0.5.ebuild 640 BLAKE2B d8a739e2a8688eaa6ba652ff123d919c341a44b74899dc375ad08a69cd7bba9399b2a2c24385f9731c0b5d12fa3c4ba6b73de5ddf41d4a59c25213a86a2b7e12 SHA512 5adb0f29c2fa930f31942cb06e6598f071da915faf6a2ff3e0790ea958dbc9cb62eb32212a5cbba8b24fd52a8b9d021bc39bc03e6ef2b5e941615821de5870ab
 MISC metadata.xml 320 BLAKE2B 7fd7a64eaec80ea91157624ff748afed6e8754407b8a0e261aac3022e2b69e2e6019ccb025c5a739f9bc005d81e41bb14be0add7323366422499aa96c8162e84 SHA512 ab0598eef76bffcdce226c8d0c20e70c723771835f20505119ea1fba9484293a28e5862f9227738284ce7a53809e4fc68fea31e2335764934e8e36b983366a46
diff --git a/dev-libs/judy/files/judy-1.0.5-gcc49.patch b/dev-libs/judy/files/judy-1.0.5-gcc49.patch
new file mode 100644
index 000000000000..c2e127626fbf
--- /dev/null
+++ b/dev-libs/judy/files/judy-1.0.5-gcc49.patch
@@ -0,0 +1,73 @@
+diff -aurN a/src/JudyCommon/JudyPrivateBranch.h b/src/JudyCommon/JudyPrivateBranch.h
+--- a/src/JudyCommon/JudyPrivateBranch.h	2005-02-15 16:06:07.000000000 -0500
++++ b/src/JudyCommon/JudyPrivateBranch.h	2014-08-19 16:59:55.000000000 -0400
+@@ -19,7 +19,7 @@
+ // Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ // _________________
+ 
+-// @(#) $Revision: 4.57 $ $Source: /judy/src/JudyCommon/JudyPrivateBranch.h $
++// @(#) $Revision: 1.2 $ $Source: /home/doug/judy-1.0.5_min/test/../src/JudyCommon/RCS/JudyPrivateBranch.h,v $
+ //
+ // Header file for all Judy sources, for global but private (non-exported)
+ // declarations specific to branch support.
+@@ -55,7 +55,7 @@
+         {
+             Word_t      j_po_Addr;       // first word:  Pjp_t, Word_t, etc.
+             union {
+-//              Word_t  j_po_DcdPop0:cJU_BITSPERWORD-cJU_BITSPERBYTE;
++                Word_t  j_po_Addr1;
+                 uint8_t j_po_DcdP0[sizeof(Word_t) - 1];
+                 uint8_t j_po_Bytes[sizeof(Word_t)];     // last byte = jp_Type.
+             } jpo_u;
+@@ -78,13 +78,18 @@
+ // TBD:  Revise this structure to not overload j_po_DcdPopO this way?  The
+ // current arrangement works, its just confusing.
+ 
+-typedef struct _JUDY_POINTER_IMMED      // JPI.
++typedef struct _JUDY_POINTER_IMMEDL  
+         {
+-            uint8_t j_pi_1Index[sizeof(Word_t)];        // see above.
+-            uint8_t j_pi_LIndex[sizeof(Word_t) - 1];    // see above.
+-            uint8_t j_pi_Type;                  // JP type, 1 of cJ*_JPIMMED*.
+-        } jpi_t;
++            Word_t  j_pL_Addr;
++            uint8_t j_pL_LIndex[sizeof(Word_t) - 1];    // see above.
++            uint8_t j_pL_Type;
++        } jpL_t;
+ 
++typedef struct _JUDY_POINTER_IMMED1   
++        {
++            uint8_t j_p1_1Index[(2 * sizeof(Word_t)) - 1];
++            uint8_t j_p1_Type;
++        } jp1_t;
+ 
+ // UNION OF JP TYPES:
+ //
+@@ -96,18 +101,22 @@
+ typedef union J_UDY_POINTER             // JP.
+         {
+             jpo_t j_po;                 // other than immediate indexes.
+-            jpi_t j_pi;                 // immediate indexes.
++            jpL_t j_pL;                 // immediate indexes.
++            jp1_t j_p1;                 // immediate indexes.
+         } jp_t, *Pjp_t;
+ 
+ // For coding convenience:
+ //
+-// Note, jp_Type has the same bits in jpo_t and jpi_t.
++// Note, jp_Type has the same bits in jpo_t jpL_t and jp1_t.
+ 
+-#define jp_1Index  j_pi.j_pi_1Index     // for storing Indexes in first  word.
+-#define jp_LIndex  j_pi.j_pi_LIndex     // for storing Indexes in second word.
++#define jp_1Index  j_p1.j_p1_1Index     // for storing Indexes in first  word.
++#define jp_LIndex  j_pL.j_pL_LIndex     // for storing Indexes in second word.
+ #define jp_Addr    j_po.j_po_Addr
++#define jp_Addr1   j_po.jpo_u.j_po_Addr1
+ //#define       jp_DcdPop0 j_po.jpo_u.j_po_DcdPop0
+-#define jp_Type    j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
++#define jp_Addr1   j_po.jpo_u.j_po_Addr1
++//#define jp_Type    j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
++#define jp_Type    j_p1.j_p1_Type
+ #define jp_DcdP0   j_po.jpo_u.j_po_DcdP0
+ 
+ 
diff --git a/dev-libs/judy/judy-1.0.5-r1.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
index cddafade8c6a..e118223b34de 100644
--- a/dev-libs/judy/judy-1.0.5-r1.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r2.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=6
@@ -17,6 +17,7 @@ DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-parallel-make.patch"
+	eapply "${FILESDIR}/${P}-gcc49.patch"
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eapply_user
 	eautoreconf