Punt the shadow stuff to the shadow ebuild.

(Portage version: 2.1)

6 files changed, 14 insertions, 68 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index dfcf2f4fdc0a..bbdf3762f58f 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.330 2006/06/05 14:32:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.331 2006/06/10 17:02:36 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  10 Jun 2006; <roy@gentoo.org> baselayout-1.11.14-r8.ebuild,
+  -baselayout-1.11.15-r1.ebuild, baselayout-1.11.15-r3.ebuild,
+  -baselayout-1.12.0.ebuild, baselayout-1.12.0-r1.ebuild,
+  baselayout-1.12.1.ebuild:
+  Punt the shadow stuff to the shadow ebuild.
+
 *baselayout-1.12.1 (05 Jun 2006)
 
   05 Jun 2006; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild b/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild
index 654464e7c0c0..b181ab3ef912 100644
--- a/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild,v 1.2 2006/06/05 14:32:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild,v 1.3 2006/06/10 17:02:37 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -546,21 +546,6 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/modules.conf
 	fi
 
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && \
-	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
-	then
-		if /usr/sbin/grpck -r &>/dev/null; then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
 	# This is also written in src_install (so it's in CONTENTS), but
 	# write it here so that the new version is immediately in the file
 	# (without waiting for the user to do etc-update)
diff --git a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
index 99f21b298191..befc6c56fde5 100644
--- a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.2 2006/06/05 14:32:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.3 2006/06/10 17:02:37 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -541,21 +541,6 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/modules.conf
 	fi
 
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && \
-	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
-	then
-		if /usr/sbin/grpck -r &>/dev/null; then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
 	# This is also written in src_install (so it's in CONTENTS), but
 	# write it here so that the new version is immediately in the file
 	# (without waiting for the user to do etc-update)
diff --git a/sys-apps/baselayout/baselayout-1.12.0-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0-r1.ebuild
index 39ac746119fd..b0682e851af3 100644
--- a/sys-apps/baselayout/baselayout-1.12.0-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0-r1.ebuild,v 1.1 2006/05/24 19:36:00 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0-r1.ebuild,v 1.2 2006/06/10 17:02:37 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -545,21 +545,6 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/modules.conf
 	fi
 
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && \
-	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
-	then
-		if /usr/sbin/grpck -r &>/dev/null; then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
 	# This is also written in src_install (so it's in CONTENTS), but
 	# write it here so that the new version is immediately in the file
 	# (without waiting for the user to do etc-update)
diff --git a/sys-apps/baselayout/baselayout-1.12.1.ebuild b/sys-apps/baselayout/baselayout-1.12.1.ebuild
index 317e0f188e6f..ea900a5e782e 100644
--- a/sys-apps/baselayout/baselayout-1.12.1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.1.ebuild,v 1.1 2006/06/05 14:32:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.1.ebuild,v 1.2 2006/06/10 17:02:37 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -543,21 +543,6 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/modules.conf
 	fi
 
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && \
-	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
-	then
-		if /usr/sbin/grpck -r &>/dev/null; then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
 	# This is also written in src_install (so it's in CONTENTS), but
 	# write it here so that the new version is immediately in the file
 	# (without waiting for the user to do etc-update)
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.1 b/sys-apps/baselayout/files/digest-baselayout-1.12.1
index 3d246268d4c3..a84e8c27e3e3 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.1
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.1
@@ -1,3 +1,3 @@
-MD5 a06d07824f5b619403020288b392b27b baselayout-1.12.1.tar.bz2 215516
-RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 baselayout-1.12.1.tar.bz2 215516
-SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5 baselayout-1.12.1.tar.bz2 215516
+MD5 b7b750362e4f67209604620f321bc546 baselayout-1.12.1.tar.bz2 217878
+RMD160 bf29b30435c1a82f693472f2b011d6bf74b9194c baselayout-1.12.1.tar.bz2 217878
+SHA256 63bb66086aab5bd94068dda7b571f9dbb59cf0cbbeb563b418780690614cb75c baselayout-1.12.1.tar.bz2 217878