Removed useradd from pkg_setup.

6 files changed, 12 insertions, 123 deletions

diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog
index 5d0458d19b4e..2d3c8004c255 100644
--- a/net-misc/scponly/ChangeLog
+++ b/net-misc/scponly/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/scponly
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.9 2004/07/02 20:47:49 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.10 2004/07/28 00:00:29 matsuu Exp $
+
+*scponly-3.11-r2 (28 Jul 2004)
+
+  28 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> -scponly-3.11-r1.ebuild,
+  +scponly-3.11-r2.ebuild, -scponly-3.11.ebuild:
+  Removed useradd from pkg_config. Bug 58526.
 
 *scponly-3.11-r1 (03 Jul 2004)
 
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index f60ae16adc36..d7baa9aa1be9 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,10 +1,8 @@
 MD5 4c0e5e6765db5367ecffdaa809a55c86 scponly-3.7.ebuild 909
-MD5 ed3d18b85381ff6733cdcdddc7790551 scponly-3.11-r1.ebuild 3314
 MD5 285567ca00abeba096e380b6c1b31345 scponly-3.8.ebuild 916
-MD5 53004b75039f4e23c712e2f5ad2836e5 ChangeLog 1350
+MD5 ea144643bd075f53512673f8fe1573f9 scponly-3.11-r2.ebuild 3144
+MD5 4788c0fbdb490d48580f792a5b2af2a2 ChangeLog 1553
 MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
-MD5 6b0e8454fc1fbffb2ee6637cb59eb607 scponly-3.11.ebuild 3136
-MD5 e4d07123d938d81c26fa0f70de4b6a8d files/digest-scponly-3.11-r1 60
+MD5 e4d07123d938d81c26fa0f70de4b6a8d files/digest-scponly-3.11-r2 60
 MD5 7f3245890a81d9e6c8e271517fa8b3ad files/digest-scponly-3.7 59
 MD5 f0dc17e8e5f9acc8a7173578e9a8b560 files/digest-scponly-3.8 59
-MD5 e4d07123d938d81c26fa0f70de4b6a8d files/digest-scponly-3.11 60
diff --git a/net-misc/scponly/files/digest-scponly-3.11-r1 b/net-misc/scponly/files/digest-scponly-3.11-r1
deleted file mode 100644
index 113a28e00a9b..000000000000
--- a/net-misc/scponly/files/digest-scponly-3.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdbbc570c2bf3cad33ecf66d0af41372 scponly-3.11.tgz 83767
diff --git a/net-misc/scponly/files/digest-scponly-3.11 b/net-misc/scponly/files/digest-scponly-3.11-r2
index 113a28e00a9b..113a28e00a9b 100644
--- a/net-misc/scponly/files/digest-scponly-3.11
+++ b/net-misc/scponly/files/digest-scponly-3.11-r2
diff --git a/net-misc/scponly/scponly-3.11-r1.ebuild b/net-misc/scponly/scponly-3.11-r2.ebuild
index 98483df6a915..8a1981505f8d 100644
--- a/net-misc/scponly/scponly-3.11-r1.ebuild
+++ b/net-misc/scponly/scponly-3.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-3.11-r1.ebuild,v 1.1 2004/07/02 20:47:49 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-3.11-r2.ebuild,v 1.1 2004/07/28 00:00:29 matsuu Exp $
 
 inherit eutils
 
