Avoid building rpc related code when USE=-rpc #465810 by darwinskernel.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 33 insertions, 22 deletions

diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog
index eacebd45e4f1..f5f38b7e190b 100644
--- a/sys-fs/quota/ChangeLog
+++ b/sys-fs/quota/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/quota
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.64 2013/01/06 22:37:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.65 2013/04/15 22:38:13 vapier Exp $
+
+  15 Apr 2013; Mike Frysinger <vapier@gentoo.org> quota-4.01.ebuild:
+  Avoid building rpc related code when USE=-rpc #465810 by darwinskernel.
 
 *quota-4.01 (06 Jan 2013)
 
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index aa966dc36ed3..bcfa6d560984 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -23,23 +23,23 @@ EBUILD quota-3.16.ebuild 1852 SHA256 ead773147e1d66e22e21738fdddb3751d3e2c75be09
 EBUILD quota-3.17-r1.ebuild 1898 SHA256 9a568d85f6c64a75f11a3c39e46b324eca86dc85c1f95e4ae37d9a3882e913b9 SHA512 dfde96b8e986c8f5a97211d8a22f00248aff2b38ffb2462a7ebe8859f95f024f170f92d659058fd5dba96046b80d194e25fee4314906bcc45fad7bce6ffeddce WHIRLPOOL 0543d99b963fd52098e03f799356485e8c1b7ec923f31c21e24c732b44f7789484b9139b0df3d86704976535a54af41f3c71cb19cdb556fb3c37dd51563c0535
 EBUILD quota-3.17.ebuild 1893 SHA256 e8137845b9b9831d8ea6bc1200c904784f0c05fa35e92654846173c747381843 SHA512 50a887304ab8d5c47dc61b0db72cf3d92d1968a3f2c7bc949471f38e0492a6d850f3b9e2aa13e17f5b224786b691a1e1c53e070d956bc66aa880eec8432f614a WHIRLPOOL 6fa5862a37e1e272df74fcfd65a6fff1dcc819d29e1b532a576a40d80c0df515ef1643484167e5e0a01e97fabf31e5571495e2157a352f5a68180a7cf4d22d94
 EBUILD quota-4.00.ebuild 1629 SHA256 d18f97139879964c029d2a0fc36758d3acead946401d5c0fac45ce891f8ef373 SHA512 2245286024e0a707a14da7f777ac719dcf76a4d6ba7f5be5b0f9168b0cce38201f3c242759ddeef7d51b3de7cc6f54892b826625498fe15863221653964ee9f6 WHIRLPOOL 44e50a137a79eae02a0fd3f4771a1b532b774142ba806b537a69c5bd77b3d52a0b3fdab8c12baabfdfc2c5a7c0089784942d644ea149a7c650547a8cc3063fd8
-EBUILD quota-4.01.ebuild 1637 SHA256 d4989f7addc0565f23e88a433aaaf687ade829497fcbc85686ab70198e3e4406 SHA512 b52604d2f524cf827b07ca582780a4d33d3eb26fe1311ceb4c9f07a9ad8fd74bcff13247ee3b541ddf7655a20b9e0454a39c7a013c731bd23ed297f2697327b6 WHIRLPOOL 3e9bd752f8432ab5b8568edd26c0093deaa39c7ab624345cc460b6ff53522b49d5a08e26e329782087c1bae0fa5f43157e4ba18cafcc8b091facce59f5f4edfe
-MISC ChangeLog 12108 SHA256 dd501cf1a2b63ed535b431be09aef352cdd665a6cbc36905995c219232fe5e89 SHA512 6f1940b56e6f285992b3a7bc7284f312ceda47b45ad9925ca047752a99019b405523c3eea2fc5549af0579be1dc89c80ef4c4a7f176ddd102725d3eaf5ffb6ad WHIRLPOOL 5144dc88bc3d2040c792968657a4c4ee1b6e5ab5d0bf91b1a620f3414343446c90b886560616757a746204f4d6d0a83849c583a762728a1c9270a2a04afa88c8
+EBUILD quota-4.01.ebuild 1759 SHA256 3a9f761c7b5428d193c1145343ae4bdfa56f1f25b94ee0aac0ad6b85140f722f SHA512 95d86b3d099f12b4fce096a4136aeb133d4c6576f9b619213446fa6b7233d5f4dc6c5ca2494df3a93bad53ebcddfffba59f0e431abd1cbe3bf03fd22978d15ff WHIRLPOOL 320e045629241844168e3a4264d187b98133c2f19035ffb14af9d99d57be47ee8c747b18142774f250579aa486bb6043da8b4ca5c85458ee08f61e79bb182d2e
+MISC ChangeLog 12252 SHA256 ea10d021db84e017df55acfb0f0162b06ac5d3bbf12b94b2413bae0e7e0885ed SHA512 47af4dcd1417583ad9773d048e54c041948dad3cc38bc6479873eef341b5f77c1f89d3f532900baf3bfacb6bc0c37eed8a9e1d7fccc96e406d19fb8bca98fc2e WHIRLPOOL 12c422de8514d293032a180dc1ff7981f5bdc7ce0d1996db0c61be77299bd0cbc8f9265f58ebc36a0ce39d50ccadd1c796ec5fa13669c20a2784b363a5f5f8c0
 MISC metadata.xml 316 SHA256 2fbc87f6daabedc2c95877c2dd6cc34e99a35ec0024553e8204e0e8918d54fb8 SHA512 2d37a67df2a7d583f409895ee84abcc28d0a44a123218adca497ffdc64bdf93cf4524a288a35314b688e0c24ac0dd6884afc14137d65fa9ecc4770796713d923 WHIRLPOOL b39c1b220f1f1ee6938dc0de3b55d2db3e9705ff73188b40a340b25c32fe6c2ce4ada9d4c0df80ddc3959fdc766fd5b9334a64b3e87b1e0cd1940148d895319a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ6f09AAoJELEHsLL7fEFW45UQAJvpPGiyT4n+oZCzk6Abo8KI
