replace GNU only parameters of cp command (#103487) and remove old test version

(Portage version: 2.0.51.22-r2)

7 files changed, 17 insertions, 272 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index ebeceb88b5ec..42999c87f679 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.120 2005/08/24 23:30:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.121 2005/08/29 05:55:39 mrness Exp $
+
+  29 Aug 2005; Alin Nastac <mrness@gentoo.org> files/ip-up,
+  ppp-2.4.2-r12.ebuild, ppp-2.4.2-r15.ebuild, -ppp-2.4.3-r6.ebuild,
+  ppp-2.4.3-r8.ebuild:
+  Fix cp -a usage for Gentoo BSD (#103487) and remove old test version.
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org> ppp-2.4.2-r12.ebuild:
   stable on ia64
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r6 b/net-dialup/ppp/files/digest-ppp-2.4.3-r6
deleted file mode 100644
index 7e13042c0ec3..000000000000
--- a/net-dialup/ppp/files/digest-ppp-2.4.3-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
-MD5 2d414249802b9791117666a8a7b01370 ppp-2.4.3-patches-20050514.tar.gz 28072
-MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/files/ip-up b/net-dialup/ppp/files/ip-up
index 29719562096f..5dee00ad32d4 100644
--- a/net-dialup/ppp/files/ip-up
+++ b/net-dialup/ppp/files/ip-up
@@ -28,7 +28,7 @@ if [ "$USEPEERDNS" ]; then
 		} > $REALRESOLVCONF.tmp
 
 		# backup the old configuration and install the new one
-		cp -a $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
+		cp -dpP $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
 		mv $REALRESOLVCONF.tmp $REALRESOLVCONF
 
 		# correct permissions
diff --git a/net-dialup/ppp/ppp-2.4.2-r12.ebuild b/net-dialup/ppp/ppp-2.4.2-r12.ebuild
index ff1a3904b56a..ac8626259088 100644
--- a/net-dialup/ppp/ppp-2.4.2-r12.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r12.ebuild
@@ -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/net-dialup/ppp/ppp-2.4.2-r12.ebuild,v 1.7 2005/08/24 23:30:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r12.ebuild,v 1.8 2005/08/29 05:55:39 mrness Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -208,9 +208,9 @@ pkg_postinst() {
 	fi
 	#create *-secrets files if not exists
 	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
 	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
 
 	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
 	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
diff --git a/net-dialup/ppp/ppp-2.4.2-r15.ebuild b/net-dialup/ppp/ppp-2.4.2-r15.ebuild
index e422c246943c..2e7adb8c2d5d 100644
--- a/net-dialup/ppp/ppp-2.4.2-r15.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r15.ebuild
@@ -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/net-dialup/ppp/ppp-2.4.2-r15.ebuild,v 1.1 2005/07/29 12:35:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r15.ebuild,v 1.2 2005/08/29 05:55:39 mrness Exp $
 
 inherit eutils gnuconfig flag-o-matic linux-info
 
@@ -214,9 +214,9 @@ pkg_postinst() {
 	fi
 	#create *-secrets files if not exists
 	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
 	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
 
 	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
 	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
diff --git a/net-dialup/ppp/ppp-2.4.3-r6.ebuild b/net-dialup/ppp/ppp-2.4.3-r6.ebuild
deleted file mode 100644
index 199337f67108..000000000000
--- a/net-dialup/ppp/ppp-2.4.3-r6.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r6.ebuild,v 1.2 2005/07/07 00:27:03 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20050514.tar.gz
-	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="activefilter atm dhcp gtk ipv6 mppe-mppc pam radius"
-
-RDEPEND="virtual/libc
-	activefilter? ( virtual/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( sys-libs/pam )
-	gtk? ( =x11-libs/gtk+-1* )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if ! use radius; then
-		echo
-		ewarn "RADIUS plugins installation is now controled by radius useflag!"
-		ewarn "If you need them, hit Ctrl-C now!"
-		ebeep
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/patch/ppp_flags.patch
-	epatch ${WORKDIR}/patch/mpls.patch
-	epatch ${WORKDIR}/patch/killaddr-smarter.patch
-
-	epatch ${WORKDIR}/patch/upstream-fixes.patch
-	epatch ${WORKDIR}/patch/fix_activefilter.patch
-
-	use mppe-mppc && {
-		einfo "Enabling mppe-mppc support"
-		epatch ${WORKDIR}/patch/mppe-mppc-1.1.patch
-	}
-
-	use atm && {
-		einfo "Enabling PPPoATM support"
-		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" ${S}/pppd/plugins/pppoatm/Makefile.linux
-	}
-
-	use activefilter || {
-		einfo "Disabling active filter"
-		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
-	}
-
-	use pam && {
-		einfo "Enabling PAM"
-		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
-	}
-
-	use ipv6 && {
-		einfo "Enabling IPv6"
-		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
-	}
-
-	einfo "Enabling CBCP"
-	sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux
-
-	use dhcp && {
-		# copy the ppp-dhcp plugin files
-		einfo "Copying ppp-dhcp plugin files..."
-		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
-		sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux
-		sed -i -e "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
-		epatch ${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch
-	}
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		${S}/pppd/{pathnames.h,pppd.8} || die
-
-	find ${S} -type f -name Makefile.linux \
-		-exec sed -i -e '/^CC[[:space:]]*=/d' {} \;
-
-	use radius && {
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" ${S}/pppd/plugins/radius/etc/radiusclient.conf
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			${S}/pppd/plugins/radius/{*.8,*.c,*.h} \
-			${S}/pppd/plugins/radius/etc/*
-	}
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-	append-ldflags -Wl,-z,now
-	econf || die "configuration failed"
-	emake COPTS="${CFLAGS}" || die "compile failed"
-
-	#build pppgetpass
-	cd contrib/pppgetpass
-	if use gtk; then
-		emake -f Makefile.linux || die "failed to build pppgetpass"
-	else
-		emake pppgetpass.vt || die "failed to build pppgetpass"
-	fi
-}
-
-pkg_preinst() {
-	if use radius && [ -d ${ROOT}/etc/radiusclient ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
-		ebegin "Copy /etc/radiusclient to /etc/ppp/radius"
-		cp -ar ${ROOT}/etc/radiusclient ${ROOT}/etc/ppp/radius
-		eend $?
-	fi
-}
-
-src_install() {
-	local y
-	for y in chat pppd pppdump pppstats
-	do
-		doman ${y}/${y}.8
-		dosbin ${y}/${y}
-	done
-	chmod u+s-w ${D}/usr/sbin/pppd
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example
-	newins etc.ppp/chap-secrets chap-secrets.example
-
-	insopts -m0644
-	doins etc.ppp/options
-	doins ${FILESDIR}/options-pptp
-	doins ${FILESDIR}/options-pppoe
-	doins ${FILESDIR}/chat-default
-
-	insopts -m0755
-	doins ${FILESDIR}/ip-up
-	doins ${FILESDIR}/ip-down
-
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/net.ppp0
-
-	if use pam; then
-		insinto /etc/pam.d
-		insopts -m0644
-		newins pppd/ppp.pam ppp || die "not found ppp.pam"
-	fi
-
-	insinto /etc/conf.d
-	insopts -m0600
-	newins ${FILESDIR}/confd.ppp0 net.ppp0
-
-	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	#closing " for syntax coloring
-	dodir ${PLUGINS_DIR}
-	insinto ${PLUGINS_DIR}
-	insopts -m0755
-	doins pppd/plugins/minconn.so || die "minconn.so not build"
-	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
-	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
-	doins pppd/plugins/winbind.so || die "winbind.so not build"
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
-	if use atm; then
-		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
-	fi
-	if use dhcp; then
-		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
-	fi
-	if use radius; then
-		doins pppd/plugins/radius/radius.so || die "radius.so not build"
-		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
-		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-radius.8
-		doman pppd/plugins/radius/pppd-radattr.8
-	fi
-
-	insinto /etc/modules.d
-	insopts -m0644
-	newins ${FILESDIR}/modules.ppp ppp
-	if use mppe-mppc; then
-		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
-	fi
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc ${FILESDIR}/README.mpls
-	dohtml ${FILESDIR}/pppoe.html
-
-	dosbin scripts/pon
-	dosbin scripts/poff
-	dosbin scripts/plog
-	doman scripts/pon.1
-
-	# Adding misc. specialized scripts to doc dir
-	dodir /usr/share/doc/${PF}/scripts/chatchat
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/*
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/*
-
-	if use gtk; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/.devfsd ] && [ ! -e ${ROOT}/dev/.udev ] && [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-	if [ "$ROOT" = "/" ]; then
-		/sbin/update-modules
-	fi
-	#create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
-	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
-	ewarn "Pon, poff and plog scripts have been supplied for experienced users."
-	ewarn "New users or those requiring something more should have a look at"
-	ewarn "the /etc/init.d/net.ppp0 script."
-	ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
-	ewarn "/usr/share/doc/ppp*/scripts directory."
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options
-
-	if use radius && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
-		echo
-		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
-		ewarn "   /etc/radiusclient to /etc/ppp/radius."
-		einfo "For your convenience, radiusclient directory was copied to the new location."
-	fi
-}
diff --git a/net-dialup/ppp/ppp-2.4.3-r8.ebuild b/net-dialup/ppp/ppp-2.4.3-r8.ebuild
index 60496e9229c2..d5ae690cedc3 100644
--- a/net-dialup/ppp/ppp-2.4.3-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r8.ebuild
@@ -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/net-dialup/ppp/ppp-2.4.3-r8.ebuild,v 1.1 2005/07/29 12:35:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r8.ebuild,v 1.2 2005/08/29 05:55:39 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -121,7 +121,7 @@ src_compile() {
 pkg_preinst() {
 	if use radius && [ -d ${ROOT}/etc/radiusclient ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
 		ebegin "Copy /etc/radiusclient to /etc/ppp/radius"
-		cp -ar ${ROOT}/etc/radiusclient ${ROOT}/etc/ppp/radius
+		cp -pPR ${ROOT}/etc/radiusclient ${ROOT}/etc/ppp/radius
 		eend $?
 	fi
 }
@@ -237,9 +237,9 @@ pkg_postinst() {
 	fi
 	#create *-secrets files if not exists
 	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
 	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -a "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
 
 	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
 	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."