@@ -37,13 +37,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild /var/db/pkg/net-misc/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial database environment."
-}
-
-pkg_config() {
-	# pkg_config is based on ${S}/setup_chroot.sh.
+	# pkg_postinst is based on ${S}/setup_chroot.sh.
 
 	local myuser="scponly"
 	local myhome="/home/${myuser}"
diff --git a/net-misc/scponly/scponly-3.11.ebuild b/net-misc/scponly/scponly-3.11.ebuild
deleted file mode 100644
index a15026f40085..000000000000
--- a/net-misc/scponly/scponly-3.11.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-3.11.ebuild,v 1.5 2004/07/01 21:50:46 squinky86 Exp $
-
-inherit eutils
-
-DESCRIPTION="A tiny psuedoshell which only permits scp and sftp"
-SRC_URI="http://www.sublimation.org/scponly/${P}.tgz"
-HOMEPAGE="http://www.sublimation.org/scponly/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	net-misc/openssh"
-
-src_compile() {
-	PATH="${PATH}:/usr/lib/misc" ./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--enable-rsync-compat \
-		--enable-chrooted-binary \
-		|| die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		CONFDIR=${D}/etc/scponly \
-		install || die
-
-	dodoc AUTHOR CHANGELOG CONTRIB README TODO
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild /var/db/pkg/net-misc/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial database environment."
-}
-
-pkg_config() {
-	# pkg_config is based on ${S}/setup_chroot.sh.
-
-	local myuser="scponly"
-	local myhome="/home/${myuser}"
-
-	einfo "Updating /etc/shells"
-	{ grep -v "^/usr/bin/scponly$" /etc/shells;
-	echo "/usr/bin/scponly"
-	} > ${T}/shells
-	mv -f ${T}/shells /etc/shells
-
-	BINARIES="/usr/lib/misc/sftp-server /bin/ls /usr/bin/scp /bin/rm /bin/ln /bin/mv /bin/chmod /bin/chown /bin/chgrp /bin/mkdir /bin/rmdir /bin/pwd /bin/groups /usr/bin/ld /bin/echo /usr/bin/rsync"
-	LIB_LIST=`/usr/bin/ldd $BINARIES 2> /dev/null | /bin/cut -f2 -d\> | /bin/cut -f1 -d\( | /bin/grep "^ " | /bin/sort -u`
-	LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1"
-	for lib in $LDSO_LIST; do
-		if [ -f $lib ]; then
-			LIB_LIST="$LIB_LIST $lib"
-		fi
-	done
-	/bin/ls /lib/libnss_compat* > /dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		LIB_LIST="$LIB_LIST /lib/libnss_compat*"
-	fi
-
-	ldconfig
-	LIB_LIST="$LIB_LIST /etc/ld.so.cache /etc/ld.so.conf"
-
-	enewgroup ${myuser}
-	enewuser ${myuser} -1 /usr/sbin/scponlyc ${myhome} ${myuser}
-	if [ ! -d ${myhome} ]; then
-		/bin/install -c -d ${myhome}
-		/bin/chmod 755 ${myhome}
-	fi
-	if [ ! -d ${myhome} ]; then
-		/bin/install -c -d ${myhome}/etc
-		/bin/chown 0:0 ${myhome}/etc
-		/bin/chmod 755 ${myhome}/etc
-	fi
-	for bin in $BINARIES; do
-		/bin/install -c -d ${myhome}/`/bin/dirname $bin`
-		/bin/install -c $bin ${myhome}/$bin
-	done
-	for lib in $LIB_LIST; do
-		/bin/install -c -d ${myhome}/`/bin/dirname $lib`
-		/bin/install -c $lib ${myhome}/$lib
-	done
-
-	/bin/chown 0:0 ${myhome}
-	if [ -d ${myhome}/.ssh ]; then
-		/bin/chown 0:0 ${myhome}/.ssh
-	fi
-
-	if [ ! -d ${myhome}/incoming ]; then
-		einfo "creating ${myhome}/incoming directory for uploading files"
-		/bin/install -c -o ${myuser} -d ${myhome}/incoming
-	fi
-	/bin/chown $myuser:$myuser ${myhome}/incoming
-
-	einfo ""
-	einfo "if you experience a warning with winscp regarding groups, please install"
-	einfo "the provided hacked out fake groups program into your chroot, like so:"
-	einfo "cp groups ${myhome}/bin/groups"
-}