Update mk-defs patch, bump to EAPI=5. Bug #543808, patch by nigoro.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 35 insertions, 30 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 43cd453c5a9d..b38866ee20d6 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.60 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.61 2015/04/10 13:30:26 mgorny Exp $
+
+  10 Apr 2015; Michał Górny <mgorny@gentoo.org>
+  +files/freebsd-mk-defs-10.1-gnu.patch, -files/freebsd-mk-defs-10.0-gnu.patch,
+  freebsd-mk-defs-10.1.ebuild:
+  Update mk-defs patch, bump to EAPI=5. Bug #543808, patch by nigoro.
 
 *freebsd-mk-defs-10.1 (08 Mar 2015)
 
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 86f28730885a..ff15f82eb0d2 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX freebsd-mk-defs-10.0-gentoo.patch 12183 SHA256 7e859440386e4b7047507a279fa6e5b0737918f65a04f8c75cc8470a20511d39 SHA512 3d257b59873281afbaeaead56abe944cb82cd42fe3b403795009efe452ae9e85f50da845f261e576b39c5110f422dc8929b30451905f7a797541a83983c8a39b WHIRLPOOL 67adf7e146743b0c372197df595ccdfa0725879213dab05656ce033a5189e3d71a7f64462baf4ff4761de572ca61473cadeacf63c76e67aa80543d0916b94a93
-AUX freebsd-mk-defs-10.0-gnu.patch 2290 SHA256 c393eacd7abc98e74d9c6d222a1edb9fd8fb3ef300dd88ae1805962d40bbfb9d SHA512 06bee5f219f7650041a48558ba3447125179ba501a8e5cf767533cd8fb972ef73eb68bbe8099b429326a5ca9ece4afa54d97fabf915b21d46d0574aeaa1e1e18 WHIRLPOOL f594d656a27a4ffe2b3613d74b7997bd91f01e3a254932217654720fe35bb1dcebb425685837c939a1fdd1d0f36d074d011ca99811c36e59654307421dd2b152
+AUX freebsd-mk-defs-10.1-gnu.patch 2320 SHA256 7b73dd0076eff45f71345dda0b4dd8e2a1a05f40101f559f52ab938813ef4ce1 SHA512 a8b82220f30c7b9ae369876339ff3e7431d3bbcb2c2a0fd8cb4e4c1c17188563c3d4d29938ef3b2b5480acf42f7d71a08ca8ade4f55968da17e82ceafc703981 WHIRLPOOL f0d56fc3065258b25e64a966470f4941e1f4cf6f0558cd3083102961d84acdbeb17c3469a5ab6a3c591e62a72e9c1c06d336ca854c607b40780f8e80f9157e4e
 AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973
 AUX freebsd-mk-defs-8.0-gnu.patch 4074 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0 SHA512 8196f6f01059dd7890af9e0e0be654ad264938f4e8c9a209543b995baf6be43d841417ba8b8340c3c092c8d5f14ad76d578ddcd9267c372999b857ca9a566f03 WHIRLPOOL 28a4600e93855aba192d326beb479743890814c68999290d65a94e7cfa636db897c2c2a2c4ac177a87f8af12ff0a51c1b8ba5a8bb22802e0ef695e7418469d70
 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
@@ -17,31 +17,31 @@ DIST freebsd-share-9.2.tar.bz2 6731157 SHA256 9a67395db66bcda4ba261c229462c2444f
 DIST freebsd-share-9.2_rc1.tar.bz2 6731688 SHA256 cdf863443216b221f4c0ad8bfd3441ecc8faa8de65ac448b9c47665b6070666e SHA512 de360a3eb69674debf2cba24b85f6ebcb1ecd494788e9c18492d6ad4162268a717c99fae5c6e26d6c0b7ad71d8c92b997f921836fc3bb5305c42e5970b35ad95 WHIRLPOOL 8e58489e5cf15f3d529211ffca4843b259bb634c1c3682a84f93f455201c7a556df9580691d49b194639ceca45bef6ea682b659e38e506d33130fe9f148d8d17
 DIST freebsd-share-9.2_rc2.tar.bz2 6732594 SHA256 18793d940b2777b311eda78324a452826500fa0503f57f76e87d04d501412b8c SHA512 a6a04c145c9afcdeb04c0dae681f86ac8f9fc26f3393511ab936e4606ef5fac60bece11118ad293d1cb2c235a771de3ffb94693c68ef05abd86f2ae8b34c2d66 WHIRLPOOL 331d72591cb2862732c62079f0d77ed49eb2e9c50ce9ff6fead0efc30b4d49a68213482e8ce4995f8cf6d3e4c573c156307189df649026e8fb892fa60cb43d59
 DIST freebsd-share-9.2_rc3.tar.bz2 6732884 SHA256 2a8c2d9176400eb6daef53a3903b199770fc5b3b9c0fdd82dac42c43d4376627 SHA512 d606179946410a1133dc83a426a7e56f15fee2e043e02e99bb8e74a7ad67b32e53ab6b20d8f2600010c256a0105633e4781ed2985df55502ec1b50030351e380 WHIRLPOOL dc1cad33359839a60a7bc4efc9d32429dcf595dfff3140bd760810a8ceddd5e0d7aaa5d761dee80a2856ea324b43ec29ab0ae5bfde07dc6694c64c4e8f0705b2
