baselayout takeover

6 files changed, 11 insertions, 220 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 7f4adf51be35..3851017d9511 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.21 2003/04/24 18:08:57 killian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.22 2003/05/23 05:39:17 killian Exp $
+
+*ppp-2.4.1-r12 (22 May 2003)
+ 
+  22 May 2003; Chuck Brewer <killian@gentoo.org> ppp-2.4.1-r12.ebuild:
+  Added stuff from baselayout to be provided by the ppp package, i.e.
+  net.ppp0,conf.d/net.ppp0 and chat-default
 
 *ppp-2.4.1-r13 (24 Apr 2003)
   
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 1422115e02fc..7fe516fa8025 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,14 +1,11 @@
-MD5 c4f3e78acb7a54206a9fa34c36a8ca3a ChangeLog 3612
-MD5 dfc91d424e9fe03a334fc08cee8e1c4e ppp-2.4.1-r10.ebuild 2826
+MD5 14582298a71322b15e6181e37def287b ChangeLog 3829
 MD5 0ed8d8e9cf25b5a4816b39a086f727f4 ppp-2.4.1-r11.ebuild 3126
 MD5 e82e7badfed3b07e43e9e24350ac27f1 ppp-2.4.1-r12.ebuild 3914
-MD5 5f49f4e2f19dfe6bf81fe65f9065bdf2 ppp-2.4.1-r9.ebuild 2777
 MD5 303dde8eb9f6cba4ceec5bae7981869a ppp-2.4.1-r13.ebuild 4519
-MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r10 65
+MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r11 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r12 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r13 65
-MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r9 65
 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
@@ -21,3 +18,5 @@ MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz
 MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
 MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
