Fixed keywording, restored -r5 which was incorrectly removed

Package-Manager: portage-2.0.51.22-r1

5 files changed, 76 insertions, 6 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 1ba8a4b59f83..6c1e96be01b1 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.44 2005/07/10 10:02:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.45 2005/07/10 10:07:03 uberlord Exp $
 
 *dhcpcd-1.3.22_p4-r11 (10 Jul 2005)
 
   10 Jul 2005; Roy Marples <uberlord@gentoo.org>
-  +files/dhcpcd-1.3.22_p4-security.patch, -dhcpcd-1.3.22_p4-r5.ebuild,
+  +files/dhcpcd-1.3.22_p4-security.patch, 
   +dhcpcd-1.3.22_p4-r12.ebuild, -dhcpcd-1.3.22_p4-r7.ebuild,
   -dhcpcd-1.3.22_p4-r9.ebuild, -dhcpcd-1.3.22_p4-r10.ebuild,
   +dhcpcd-1.3.22_p4-r11.ebuild:
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index cf4ceee93005..0a966efd4229 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,9 +1,11 @@
-MD5 357f1a4753ffe320e39130fc93fac6a6 ChangeLog 8167
+MD5 6fbbdb8a3dfb1d323229fdd21cbbcb23 dhcpcd-1.3.22_p4-r5.ebuild 1944
+MD5 5d4ab1f959b8865f369ff8c071e73acf ChangeLog 8139
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
-MD5 5e3e719d18a21fda83acfdfe451bbee2 dhcpcd-1.3.22_p4-r11.ebuild 2032
+MD5 cd29f81719c9df1ca190cec0388249f3 dhcpcd-1.3.22_p4-r11.ebuild 2043
 MD5 1e416fa7f47ae134ef45e0c4eee4b425 dhcpcd-1.3.22_p4-r12.ebuild 2846
 MD5 ad580fb02fc1fa72a24fb3c952491bce files/dhcpcd-1.3.22_p4-routemetric.patch 4652
 MD5 daaf0c8fa44a481c8943f585ff870714 files/digest-dhcpcd-1.3.22_p4-r12 224
+MD5 daaf0c8fa44a481c8943f585ff870714 files/digest-dhcpcd-1.3.22_p4-r5 224
 MD5 e0bb9c921a368634a1e4f77c975c4726 files/dhcpcd-1.3.22_p4-security.patch 340
 MD5 be85439617940623ae04f72797bbf3e4 files/dhcpcd-1.3.22_p4-gentoo-config.patch 11908
 MD5 34b2bd2c58141701c8ba5279c6669e0c files/dhcpcd-1.3.22_p4-optionFQDN.patch 17381
diff --git a/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r11.ebuild b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r11.ebuild
index e9141c5a53bb..2c5d9b0081ab 100644
--- a/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r11.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r11.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-misc/dhcpcd/dhcpcd-1.3.22_p4-r11.ebuild,v 1.1 2005/07/10 10:02:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r11.ebuild,v 1.2 2005/07/10 10:07:03 uberlord Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.phystech.com/pub/${P/_p/-pl}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="build static"
 
 DEPEND="virtual/libc"
diff --git a/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild
new file mode 100644
index 000000000000..9809ac12e2d3
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild,v 1.15 2005/07/10 10:07:03 uberlord Exp $
+
+inherit gnuconfig flag-o-matic eutils
+
+DESCRIPTION="A dhcp client only"
+HOMEPAGE="http://www.phystech.com/download/"
+SRC_URI="ftp://ftp.phystech.com/pub/${P/_p/-pl}.tar.gz
+	http://dev.gentoo.org/~drobbins/${P}.diff.bz2
+	http://dev.gentoo.org/~drobbins/${P}-keepCacheAndResolv.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="build static"
+
+DEPEND="virtual/libc"
+PROVIDE="virtual/dhcpc"
+
+S=${WORKDIR}/${P/_p/-pl}
+
+src_unpack() {
+	unpack ${A}
+	gnuconfig_update
+
+	cd ${S}
+	#Started working on this patch from an older version I found; then
+	#discovered that LFS had an updated one. We're using a patch that is
+	#identical to theirs. It makes dhcpcd FHS-compliant. (drobbins, 06
+	#Sep 2003)
+	epatch ${DISTDIR}/${P}.diff.bz2
+	#This next patch from Alwyn Schoeman <alwyn@smart.com.ph> is great;
+	#it adds a -z (shutdown, keep cache) and various other little tweaks.
+	#See http://bugs.gentoo.org/show_bug.cgi?id=23428 for more info.
+	epatch ${DISTDIR}/${P}-keepCacheAndResolv.diff.bz2
+	#This patch remove the iface down instruction from dhcpcd allowing us
+	#to have physical iface scripts (gmsoft, 11 Nov 2003)
+	epatch ${FILESDIR}/${P}-no-iface-down.diff
+	#remove hard-coded arch stuff (drobbins, 06 Sep 2003)
+	sed -i "s/ -march=i.86//g" configure
+	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' dhcpconfig.c
+}
+
+src_compile() {
+	use static && append-flags -static
+
+	./configure \
+		--prefix="" \
+		--sysconfdir=/var/lib \
+		--mandir=/usr/share/man || die
+
+	emake || die
+}
+
+src_install() {
+	einstall sbindir=${D}/sbin || die "Install failed"
+	rmdir ${D}/etc/dhcpc
+	if ! use build
+	then
+		dodoc AUTHORS ChangeLog NEWS README
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-1.3.22_p4-r5 b/net-misc/dhcpcd/files/digest-dhcpcd-1.3.22_p4-r5
new file mode 100644
index 000000000000..80b4247cc65e
--- /dev/null
+++ b/net-misc/dhcpcd/files/digest-dhcpcd-1.3.22_p4-r5
@@ -0,0 +1,3 @@
+MD5 dd627a121e43835bead3ffef5b1a72fd dhcpcd-1.3.22-pl4.tar.gz 148455
+MD5 0960ef5d5070da205ffacd5107492e36 dhcpcd-1.3.22_p4.diff.bz2 1646
+MD5 6a502cc0c572f898f8ba5daa34c37901 dhcpcd-1.3.22_p4-keepCacheAndResolv.diff.bz2 1800