-EBUILD freebsd-mk-defs-10.1.ebuild 972 SHA256 d8b5daa18e1c12fef78c5f13557711b9d96b0e773836db77dc31c9e60dc1dedd SHA512 0d71d4edaa44377932d250bb4ee1eaf90938de763a8b0148e9566894fe2f5bb030e543bc202a67b2ea6dffc8090ab10375f523612a7972e3fa7e372218f053d3 WHIRLPOOL 060e5ccd08ded9e1992f73f728b9e3bd9704e2d86b09575eaad602066df6ab519e2ce79b32d2043d58c05901918903d97c7a2279760fd72f1975224d1c177fad
+EBUILD freebsd-mk-defs-10.1.ebuild 972 SHA256 063fcff07f77b51eae5b8316d3d151e164374232f5dee8cfe8c00139ca526753 SHA512 718e4fd0e7c6d303ea152d7a368029e3cc4e4167e80451d76ab20fbff4e5542c88218108b37dbbe154d829fd0169f074c1f90e3890f88a49ac460391b37a30c2 WHIRLPOOL a2a19efee2d318482dd1b505a37c7033582ece29a402c43fc6b7134d75e6f7b341e2284bca4378bb7ae9530424d616b3e71b2a5a44ebe0367e94eff874109377
 EBUILD freebsd-mk-defs-8.2.ebuild 879 SHA256 212cea22f0e963889075dba7cbdf47a3a4509991c2112965b59bf61a71833bdc SHA512 6303888496e432c17462bd04cc9d42dc10078154aafead4157009214f5e97249601a73d9b3aa6020ba0beeb72ec509f6db260649b3cb35c44edf78030a8545a9 WHIRLPOOL e26d964bf9180115ca6c55097fb520e81f3e1bd493ce20784484dd51768c412a9ad17f3ef8d532da4d21728547de525905da6ba34ebb4adc9b07742149f0f5bd
 EBUILD freebsd-mk-defs-9.1.ebuild 901 SHA256 e0f5a7e50e2ec7eda0c9333004039739ac5de29b3544b72152d0c3ba887647a5 SHA512 fe4ed51be86ef1a15af1e577b5263a4e36e5a78ae085b96af455e1f70bf77f8c22bde3c9f5135e67b70ce9ce02a43d22810ff780ea02c1dd338aeea85f394799 WHIRLPOOL fdabee6e93b6ceacfda48e01b2fe782433643cd6b07d5619f38bb1f0c14e46af1ac23aed6cb46618b75120e98a4bab53da10f6fcd3823eb6fb2ad3d80d62a408
 EBUILD freebsd-mk-defs-9.2.ebuild 937 SHA256 868023af308858daa56d502178f120e1caaf9a5051a22ca62bdf5e962c2b79bf SHA512 01878a72a36585e51f2e954a445ede5120b6f2a399bd2dc7df461d2f17a46591cf3104f94607312f373a63dc4f16f5f03f574a98e02421e96481d4c9be7103c3 WHIRLPOOL e69f778f7b7a0987cdbad308b9424fd9413cd4e8d30a05b2f98e607a598a84aa171029826c626f303ca244aed91040bf8a27873a1c472d21949098620a58ba65
 EBUILD freebsd-mk-defs-9.2_rc1.ebuild 892 SHA256 bf19249955b332b0d423a4e6dd4f8343b89f2ad3b72cd5061c96c3cae7cf6f05 SHA512 9a7a60282cd1ecb6ae3f1d515031a657e1be158a472a8358b846f22e33c2103c78c18bf5904cea65194d89989ca707caa6f0f01c3a7bbcfcc3f97470b945fd78 WHIRLPOOL 999d00fee6358a0567cff45065e3b8ad53bb1a5ee35fc2706ae0cecf93e05a390a615726e351b5592872877f1f3eb9342a1f20bf9161f6bcbad3db4b61dc26e4
 EBUILD freebsd-mk-defs-9.2_rc2.ebuild 892 SHA256 1d882ad5ddb735d29d56d664439ee6b898ea876a7bbc2a3772c832db88181ed3 SHA512 8701b4414f416948d3d16988fef4eed8991a829dee104c8c239144715e0cd3ae622e4a4d71dd8d52251f005622cf22852f1972ecae0961e01c4c02f306cafe6b WHIRLPOOL 98d893079f260f9c89bbf4fe3951d502065aa105db8be0130021bcf64e4f96b12e55b5b07dbac5317beeeddfe8007f1792fe886e8a2b6b8be6b862e80d94190f
 EBUILD freebsd-mk-defs-9.2_rc3.ebuild 892 SHA256 4b9d3d2e52c9bbdbbf2a5334f1066fd80a4e0f76446f4ca736178b0d8c925479 SHA512 4d5fd5d73529c2354acb80266ec5c8c10e8624e11a31b3b2c4886c482cd50e07b361aace2f12388ed0487411ebdd4f87e99ac0e298b3e0a4205137ba020b9b3b WHIRLPOOL 3801cd54fb401de0213c466ed8268c1bd2a4730273e8fe30b306fff75606eea3273d91c6cd85fd69ad973f1392437837f7fbcbc25678151be5c0c72703915f56
