gentoo resync : 20.12.2017

3 files changed, 4 insertions, 86 deletions

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 7bbea695e7a3..2b2c8a7436c8 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -19,6 +19,5 @@ AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7
 DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727f4ff12e960da3251091b026c1458adecc0ed3a803da3bfcef6c857f612c44c7800ecc53c9ae53450d10338 SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8
 DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 EBUILD quota-4.03.ebuild 1960 BLAKE2B 54a4dcb04e8a241a3506be2aef8029763ec79fe0aa76fa05d810561100aca0c0b3c2c6d81808566a6ddb240f20bf8f51b2976da09902f5b934d54574bf9cbab7 SHA512 fd2a5affaecc2046a5517b4e96ac46f190c6505f0166cfd52046308cb69846ee154b5c3f7a18f6d70b2507d0253c69b569a255afc91b630f59fa694dd9a81f6f
-EBUILD quota-4.04-r1.ebuild 1581 BLAKE2B ca3a4f62c1f69588d2012bbbe9684c0f60c53e6787800b89a8a1ae81a35c04464768b0549a4558e5ee0b39fc0ae70e91a1c6fa77e4ceae729c62154913bb8f73 SHA512 6e3249ea0b5fe951708f57dde5c3f8bd1345d62965bcb310b94a5aade3b3509a403008ed83182c18a57214462a81dfd7a9b10006f502ad25c2accd9c45271064
-EBUILD quota-4.04.ebuild 1533 BLAKE2B f742098340b086804db45a5c6181547a60aec38f9bfce4f504034f288c7f0cc8beaff91402497670c1a516ee7f68e6249299e5465fa53a7d0d4452d8d2cef240 SHA512 8c19891cac8d58458688541553bb60824324044106fcef0d842ff1c60b739bf36d9affc770617e33ff0e573d98cd2ee0ca09a9ec52a1640398a7a103ae411f67
+EBUILD quota-4.04-r1.ebuild 1598 BLAKE2B a5b0ab8e41a64d2f3ced607e67e23fa429c48fa9b363bb2e37e9a743fb191b8cef61a5c71b9f7a0b96e70609f7b6d00f828ce7208951304efc826daca3dfb9ad SHA512 427e412c071d530c7a08cfab88d293b4eb7e42c0b05632f88e06063028918b9853f0910e2f97aae8ce81bdfc6e269a8603730116762b32188fd54203bd40f10f
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild
index 0fccc223e077..b4b4a726d94b 100644
--- a/sys-fs/quota/quota-4.04-r1.ebuild
+++ b/sys-fs/quota/quota-4.04-r1.ebuild
@@ -22,11 +22,9 @@ RDEPEND="
 	)
 	rpc? (
 		net-nds/rpcbind
-		|| (	sys-libs/glibc[rpc(-)]
-			(
-				net-libs/rpcsvc-proto
-			)
-		)
+		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
+		net-libs/libtirpc
+		net-libs/rpcsvc-proto
 	)
 	tcpd? ( sys-apps/tcp-wrappers )
 "
diff --git a/sys-fs/quota/quota-4.04.ebuild b/sys-fs/quota/quota-4.04.ebuild
deleted file mode 100644
index d077fb35d664..000000000000
--- a/sys-fs/quota/quota-4.04.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap netlink nls rpc tcpd"
-
-RDEPEND="
-	ldap? ( >=net-nds/openldap-2.3.35 )
-	netlink? (
-		sys-apps/dbus
-		dev-libs/libnl:3
-	)
-	rpc? (
-		net-nds/rpcbind
-		|| (	sys-libs/glibc[rpc(-)]
-			(
-				net-libs/rpcsvc-proto
-			)
-		)
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX%/}/usr/share/doc/${PF}"
-		$(use_enable nls)
-		$(use_enable ldap ldapmail)
-		$(use_enable netlink)
-		$(use_enable rpc)
-		$(use_enable rpc rpcsetquota)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	newinitd "${FILESDIR}"/quota.rc7 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		insopts -m0644
-		doins "${FILESDIR}"/ldap-scripts/quota.schema
-
-		exeinto /usr/share/quota/ldap-scripts
-		doexe "${FILESDIR}"/ldap-scripts/*.pl
-		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
-	fi
-}