Adding patch to make tcpd optional. Closes #22506.

5 files changed, 49 insertions, 8 deletions

diff --git a/sys-apps/quota/Manifest b/sys-apps/quota/Manifest
index 9245a65cce2a..395f3cf4d06a 100644
--- a/sys-apps/quota/Manifest
+++ b/sys-apps/quota/Manifest
@@ -1,9 +1,7 @@
-MD5 7331426a39a3c5ed1b2efb4429b9fddb ChangeLog 2463
-MD5 ff4e8fb5530fca19a576fdc64d55aed4 quota-3.06-r1.ebuild 884
-MD5 94868f12ceba1aa39409e56495e69d5c quota-3.06.ebuild 820
-MD5 bc78b636a0841a90ef25afdfeb393642 attachment.cgi?id=19575 468
-MD5 ac50b4dff1c5f0d83b0d191ca0c2ec47 quota-3.06-r2.ebuild 1016
-MD5 ff4e8fb5530fca19a576fdc64d55aed4 quota-3.06-r2.ebuild.orig 884
+MD5 f42449bbad338edc692743bb986360a0 ChangeLog 2740
+MD5 4668abbe04d7918e598bb9b21c831155 quota-3.06-r1.ebuild 884
+MD5 bccad1fe62cc1ac9e1828e8dc992b798 quota-3.06.ebuild 820
+MD5 74a2d1eb7bc4c80c178d2b5bdaaf3aea quota-3.06-r2.ebuild 1016
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06 62
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r1 62
 MD5 a26d206672c294341ce1ebed4acc45b1 files/quota.rc 441
diff --git a/sys-apps/quota/files/digest-quota-3.06-r2 b/sys-apps/quota/files/digest-quota-3.06-r2
new file mode 100644
index 000000000000..ec34953cbbfb
--- /dev/null
+++ b/sys-apps/quota/files/digest-quota-3.06-r2
@@ -0,0 +1 @@
+MD5 13b6a46c61b35fe1c78ab9050cb4e463 quota-3.06.tar.gz 183559
diff --git a/sys-apps/quota/quota-3.06-r1.ebuild b/sys-apps/quota/quota-3.06-r1.ebuild
index 23b815d8cbb5..7746a43d866b 100644
--- a/sys-apps/quota/quota-3.06-r1.ebuild
+++ b/sys-apps/quota/quota-3.06-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r1.ebuild,v 1.6 2003/09/09 09:43:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r1.ebuild,v 1.7 2003/10/28 12:55:56 mholzer Exp $
 
 IUSE="nls"
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
 SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"
diff --git a/sys-apps/quota/quota-3.06-r2.ebuild b/sys-apps/quota/quota-3.06-r2.ebuild
new file mode 100644
index 000000000000..293406ae6c5d
--- /dev/null
+++ b/sys-apps/quota/quota-3.06-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r2.ebuild,v 1.1 2003/10/28 12:55:56 mholzer Exp $
+
+IUSE="nls"
+
+S=${WORKDIR}/quota-tools
+DESCRIPTION="Linux quota tools"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+RESTRICT="nomirror"
+HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+
+DEPEND="virtual/glibc
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+src_compile() {
+	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
+	econf || die
+	emake || die
+}
+
+src_install() {
+	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,2,3,8}}
+	make ROOTDIR=${D} install || die
+#	install -m 644 warnquota.conf ${D}/etc
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+	dodoc doc/*
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/quota.rc quota
+
+	# NLS bloat reduction
+	use nls || rm -rf ${D}/usr/share/locale
+}
diff --git a/sys-apps/quota/quota-3.06.ebuild b/sys-apps/quota/quota-3.06.ebuild
index 05defcc348bb..411d60a190d5 100644
--- a/sys-apps/quota/quota-3.06.ebuild
+++ b/sys-apps/quota/quota-3.06.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06.ebuild,v 1.10 2003/09/09 09:43:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06.ebuild,v 1.11 2003/10/28 12:55:56 mholzer Exp $
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
 SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"