-MISC ChangeLog 12656 SHA256 8e5aa6ab517b6b276f0808f872ff0d3221cdbde46bde16644f9de2c9f8fd6958 SHA512 4ad029dfe6e8e41a2644ca7cd836159fe40aadf05204dfe30d1c6cf1771e7d26d1eb043181f48e45e67525db05b1a8a48044fe74efa8aea08eea648e2f60837d WHIRLPOOL cb5e4edab36f76cc54a324a772efcec305cfba860d1fd7f593e2fd57e87dc2337773818a996ea92adc3dfaccad2d02481a66bfbf2b915b69d675b78315269084
+MISC ChangeLog 12888 SHA256 25e2de5497f81fedd7047512ae5d50b073297e049e20a91584cff7dc49b8de53 SHA512 74befff4a55e1e396490e68af9e7feca7ae557de151127a4d77593ebe06422cb067319d6558e3e989272d12e6d15b3cd3f6360f7f813357c0981f416080ccf86 WHIRLPOOL 658f77749ceed3f55e29782e06e3f57a6167e395a3e1ed13834a6b13bb5cec25d4c2a67c18682dfd97109867bcb7b9d0ff1b58c6d28037651d09dac469c2076c
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU/FZdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVJ9BzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODsAP/0vGIRtK1dOuz9gUrHZr02HB
-pWAN+pv2l68kKYZvVsUz/9NW3GhL4IqzSxAVAOONB5ErRTQjQ4EPd+LhJs835xMP
-T91eoYX2HV5SFb25p5C7xKpTadaFW5M6Rkh6UTMtkZbUZcKNWk0Ttekhd76I8QHR
-3gdiqSLOtSUT+odSjLtB71KsNd87IILt4Lt3bARoS+NRe8jQ1jjk7BIHPZVaZber
-CPaex9reGkLbP8iOXY86ypOKz6V1WS4KTS2MHam10tTnEKNLXCoqgLwfg7/bo8We
-pSk0g2Lz0T2N9b9g3SvtP9r0FZv8kbZKtwSZWc64pVikuswohiETgkRJntqcT+BG
-WOVI+MDfZrVME7H2ReQsrfaHl74vSiDaTvolLCIN4Ln+eCubS6ijvmuMbVM36Xy8
-KMAVXwCM7qEDjZ098URn40NIqlxc6lBIGxJYF7V70Fo07DYoKD9hDzxgDDx6cBk1
-McAoXcfxGjKPk6LtAyXvdW/LAr3mzRw2A+YvNGpBiFUsVTZAY5nhjbcLyUsvpB5u
-8yeLr0vaqYPH0wkmwo6Wmu6+ordVoIRNn4XHptk8Yu6I9KkUCGud2AsdY/qEWR8O
-klG2mulhBB6V3rUA2iIaEMIRtT+9XszdrcO+6SRn7MQythYQ7yzKHniStcyEwwyR
-4ewIDh/rHi8LOAzK05bP
-=GXZ0
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTbQQANsLZZQpOKtcLcfECjYU+dTB
+MciayoYCCU/TkFQy/jRwie/Hg5bZq4JtCbktv2e6paM9lBW6xCuTAtHL6Zt0EOxT
+dmq6K/XceaRDnrioKRhSnuiDohlSlURs/JnKkSN0jfXI0mNOcalZMIJNLXbmKeiA
+GdI8axGNJ932a+1oj0Wm2yH4uojjQUJ7zYC58wrY4L4J7H/VhfLO/4LNzbP4Nt04
+5TUQFYuXWruxPEmjv9p4CzK9K/JWg82pueFZiqpFNjjqxVFLg/+1eoL+qztUfpt6
+gPBlVX0lvvInnFPm1H3qvVlBOCjm+LpNbgqU+xCQ7xIdhsbFf3Nl/jyekfs/poh9
+xnNnDhAm3dngVmNA/IJ/h6mNSIczf54zV4PcTR4/XqNk9lUEUyHyLAdr1q/8PqV0
+XIxLjGwIuWmMrVVbitk8TOzc2EiKXt9hpE3UAJDW8wn1hxTTWN1tYNEzy0U3Ur0h
+eb82GWuGfC4DkwFxSDGr1rG1/awJeoig5eburnoYbwZWQz9K+BhCa8vGNC9UWTqH
+i9Ru/LIYqwIVodB12BD4zY7pYz1FRxKYdo8XPSJWNo3H46xxC7DsCqiiMdRvvn7G
+6VV65hW8owZKo4RbBZfnqrXflF/DVnMvwUz/yyof9Uy/r03AM/vcR4I/zEjq6dYu
+x+YGICT1tYV7Ep1GkwAj
+=ePba
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
index acce807fe618..e566e6235a3a 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
@@ -1,8 +1,8 @@
 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 0a33fdb..cd7ca2f 100644
