Drop has_version from older versions, and upgrade latest to EAPI=2 #426474 by Ilya Gordeev.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

6 files changed, 16 insertions, 15 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 47d44df19524..61863271a713 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.273 2012/08/17 19:26:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.274 2012/08/18 21:28:14 vapier Exp $
+
+  18 Aug 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.3.ebuild,
+  shadow-4.1.5-r1.ebuild, shadow-4.1.5-r2.ebuild, shadow-4.1.5.1.ebuild,
+  shadow-4.1.5.ebuild:
+  Drop has_version from older versions, and upgrade latest to EAPI=2 #426474 by
+  Ilya Gordeev.
 
   17 Aug 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1.ebuild:
   Call epatch_user for custom auth patches #431750.
diff --git a/sys-apps/shadow/shadow-4.1.4.3.ebuild b/sys-apps/shadow/shadow-4.1.4.3.ebuild
index b8c40d7d40dd..2d32ee587326 100644
--- a/sys-apps/shadow/shadow-4.1.4.3.ebuild
+++ b/sys-apps/shadow/shadow-4.1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.4.3.ebuild,v 1.13 2012/07/07 03:29:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.4.3.ebuild,v 1.14 2012/08/18 21:28:14 vapier Exp $
 
 inherit eutils libtool toolchain-funcs pam multilib
 
@@ -50,7 +50,6 @@ src_compile() {
 		$(use_with selinux) \
 		$(use_enable nls) \
 		$(use_with elibc_glibc nscd)
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
 	emake || die "compile problem"
 }
 
diff --git a/sys-apps/shadow/shadow-4.1.5-r1.ebuild b/sys-apps/shadow/shadow-4.1.5-r1.ebuild
index f1e1599e99cb..8c7eaa847f4a 100644
--- a/sys-apps/shadow/shadow-4.1.5-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5-r1.ebuild,v 1.3 2012/07/07 03:29:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5-r1.ebuild,v 1.4 2012/08/18 21:28:14 vapier Exp $
 
 inherit eutils libtool toolchain-funcs pam multilib
 
@@ -53,7 +53,6 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_with elibc_glibc nscd) \
 		$(use_with xattr attr)
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
 	emake || die
 }
 
diff --git a/sys-apps/shadow/shadow-4.1.5-r2.ebuild b/sys-apps/shadow/shadow-4.1.5-r2.ebuild
index c00fa6338140..6646348a61db 100644
--- a/sys-apps/shadow/shadow-4.1.5-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.1.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5-r2.ebuild,v 1.3 2012/07/07 03:29:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5-r2.ebuild,v 1.4 2012/08/18 21:28:14 vapier Exp $
 
 inherit eutils libtool toolchain-funcs pam multilib
 
@@ -58,7 +58,6 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_with elibc_glibc nscd) \
 		$(use_with xattr attr)
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
 	emake || die
 }
 
diff --git a/sys-apps/shadow/shadow-4.1.5.1.ebuild b/sys-apps/shadow/shadow-4.1.5.1.ebuild
index 9b46509c21af..a411b2bb3372 100644
--- a/sys-apps/shadow/shadow-4.1.5.1.ebuild
+++ b/sys-apps/shadow/shadow-4.1.5.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.1.ebuild,v 1.2 2012/08/17 19:26:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.1.ebuild,v 1.3 2012/08/18 21:28:14 vapier Exp $
+
+EAPI="2"
 
 inherit eutils libtool toolchain-funcs pam multilib
 
@@ -29,16 +31,14 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	pam? ( >=sys-auth/pambase-20120417 )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920
 	epatch_user
 	elibtoolize
 	epunt_cxx
 }
 
-src_compile() {
+src_configure() {
 	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--without-group-name-max-length \
@@ -55,7 +55,6 @@ src_compile() {
 		$(use_with elibc_glibc nscd) \
 		$(use_with xattr attr)
 	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-	emake || die
 }
 
 set_login_opt() {
diff --git a/sys-apps/shadow/shadow-4.1.5.ebuild b/sys-apps/shadow/shadow-4.1.5.ebuild
index 46bf46ffd21a..5f567cb9e810 100644
--- a/sys-apps/shadow/shadow-4.1.5.ebuild
+++ b/sys-apps/shadow/shadow-4.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.ebuild,v 1.5 2012/07/07 03:29:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.ebuild,v 1.6 2012/08/18 21:28:14 vapier Exp $
 
 inherit eutils libtool toolchain-funcs pam multilib
 
@@ -53,7 +53,6 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_with elibc_glibc nscd) \
 		$(use_with xattr attr)
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
 	emake || die
 }