5 files changed, 99 insertions, 11 deletions
diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog
index 4a3e2f3a9807..1a05b527f931 100644
--- a/sys-fs/quota/ChangeLog
+++ b/sys-fs/quota/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/quota
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.6 2005/01/03 00:11:56 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.7 2005/01/07 13:04:51 robbat2 Exp $
+
+*quota-3.12-r1 (07 Jan 2005)
+
+  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> files/quota.rc6,
+  +quota-3.12-r1.ebuild:
+  Add RPC support. Bug #59536: add ldap support.
 
   03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 86af871c4cde..447fc0f7fe2c 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,17 +1,19 @@
-MD5 d61702dfa4b25e6786d8118c1236765c quota-3.12.ebuild 1490
-MD5 8166739beecec0143b8f8d356587f7b8 ChangeLog 5179
-MD5 be7bff0cad4168ed03f93cd88046aed1 quota-3.06.ebuild 1049
 MD5 f1d0274fc6065eab74906118ef2dec78 quota-3.10.ebuild 1488
-MD5 74314648b2f958005401509dc4f28f7c quota-3.06-r1.ebuild 1110
+MD5 be7bff0cad4168ed03f93cd88046aed1 quota-3.06.ebuild 1049
 MD5 c9bf6241835697ca7fcfa96bfc68411c quota-3.06-r2.ebuild 1219
+MD5 d61702dfa4b25e6786d8118c1236765c quota-3.12.ebuild 1490
+MD5 74314648b2f958005401509dc4f28f7c quota-3.06-r1.ebuild 1110
+MD5 29d787471368bf1677c88ceb22fef83f quota-3.12-r1.ebuild 1677
 MD5 7afded315805e2de5acdd2cb9d18dd2a quota-3.09.ebuild 1489
+MD5 8166739beecec0143b8f8d356587f7b8 ChangeLog 5179
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3538157ab0be1ec1d2576ac8f3f4171d files/quota.rc6 675
+MD5 0d3ff3aaef898c9bb1d7243e20e93913 files/quota-no-quotactl-manpage.patch 958
+MD5 e4ed06a1fb75aa40c8c323fbc3d0d0ff files/quota.rc 650
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06 62
-MD5 a579acd7ad0608bc16126d5d86da7804 files/digest-quota-3.10 62
 MD5 0a55ad0559999fe3044a502022c513ed files/digest-quota-3.09 62
+MD5 a579acd7ad0608bc16126d5d86da7804 files/digest-quota-3.10 62
 MD5 bce0e9a711e2b89bce6d9039014ab837 files/digest-quota-3.12 62
-MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r2 62
-MD5 3538157ab0be1ec1d2576ac8f3f4171d files/quota.rc6 675
-MD5 0d3ff3aaef898c9bb1d7243e20e93913 files/quota-no-quotactl-manpage.patch 958
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r1 62
-MD5 e4ed06a1fb75aa40c8c323fbc3d0d0ff files/quota.rc 650
+MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r2 62
+MD5 bce0e9a711e2b89bce6d9039014ab837 files/digest-quota-3.12-r1 62
diff --git a/sys-fs/quota/files/digest-quota-3.12-r1 b/sys-fs/quota/files/digest-quota-3.12-r1
new file mode 100644
index 000000000000..2d6cc86d83a2
--- /dev/null
+++ b/sys-fs/quota/files/digest-quota-3.12-r1
@@ -0,0 +1 @@
+MD5 d69870f4a9732ed2fe072952ee7f1462 quota-3.12.tar.gz 211909
diff --git a/sys-fs/quota/files/quota.rc6 b/sys-fs/quota/files/quota.rc6
index 64ebcba13bbb..f8c9d448b103 100644
--- a/sys-fs/quota/files/quota.rc6
+++ b/sys-fs/quota/files/quota.rc6
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/files/quota.rc6,v 1.1 2004/10/03 10:28:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/files/quota.rc6,v 1.2 2005/01/07 13:04:51 robbat2 Exp $
 
 depend() {
 	need localmount
+	use portmap
 }
 
 start() {
diff --git a/sys-fs/quota/quota-3.12-r1.ebuild b/sys-fs/quota/quota-3.12-r1.ebuild
new file mode 100644
index 000000000000..52c1dcdd8cae
--- /dev/null
+++ b/sys-fs/quota/quota-3.12-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.12-r1.ebuild,v 1.1 2005/01/07 13:04:51 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="nls tcpd ldap rpc"
+
+RDEPEND="virtual/libc
+	ldap? ( net-nds/openldap )
+	tcpd? ( sys-apps/tcp-wrappers )
+	rpc? ( net-nds/portmap )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/quota-tools
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to prevent quotactl.2 manpage from being installed
+	# that page is provided by man-pages instead
+	epatch ${FILESDIR}/${PN}-no-quotactl-manpage.patch
+
+	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
+}
+
+src_compile() {
+	local myconf
+	myconf="$(use_enable nls) $(use_enable ldap ldapmail)"
+	myconf="${myconf} $(use_enable rpc) $(use_enable rpc rpcsetquota)"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,3,8}}
+	make ROOTDIR="${D}" install || die
+	rm -r "${D}"/usr/include #70938
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	dodoc doc/*
+	dodoc README.*
+	dodoc Changelog
+
+	newinitd ${FILESDIR}/quota.rc6 quota
+
+	if use ldap
+	then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe ldap-scripts/*.pl
+		doexe ldap-scripts/edquota_editor
+	fi
+}
+
+pkg_postinst() {
+	einfo "with this release, you can configure the used"
+	einfo "ports through /etc/services"
+	einfo
+	einfo "eg. use the default"
+	einfo "rquotad               4003/tcp                        # quota"
+	einfo "rquotad               4003/udp                        # quota"
+}