[gentoo-commits] gentoo-x86 commit in eclass: user.eclass portability.eclass

[Mike Frysinger (vapier)]

vapier      11/10/31 17:39:53

  Modified:             user.eclass portability.eclass
  Log:
  drop unused funcs

Revision  Changes    Path
1.4                  eclass/user.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?r1=1.3&r2=1.4

Index: user.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/user.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- user.eclass	27 Oct 2011 07:49:53 -0000	1.3
+++ user.eclass	31 Oct 2011 17:39:52 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.3 2011/10/27 07:49:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.4 2011/10/31 17:39:52 vapier Exp $
 
 # @ECLASS: user.eclass
 # @MAINTAINER:
@@ -389,55 +389,3 @@
 	esac
 	export SANDBOX_ON="${oldsandbox}"
 }
-
-# Gets the home directory for the specified user
-# it's a wrap around egetent as the position of the home directory in the line
-# varies depending on the os used.
-#
-# To use that, inherit eutils, not portability!
-egethome() {
-	local pos
-
-	case ${CHOST} in
-	*-darwin*|*-freebsd*|*-dragonfly*)
-		pos=9
-		;;
-	*)	# Linux, NetBSD, OpenBSD, etc...
-		pos=6
-		;;
-	esac
-
-	egetent passwd $1 | cut -d: -f${pos}
-}
-
-# Gets the shell for the specified user
-# it's a wrap around egetent as the position of the home directory in the line
-# varies depending on the os used.
-#
-# To use that, inherit eutils, not portability!
-egetshell() {
-	local pos
-
-	case ${CHOST} in
-	*-darwin*|*-freebsd*|*-dragonfly*)
-		pos=10
-		;;
-	*)	# Linux, NetBSD, OpenBSD, etc...
-		pos=7
-		;;
-	esac
-
-	egetent passwd "$1" | cut -d: -f${pos}
-}
-
-# Returns true if specified user has a shell that precludes logins
-# on whichever operating system.
-is-login-disabled() {
-
-	case $(egetshell "$1") in
-		/bin/false|/usr/bin/false|/sbin/nologin|/usr/sbin/nologin)
-			return 0 ;;
-		*)
-			return 1 ;;
-	esac
-}



1.19                 eclass/portability.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/portability.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/portability.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/portability.eclass?r1=1.18&r2=1.19

Index: portability.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- portability.eclass	27 Oct 2011 07:16:08 -0000	1.18
+++ portability.eclass	31 Oct 2011 17:39:52 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.18 2011/10/27 07:16:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.19 2011/10/31 17:39:52 vapier Exp $
 #
 # Author: Diego Pettenò <flameeyes@g.o>
 #
@@ -8,8 +8,6 @@
 #
 # NB:  If you add anything, please comment it!
 
-inherit user
-
 # treecopy orig1 orig2 orig3 .... dest
 #
 # mimic cp --parents copy, but working on BSD userland as well
@@ -129,3 +127,8 @@
 		echo "${point// /\040} ${node// /\040} ${fs%% *} ${opts// /\040}"
 	done
 }
+
+_dead_portability_user_funcs() { die "if you really need this, please file a bug for base-system@g.o"; }
+egethome() { _dead_portability_user_funcs; }
+egetshell() { _dead_portability_user_funcs; }
+is-login-disabled() { _dead_portability_user_funcs; }