sys-devel/scratchbox: Added pkg_config() and removed some of the many einfos

svn path=/sunrise/; revision=428

3 files changed, 61 insertions, 29 deletions

diff --git a/sys-devel/scratchbox/ChangeLog b/sys-devel/scratchbox/ChangeLog
index dbe77f8de..e91b83ee3 100644
--- a/sys-devel/scratchbox/ChangeLog
+++ b/sys-devel/scratchbox/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jul 2006; Tiziano Müller <gentoo@dev-zero.ch> ChangeLog:
+  Added pkg_config() and removed some of the many einfos
+
   01 Jul 2006; Tiziano Müller <gentoo@dev-zero.ch> ChangeLog:
   New ebuild for bug 94225, thanks to Christian Hartmann for the initial
 
diff --git a/sys-devel/scratchbox/Manifest b/sys-devel/scratchbox/Manifest
index 844040b7c..fb2a8c6cc 100644
--- a/sys-devel/scratchbox/Manifest
+++ b/sys-devel/scratchbox/Manifest
@@ -4,14 +4,14 @@ RMD160 c0eac50c819e010fb87163b66b96fadb4ac41fc3 files/scratchbox.rc 529
 SHA256 9b0145bcb9a0256148afd7cef52f8e5eac0dfc721c7392b2f52dbf854d982ac7 files/scratchbox.rc 529
 DIST scratchbox-core-0.9.8.7.tar.gz 77021913 RMD160 f50050e98e9534b3c7745f3e89f9db3d6490694c SHA1 1eff87d0dda76919ca5605e6f6ba99f0efb6762b SHA256 f4a13a17b1d4a07e200b1323c2f7dc7a8f180f84e29a7f7cea7244d0b3fba4e1
 DIST scratchbox-libs-0.9.8.7.tar.gz 13670961 RMD160 a3f13065aee341243b005488f833f46e76955d93 SHA1 8091812434f6f6f0c5f3b647df43858cb8909bdf SHA256 42444908ba79ef9428117ed586026b6d6aed9d2e325bc55d194a2591d54b35d6
-EBUILD scratchbox-0.9.8.7.ebuild 2439 RMD160 62916ea29523a072b99895a397d35cc96d4793e1 SHA1 33874c3d620459c6d833e75c5ffbd271aa1927c2 SHA256 6c857b4b2190e5333e5660fb44a26494450274eb08e8f630b8bbb4ec491b3af0
-MD5 710f08f2b47ffda6ac061b74a64a539c scratchbox-0.9.8.7.ebuild 2439
-RMD160 62916ea29523a072b99895a397d35cc96d4793e1 scratchbox-0.9.8.7.ebuild 2439
-SHA256 6c857b4b2190e5333e5660fb44a26494450274eb08e8f630b8bbb4ec491b3af0 scratchbox-0.9.8.7.ebuild 2439
-MISC ChangeLog 258 RMD160 6f09186276ffcf81bf9abbedd00c4cdb83e0f64e SHA1 be116426619c95a843215184d1f84c05497c3263 SHA256 d4bbe9ec3f0a0a2bb0959113694c77fe2cded3e00d8f61c4ec0b327364edd96c
-MD5 120b33c36a09e83bf3333a68576acc2f ChangeLog 258
-RMD160 6f09186276ffcf81bf9abbedd00c4cdb83e0f64e ChangeLog 258
-SHA256 d4bbe9ec3f0a0a2bb0959113694c77fe2cded3e00d8f61c4ec0b327364edd96c ChangeLog 258
+EBUILD scratchbox-0.9.8.7.ebuild 3036 RMD160 9750208045e1d9a27cedb7fdf13ac6592ce496cb SHA1 79ac0a8a265c0a194f721df18ce51c23648f6744 SHA256 8b642f7a41113e91a81a4b4f3343d1a317cf25f462fe52078c4872e9f93500c7
+MD5 32bbf28e96d4c7e872ae5c319f42c687 scratchbox-0.9.8.7.ebuild 3036
+RMD160 9750208045e1d9a27cedb7fdf13ac6592ce496cb scratchbox-0.9.8.7.ebuild 3036
+SHA256 8b642f7a41113e91a81a4b4f3343d1a317cf25f462fe52078c4872e9f93500c7 scratchbox-0.9.8.7.ebuild 3036
+MISC ChangeLog 379 RMD160 a2e77774aad6f7fd31f8d95b44eab6b768cacd5c SHA1 bcf2402bb117eefd27fc9f7c14a93af4fc4a242d SHA256 b0dc4d7b5236becc14d1ffe12d11483e3673f330745dd6db03d1eee0b49d04a9
+MD5 63f887d44c594cde8d2463221e9c02cb ChangeLog 379
+RMD160 a2e77774aad6f7fd31f8d95b44eab6b768cacd5c ChangeLog 379
+SHA256 b0dc4d7b5236becc14d1ffe12d11483e3673f330745dd6db03d1eee0b49d04a9 ChangeLog 379
 MD5 fa150dd7d88329f19bae6a2ff60c7b09 files/digest-scratchbox-0.9.8.7 554
 RMD160 4548b3d3c4ef5556f096d819b044a23c5b1abb94 files/digest-scratchbox-0.9.8.7 554
 SHA256 03052faec2892245c5284b0d6d1f85c9904470f5a2c81455291ddffbfd96f9d6 files/digest-scratchbox-0.9.8.7 554