+MD5 c0a3fbe6a293dc2ee14fbd809950ee09 files/net.ppp0 4658
+MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.1-r10 b/net-dialup/ppp/files/digest-ppp-2.4.1-r10
deleted file mode 100644
index b3c7b1676065..000000000000
--- a/net-dialup/ppp/files/digest-ppp-2.4.1-r10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f655448fbb6bebcede7a515fbcd481e ppp-2.4.1-pppoe4.tgz 556218
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.1-r9 b/net-dialup/ppp/files/digest-ppp-2.4.1-r9
deleted file mode 100644
index b3c7b1676065..000000000000
--- a/net-dialup/ppp/files/digest-ppp-2.4.1-r9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f655448fbb6bebcede7a515fbcd481e ppp-2.4.1-pppoe4.tgz 556218
diff --git a/net-dialup/ppp/ppp-2.4.1-r10.ebuild b/net-dialup/ppp/ppp-2.4.1-r10.ebuild
deleted file mode 100644
index 43775da5fdf5..000000000000
--- a/net-dialup/ppp/ppp-2.4.1-r10.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r10.ebuild,v 1.6 2003/02/28 16:55:00 liquidx Exp $
-
-S=${WORKDIR}/${P}.pppoe4
-DESCRIPTION="Point-to-point protocol - patched for pppoe"
-SRC_URI="http://www.shoshin.uwaterloo.ca/~mostrows/${P}-pppoe4.tgz"
-HOMEPAGE="http://www.samba.org/ppp"
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/pppd"
-
-SLOT="0"
-LICENSE="BSD GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-src_compile() {
-
-    use crypt && {
-		zcat ${FILESDIR}/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz | patch -p1
-		patch -p1 < ${FILESDIR}/ppp-2.4.1-MSCHAPv2-fix.patch
-	}
-
-	patch -p0 < ${FILESDIR}/${P}-r10.patch
-
-	./configure --prefix=/usr || die
-    
-	#fix Makefiles to compile optimized
-	cd pppd
-	mv Makefile Makefile.orig
-	sed -e "s:COPTS = -O2 -pipe -Wall -g:COPTS = ${CFLAGS}:" \
-		-e "s/LIBS =/LIBS = -lcrypt/" \
-		Makefile.orig > Makefile
-	cd plugins
-	mv Makefile Makefile.orig
-	sed -e "s:CFLAGS\t= -g -O2:CFLAGS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-	cd pppoe
-	mv Makefile Makefile.orig
-	sed -e "s:CFLAGS\t= -g :CFLAGS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-	cd ../../../pppstats
-	mv Makefile Makefile.orig
-	sed -e "s:COPTS= -O:COPTS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-	cd ../chat
-	mv Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-	cd ../pppdump
-	mv Makefile Makefile.orig
-	sed -e "s:CFLAGS= -O:CFLAGS= ${CFLAGS}:" Makefile.orig > Makefile
-	cd ..
-    
-	export CC=gcc
-    
-	emake || die
-}
-
-src_install() {
-	for y in chat pppd pppdump pppstats
-	do
-		doman ${y}/${y}.8
-		dosbin ${y}/${y}
-	done
-    
-	chmod u+s-w ${D}/usr/sbin/pppd
-	chown root:daemon ${D}/usr/sbin/pppstats
-    
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
-	insopts -m0644
-	doins etc.ppp/options
-
-	dolib.so pppd/plugins/minconn.so
-	dolib.so pppd/plugins/passprompt.so
-	dolib.so pppd/plugins/pppoe/pppoe.so
-	dodir /usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	mv ${D}/usr/lib/*.so ${D}/usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	insinto /etc/modules.d
-	newins ${FILESDIR}/modules.ppp ppp
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dohtml ${FILESDIR}/pppoe.html
-
-# This will have to be updated to work with the new net.ppp0	
-#	# Added a couple scripts to simplify dialing up
-#	# borrowed from debian, man they got some nice little apps :-)
-#	dosbin ${FILESDIR}/pon
-#	dosbin ${FILESDIR}/poff
-#	doman  ${FILESDIR}/pon.1
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}dev/.devfsd ]
-	then
-		if [ ! -e ${ROOT}dev/ppp ]; then
-			mknod ${ROOT}dev/ppp c 108 0
-		fi
-	fi
-	if [ "$ROOT" = "/" ]
-	then
-		/usr/sbin/update-modules
-	fi
-	einfo "to enable kernel-pppoe read html/pppoe.html in the doc-directory"
-}
diff --git a/net-dialup/ppp/ppp-2.4.1-r9.ebuild b/net-dialup/ppp/ppp-2.4.1-r9.ebuild
deleted file mode 100644
index 433a75e36148..000000000000
--- a/net-dialup/ppp/ppp-2.4.1-r9.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r9.ebuild,v 1.8 2003/02/28 16:55:00 liquidx Exp $
-
-S=${WORKDIR}/${P}.pppoe4
-DESCRIPTION="Point-to-point protocol - patched for pppoe"
-SRC_URI="http://www.shoshin.uwaterloo.ca/~mostrows/${P}-pppoe4.tgz"
-HOMEPAGE="http://www.samba.org/ppp"
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/pppd"
-
-SLOT="0"
-LICENSE="BSD GPL-2"
-KEYWORDS="x86 ppc"
-
-src_compile() {
-
-    use crypt && {
-		zcat ${FILESDIR}/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz | patch -p1
-		patch -p1 < ${FILESDIR}/ppp-2.4.1-MSCHAPv2-fix.patch
-	}
-
-	./configure --prefix=/usr || die
-    
-	#fix Makefiles to compile optimized
-	cd pppd
-	mv Makefile Makefile.orig
-	sed -e "s:COPTS = -O2 -pipe -Wall -g:COPTS = ${CFLAGS}:" \
-		-e "s/LIBS =/LIBS = -lcrypt/" \
-		Makefile.orig > Makefile
-	cd plugins
-	mv Makefile Makefile.orig
-	sed -e "s:CFLAGS\t= -g -O2:CFLAGS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-	cd pppoe
-	mv Makefile Makefile.orig
-	sed -e "s:CFLAGS\t= -g :CFLAGS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-	cd ../../../pppstats
-	mv Makefile Makefile.orig
-	sed -e "s:COPTS= -O:COPTS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-	cd ../chat
-	mv Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-	cd ../pppdump
-	mv Makefile Makefile.orig
-	sed -e "s:CFLAGS= -O:CFLAGS= ${CFLAGS}:" Makefile.orig > Makefile
-	cd ..
-    
-	export CC=gcc
-    
-	emake || die
-}
-
-src_install() {
-	for y in chat pppd pppdump pppstats
-	do
-		doman ${y}/${y}.8
-		dosbin ${y}/${y}
-	done
-    
-	chmod u+s-w ${D}/usr/sbin/pppd
-	chown root:daemon ${D}/usr/sbin/pppstats
-    
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
-	insopts -m0644
-	doins etc.ppp/options
-
-	dolib.so pppd/plugins/minconn.so
-	dolib.so pppd/plugins/passprompt.so
-	dolib.so pppd/plugins/pppoe/pppoe.so
-	dodir /usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	mv ${D}/usr/lib/*.so ${D}/usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	insinto /etc/modules.d
-	newins ${FILESDIR}/modules.ppp ppp
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dohtml ${FILESDIR}/pppoe.html
-
-# This will have to be updated to work with the new net.ppp0	
-#	# Added a couple scripts to simplify dialing up
-#	# borrowed from debian, man they got some nice little apps :-)
-#	dosbin ${FILESDIR}/pon
-#	dosbin ${FILESDIR}/poff
-#	doman  ${FILESDIR}/pon.1
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}dev/.devfsd ]
-	then
-		if [ ! -e ${ROOT}dev/ppp ]; then
-			mknod ${ROOT}dev/ppp c 108 0
-		fi
-	fi
-	if [ "$ROOT" = "/" ]
-	then
-		/usr/sbin/update-modules
-	fi
-	einfo "to enable kernel-pppoe read html/pppoe.html in the doc-directory"
-}