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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 18 insertions, 13 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/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() { :; }