diff --git a/sys-devel/scratchbox/scratchbox-0.9.8.7.ebuild b/sys-devel/scratchbox/scratchbox-0.9.8.7.ebuild
index d3e781ffe..56f86f17c 100644
--- a/sys-devel/scratchbox/scratchbox-0.9.8.7.ebuild
+++ b/sys-devel/scratchbox/scratchbox-0.9.8.7.ebuild
@@ -26,11 +26,6 @@ TARGET_DIR="/opt/scratchbox"
 
 S=${WORKDIR}/scratchbox
 
-pkg_setup() {
-	einfo "Creating group sbox"
-	enewgroup "${SBOX_GROUP}"
-}
-
 src_install() {
 	cd "${S}"
 	dodir ${TARGET_DIR}
@@ -41,14 +36,20 @@ src_install() {
 	# scratchbox service loader
 	newinitd "${FILESDIR}/scratchbox.rc" scratchbox || die "newinitd failed"
 
+	# group already created
+	echo ${SBOX_GROUP} > "${D}/${TARGET_DIR}/.run_me_first_done"
+}
+
+pkg_preinst() {
+	einfo "Creating group sbox"
+	enewgroup "${SBOX_GROUP}" || die "adding group '${SBOX_GROUP}' failed"
 }
 
 pkg_postinst() {
 	einfo
-	einfo "You need to run /opt/scratchbox/run_me_first.sh to complete the install."
-	einfo
-	einfo "Do not forget to create a scratchbox user:"
-	einfo "/opt/scratchbox/sbin/sbox_adduser <user>"
+	einfo "You need to run:"
+	einfo "\"emerge --config =${CATEGORY}/${PF}\""
+	einfo "to set permissions right and setup scratchbox and users"
 	einfo
 	einfo "For further documentation about how to setup"
 	einfo "scratchbox for your development needs have a look at"
@@ -62,18 +63,6 @@ pkg_postinst() {
 	einfo
 	einfo "Type /opt/scratchbox/login to start scratchbox."
 	einfo
-
-	ewarn
-	ewarn "Remember, in order to run scratchbox, you have to"
-	ewarn "be in the '${SBOX_GROUP}' group."
-	ewarn
-
-	ewarn
-	ewarn "For scratchbox to work, you have to set the following files to suid root (chmod u+s FILE):"
-	ewarn " - /opt/scratchbox/sbin/chroot-uid"
-	ewarn " - /opt/scratchbox/compilers/host-gcc/usr/libexec/pt_chown"
-	ewarn "Please note that this could be a security risk and should not be done when security is a concern"
-	ewarn
 }
 
 pkg_postrm() {
@@ -83,3 +72,43 @@ pkg_postrm() {
 	einfo
 }
 
+pkg_config() {
+	if [ `id -u` != "0" ]; then
+		ewarn "Must be root to run this"
+		die "not root"
+	fi
+
+	einfo "Do you want to configure scratchbox? [Yes/No]"
+	einfo "Note: This will set permissions and copy files from the system into the scratchbox"
+	read choice
+	echo
+	case "$choice" in
+		y*|Y*|"")
+			source "${TARGET_DIR}/sbin/sbox_configure" "no" ${SBOX_GROUP} || die "sbox_configure failed"
+			;;
+		*)
+			;;
+	esac
+
+	mkdir -p "${TARGET_DIR}/scratchbox/users"
+
+	while true; do
+		einfo "Existing users:"
+		einfo $(ls "${TARGET_DIR}/users")
+		echo
+
+		einfo "Create new user (leaf empty to skip): "
+		read newuser
+		case "$newuser" in
+			"")
+				break;
+				;;
+			*)
+				einfo "Note: users have to be in the '${SBOX_GROUP}' to be able to login into the scratchbox"
+				"${TARGET_DIR}/sbin/sbox_adduser" ${newuser} || die "sbox_adduser failed"
+				;;
+		esac
+	done
+
+	einfo "Configuration finished. Make sure you run '/etc/init.d/scratchbox start' before logging in."
+}