3 files changed, 26 insertions, 17 deletions
diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog
index e690050ee4e1..d420cbe8b95c 100644
--- a/sys-fs/quota/ChangeLog
+++ b/sys-fs/quota/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/quota
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.2 2004/10/03 20:46:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.3 2004/11/30 02:33:49 vapier Exp $
+
+  29 Nov 2004; Mike Frysinger <vapier@gentoo.org> quota-3.12.ebuild:
+  Dont install files owned by glibc #70938 by Jakub Moc and make sure we
+  respect USE=-nls #44539 by Johan Petersson.
 
 *quota-3.12 (03 Oct 2004)
 
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 9cb3271da9b4..6bb7e60fbd02 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 35fdcd33173622cb6a11d1b5e951c6c5 ChangeLog 4703
+MD5 b64ed1adbbe6e6205349679975af084a ChangeLog 4890
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 5eedc89a0fc1eb36d001b415dc9248cb quota-3.06-r1.ebuild 1109
 MD5 c3c21596cc9b06d386bf62afae9c9a91 quota-3.06-r2.ebuild 1218
 MD5 ff01638e6438e59ba27712208ab4ca13 quota-3.06.ebuild 1048
 MD5 1ccc840fb99c84963e36a879986e15d1 quota-3.09.ebuild 1488
 MD5 eed3b57ea6b2f0f07715466e46263672 quota-3.10.ebuild 1487
-MD5 cb1c8857e7f179714647e23e88c28638 quota-3.12.ebuild 1468
+MD5 dc8b5a2b23037476e052686fafd1292b quota-3.12.ebuild 1494
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06 62
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r1 62
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r2 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 0d3ff3aaef898c9bb1d7243e20e93913 files/quota-no-quotactl-manpage.patch 958
 MD5 e4ed06a1fb75aa40c8c323fbc3d0d0ff files/quota.rc 650
+MD5 a579acd7ad0608bc16126d5d86da7804 files/digest-quota-3.10 62
 MD5 3538157ab0be1ec1d2576ac8f3f4171d files/quota.rc6 675
+MD5 bce0e9a711e2b89bce6d9039014ab837 files/digest-quota-3.12 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBYGUVI1lqEGTUzyQRAmj4AJwJ37JrVPDKFigDAFdGqSdCHL13IQCgyk1Z
-8azWhJJoxqt1DOnpHtsNQkc=
-=Ygk9
+iD8DBQFBq9wYroRuSHgZdywRAkf2AJ4/fsKk8H4e8ltvdykOwR8Q774HuACgk4ki
+4f2MbValKlv3rwyxBWvzs/8=
+=LRWv
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/quota/quota-3.12.ebuild b/sys-fs/quota/quota-3.12.ebuild
index c6be2604072f..7f648ee0073b 100644
--- a/sys-fs/quota/quota-3.12.ebuild
+++ b/sys-fs/quota/quota-3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.12.ebuild,v 1.1 2004/10/03 10:28:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.12.ebuild,v 1.2 2004/11/30 02:33:49 vapier Exp $
 
 inherit eutils
 
@@ -13,8 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="nls tcpd"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/quota-tools
 
@@ -29,20 +31,23 @@ src_unpack() {
 	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
 }
 
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die
+}
+
 src_install() {
 	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,3,8}}
-	make ROOTDIR=${D} install || die
-#	install -m 644 warnquota.conf ${D}/etc
+	make ROOTDIR="${D}" install || die
+	rm -r "${D}"/usr/include #70938
+
 	insinto /etc
 	insopts -m0644
 	doins warnquota.conf quotatab
-	dodoc doc/*
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/quota.rc6 quota
+	dodoc doc/*
 
-	# NLS bloat reduction
-	use nls || rm -rf ${D}/usr/share/locale
+	newinitd ${FILESDIR}/quota.rc6 quota
 }
 
 pkg_postinst() {