Touchups and dont strip binaries with `install`.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 46 insertions, 37 deletions

diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog
index 18e90ea2fde1..0e56b9038530 100644
--- a/sys-fs/quota/ChangeLog
+++ b/sys-fs/quota/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2005/03/19 10:48:06 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.9 2005/06/03 23:06:13 vapier Exp $
+
+  03 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/quota-3.06-no-stripping.patch, quota-3.12-r1.ebuild:
+  Touchups and dont strip binaries with `install`.
 
   19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> quota-3.12.ebuild:
   Stable on alpha.
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index ecb2e23f13b9..81b9203e82d1 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,29 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 74314648b2f958005401509dc4f28f7c quota-3.06-r1.ebuild 1110
-MD5 80aea0b7a20a8267661114a292c37bc6 ChangeLog 5445
-MD5 4691e1fcee28fb302d0d968bec4c06c1 quota-3.12-r1.ebuild 1933
-MD5 7673b08e92b29a9594e010c9d71e4876 quota-3.12.ebuild 1488
+MD5 d2dad9fdc6cb8dd814cdff55bc6b7947 ChangeLog 5609
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 be7bff0cad4168ed03f93cd88046aed1 quota-3.06.ebuild 1049
+MD5 74314648b2f958005401509dc4f28f7c quota-3.06-r1.ebuild 1110
 MD5 c9bf6241835697ca7fcfa96bfc68411c quota-3.06-r2.ebuild 1219
-MD5 f1d0274fc6065eab74906118ef2dec78 quota-3.10.ebuild 1488
+MD5 be7bff0cad4168ed03f93cd88046aed1 quota-3.06.ebuild 1049
 MD5 7afded315805e2de5acdd2cb9d18dd2a quota-3.09.ebuild 1489
-MD5 0d3ff3aaef898c9bb1d7243e20e93913 files/quota-no-quotactl-manpage.patch 958
+MD5 f1d0274fc6065eab74906118ef2dec78 quota-3.10.ebuild 1488
+MD5 7673b08e92b29a9594e010c9d71e4876 quota-3.12.ebuild 1488
+MD5 ea4be89fe367297ba6721ee412eccba3 quota-3.12-r1.ebuild 1983
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06 62
-MD5 bce0e9a711e2b89bce6d9039014ab837 files/digest-quota-3.12-r1 62
-MD5 e4ed06a1fb75aa40c8c323fbc3d0d0ff files/quota.rc 650
-MD5 0a55ad0559999fe3044a502022c513ed files/digest-quota-3.09 62
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r1 62
-MD5 bce0e9a711e2b89bce6d9039014ab837 files/digest-quota-3.12 62
+MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r2 62
+MD5 0a55ad0559999fe3044a502022c513ed files/digest-quota-3.09 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 7868c75f59b802646554096ebf161574 files/quota.rc6 689
-MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r2 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCPBGdugEuf3OQ0akRAu15AJ4zYoPzKRyExA3UahSiH5gvi1PyUgCaA8e4
-4XrFSUDQN2+0vbdqaGJdl2A=
-=K3fx
------END PGP SIGNATURE-----
+MD5 bce0e9a711e2b89bce6d9039014ab837 files/digest-quota-3.12 62
+MD5 bce0e9a711e2b89bce6d9039014ab837 files/digest-quota-3.12-r1 62
+MD5 e7dd5ca4d40c611ea2f88232e50431e9 files/quota-3.06-no-stripping.patch 583
diff --git a/sys-fs/quota/files/quota-3.06-no-stripping.patch b/sys-fs/quota/files/quota-3.06-no-stripping.patch
new file mode 100644
index 000000000000..0ab5385a454b
--- /dev/null
+++ b/sys-fs/quota/files/quota-3.06-no-stripping.patch
@@ -0,0 +1,11 @@
+--- quota-tools/Makefile.in
++++ quota-tools/Makefile.in
+@@ -90,6 +90,6 @@
+ 	-$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc
+ 	-$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc
+-	-$(INSTALL) -s -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
+-	-$(INSTALL) -s -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
++	-$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
++	-$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
+ 	-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
+ 	-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
diff --git a/sys-fs/quota/quota-3.12-r1.ebuild b/sys-fs/quota/quota-3.12-r1.ebuild
index 52c1dcdd8cae..6201b8992b0e 100644
--- a/sys-fs/quota/quota-3.12-r1.ebuild
+++ b/sys-fs/quota/quota-3.12-r1.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/sys-fs/quota/quota-3.12-r1.ebuild,v 1.1 2005/01/07 13:04:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.12-r1.ebuild,v 1.2 2005/06/03 23:06:13 vapier Exp $
 
 inherit eutils
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="nls tcpd ldap rpc"
 
-RDEPEND="virtual/libc
-	ldap? ( net-nds/openldap )
+RDEPEND="ldap? ( net-nds/openldap )
 	tcpd? ( sys-apps/tcp-wrappers )
 	rpc? ( net-nds/portmap )"
 DEPEND="${RDEPEND}
@@ -24,25 +23,30 @@ S=${WORKDIR}/quota-tools
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
+	epatch "${FILESDIR}"/${PN}-no-quotactl-manpage.patch
+
+	# Don't strip binaries (from Fedora)
+	epatch "${FILESDIR}"/quota-3.06-no-stripping.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
+	econf \
+		$(use_enable nls) \
+		$(use_enable ldap ldapmail) \
+		$(use_enable rpc) \
+		$(use_enable rpc rpcsetquota) \
+		|| die
 	emake || die
 }
 
 src_install() {
-	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,3,8}}
+	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
 
@@ -54,10 +58,9 @@ src_install() {
 	dodoc README.*
 	dodoc Changelog
 
-	newinitd ${FILESDIR}/quota.rc6 quota
+	newinitd "${FILESDIR}"/quota.rc6 quota
 
-	if use ldap
-	then
+	if use ldap ; then
 		insinto /etc/openldap/schema
 		insopts -m0644
 		doins ldap-scripts/quota.schema