Remove the ppp stuff, as they now ship with net-dialup/ppp.

4 files changed, 16 insertions, 30 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 7632fa72d987..c11110052766 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.83 2003/07/06 18:05:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.84 2003/07/15 20:03:45 azarah Exp $
 
+  15 Jul 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.9.ebuild,
+  baselayout-1.8.6.7.ebuild, baselayout-1.8.6.8-r1.ebuild:
+  Remove the ppp stuff, as they now ship with net-dialup/ppp.
 
 *baselayout-1.8.6.8-r1 (21 May 2003)
 
diff --git a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild b/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
index 227ef2e29e39..8f64ac046537 100644
--- a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.9.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.9.ebuild,v 1.4 2003/07/15 20:03:45 azarah Exp $
 
 IUSE="bootstrap build"
 
@@ -318,14 +318,6 @@ src_install() {
 	do
 		[ -f ${foo} ] && doins ${foo}
 	done
-	# /etc/conf.d/net.ppp* should only be readible by root
-	chmod 0600 ${D}/etc/conf.d/net.ppp*
-
-	# This seems the best place for templates .. any ideas ?
-	# NB: if we move this, then $TEMPLATEDIR in net.ppp0 need to be updated as well
-	keepdir /etc/ppp
-	insinto /etc/ppp
-	doins ${S}/etc/ppp/chat-default
 
 	dodir /etc/init.d
 	exeinto /etc/init.d
@@ -333,8 +325,9 @@ src_install() {
 	do
 		[ -f ${foo} ] && doexe ${foo}
 	done
-	# /etc/init.d/net.ppp* should only be readible by root
-	#chmod 0600 ${D}/etc/init.d/net.ppp*
+
+	# Now ships with net-dialup/ppp ...
+	rm -f ${D}/etc/{conf,init}.d/net.ppp*
 
 	# These moved from /etc/init.d/ to /sbin to help newb systems
 	# from breaking
diff --git a/sys-apps/baselayout/baselayout-1.8.6.7.ebuild b/sys-apps/baselayout/baselayout-1.8.6.7.ebuild
index e23079a6f599..4b96af87a70a 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.7.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.7.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.7.ebuild,v 1.4 2003/07/15 20:03:45 azarah Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -392,14 +392,9 @@ src_install() {
 	do
 		[ -f ${foo} ] && doins ${foo}
 	done
-	# /etc/conf.d/net.ppp* should only be readible by root
-	chmod 0600 ${D}/etc/conf.d/net.ppp*
-
-	# This seems the best place for templates .. any ideas ?
-	# NB: if we move this, then $TEMPLATEDIR in net.ppp0 need to be updated as well
-	keepdir /etc/ppp
-	insinto /etc/ppp
-	doins ${S}/etc/ppp/chat-default
+
+	# Now ships with net-dialup/ppp ...
+	rm -f ${D}/etc/{conf,init}.d/net.ppp* 
 
 	dodir /etc/skel
 	insinto /etc/skel
diff --git a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
index 3a2a743711ea..72194dcb6fb9 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.6 2003/07/06 18:05:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.7 2003/07/15 20:03:46 azarah Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -389,14 +389,9 @@ src_install() {
 	do
 		[ -f ${foo} ] && doins ${foo}
 	done
-	# /etc/conf.d/net.ppp* should only be readible by root
-	chmod 0600 ${D}/etc/conf.d/net.ppp*
-
-	# This seems the best place for templates .. any ideas ?
-	# NB: if we move this, then $TEMPLATEDIR in net.ppp0 need to be updated as well
-	keepdir /etc/ppp
-	insinto /etc/ppp
-	doins ${S}/etc/ppp/chat-default
+
+	# Now ships with net-dialup/ppp ...
+	rm -f ${D}/etc/{conf,init}.d/net.ppp* 
 
 	dodir /etc/skel
 	insinto /etc/skel