+index a5eacf9..01d1045 100644
 --- a/share/mk/bsd.lib.mk
 +++ b/share/mk/bsd.lib.mk
-@@ -165,11 +165,7 @@ _LIBS=		lib${LIB}.a
+@@ -166,11 +166,7 @@ _LIBS=		lib${LIB}.a
  lib${LIB}.a: ${OBJS} ${STATICOBJS}
  	@${ECHO} building static ${LIB} library
  	@rm -f ${.TARGET}
@@ -12,10 +12,10 @@ index 0a33fdb..cd7ca2f 100644
 -	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
 -.endif
 +	@${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
+ 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
  .endif
  
-@@ -182,11 +178,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
+@@ -183,11 +179,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
  lib${LIB}_p.a: ${POBJS}
  	@${ECHO} building profiled ${LIB} library
  	@rm -f ${.TARGET}
@@ -25,10 +25,10 @@ index 0a33fdb..cd7ca2f 100644
 -	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
 -.endif
 +	@${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
+ 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
  .endif
  
-@@ -213,15 +205,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
+@@ -214,15 +206,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
  .if defined(SHLIB_LINK)
  	@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
  .endif
@@ -45,7 +45,7 @@ index 0a33fdb..cd7ca2f 100644
  .if ${MK_CTF} != "no"
  	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
  .endif
-@@ -279,13 +265,6 @@ _EXTRADEPEND:
+@@ -280,13 +266,6 @@ _EXTRADEPEND:
  
  .if !target(install)
  
@@ -60,10 +60,10 @@ index 0a33fdb..cd7ca2f 100644
  .for ie in ${INSTALLFLAGS_EDIT}
  _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 02024e0..0f9010d 100644
+index a53ea14..af3f37c 100644
 --- a/share/mk/bsd.prog.mk
 +++ b/share/mk/bsd.prog.mk
-@@ -180,13 +180,6 @@ _EXTRADEPEND:
+@@ -179,13 +179,6 @@ _EXTRADEPEND:
  
  .if !target(install)
  
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
index d146b69bb9bb..dc7c9a6f5e24 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild,v 1.1 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild,v 1.2 2015/04/10 13:30:26 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd
 
@@ -26,7 +26,7 @@ S="${WORKDIR}/share/mk"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-10.0-gentoo.patch"
 	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	use userland_GNU && epatch "${FILESDIR}/${PN}-10.0-gnu.patch"
+	use userland_GNU && epatch "${FILESDIR}/${PN}-10.1-gnu.patch"
 }
 
 src_compile() { :; }