-h8fuwpz2VCAiis3Z2j5IL9SsqV9uaVtq94QCbq8WxuQC7t2TJcy2nA6TBJ7+LJ3x
-PPPKGizWYWtkWOV1IWHSJWV+Sz/gdln1E5wqfelvu9ildyv8bD0ts5i6M0W2kkTJ
-vcWYLlIlV9HWRC2+81F9KldIh+ztw4ZCW1eemX9Ngo9BuH2EENAaPM5WLS31s4LD
-2/Bj0Un+r7vk/QL+S5ceo704tE3P4ylp/sdxgIQIG8cQI+gvlnNVXH8Sc8oAlR2E
-18xDW0Zw/smdzI5ZDGL9ZRz6XL3Rk+HLIfJa8xKd7GgmPKiyNHGCTadspKzV9HSi
-eKNMjulO9Umb7rBAZnu4CmivB7dvLxRKyak5Bh5b1V8i2y1SEexmv/UrWfsJHMYB
-hCT4x4yvU9kcpNQHqpEtvQvZF4htLvwVzxfnH2jhj2RJ462sLqGUNEc/MNU4ZTxQ
-h8bY1wgNlN7pQSHgZ1O1x/TzKAoihjKQsLidX2Aqid0HDHS6qziKoe/bkiN1dFqA
-YxRnC1dRymJWMFrpF0lmZ9tZEmnW7dhIUqPlFOmGUX8iWV5p4dJEwHBiN2ONnUpL
-AmrjpoCBQSoDCzxKM1X/KsEVcDNZHxsSguyXlRKcerUpxnr4nIlro3kc2zaj+6Tt
-8jIzq3IgE/ZePosodjVd
-=Wzo0
+iQIcBAEBCAAGBQJRbIHJAAoJELEHsLL7fEFWMjoP/jjYvdzpd9ugV5aAlViAiUsp
+zSCoc+VyaMFzbg4aRgXjEe1UNn/6i4h+HFbtMdu3HsiPbvdv/z91dvh0tXiGhB1y
+1cgqXD0Cwctt19bJ+JBsDMlcQzQGij6NIy+0inYWcFhW9FfGMaZ+KW0GouNV+556
+ZgkbcGldUcL21bbXI3/1ppYvYjLdmGwA4dr7f6t5odY4QRJFV7HUm4wrp8pbdh14
+70mzWjr68zz/nLXad/e8nfvaHvzYTOXresRRLzUhjMT07u6p0Vk5VNXOnuN71wwb
+pf8DDetH+NYs4/14S9jnRd5ObaBuGJIlrlaoeOlScLQ7pDAV4tkT1KEdp7JGb2zt
+xJzSYiqQtad8KKeLpmgDfvPCmlqk8lO3qeEdxZY3xeUwnXuDeTPQyOm76IG2qBIG
+CgyASXioPOVJnD9DXrmuA0V2xts9RiIjjf4rwM9/qYmGHrpU4cD6tWoWOlhFtjJt
+OayoOzNstZAaX/8LzASn/kaFaHAale05+UtBFRxRl3aosiZvUpqNhX9ucmR51zwT
+9IzwykYx7bSM6qy2a+6CNBpy0iYYcaSJIY71+Fk044KoIEmyid34p4qlrAIbiLrZ
+vhyjfKiN9niMk1eS3XGqbxQGDA6Qax++dIkW2vPb+OfZqo5C+5Nq0MzkjIU4j9bP
+1WeunhurLksqdMXrTl+O
+=AWYM
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/quota/quota-4.01.ebuild b/sys-fs/quota/quota-4.01.ebuild
index 621fbc4171e1..879ab54c180f 100644
--- a/sys-fs/quota/quota-4.01.ebuild
+++ b/sys-fs/quota/quota-4.01.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-4.01.ebuild,v 1.1 2013/01/06 22:37:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-4.01.ebuild,v 1.2 2013/04/15 22:38:13 vapier Exp $
 
 EAPI="4"
 
-inherit eutils flag-o-matic
+inherit eutils
 
 DESCRIPTION="Linux quota tools"
 HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
@@ -28,7 +28,17 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/quota-tools
 
 src_prepare() {
-	sed -i '1iCC = @CC@' Makefile.in || die #446277
+	local args=(
+		-e '1iCC = @CC@' #446277
+	)
+	if ! use rpc ; then
+		args+=( #465810
+			-e '/^PROGS/s:rpc.rquotad::'
+			-e '/^RPCGEN/s:=.*:=false:'
+			-e '/^RPCCLNTOBJS/s:=.*:=:'
+		)
+	fi
+	sed -i "${args[@]}" Makefile.in || die
 	epatch "${FILESDIR}"/${PN}-4.01-mnt.patch
 }
 
@@ -44,7 +54,7 @@ src_configure() {
 src_install() {
 	emake STRIP="" ROOTDIR="${D}" install
 	dodoc doc/* README.* Changelog
-	rm -r "${D}"/usr/include || die #70938
+	rm -r "${ED}"/usr/include || die #70938
 
 	insinto /etc
 	insopts -m0644
@@ -55,8 +65,6 @@ src_install() {
 
 	if use rpc ; then
 		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	else
-		rm -f "${D}"/usr/sbin/rpc.rquotad
 	fi
 
 	if use ldap ; then