From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE737139083 for ; Mon, 18 Dec 2017 19:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 424AFE109E; Mon, 18 Dec 2017 19:34:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14E9CE109E for ; Mon, 18 Dec 2017 19:34:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0D6333BE18 for ; Mon, 18 Dec 2017 19:34:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB750ADCA for ; Mon, 18 Dec 2017 19:34:08 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1513625639.ec1d210e7d85aba515fe6519601c95f03337ade2.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/quota/quota-4.04-r1.ebuild sys-fs/quota/quota-4.04.ebuild X-VCS-Directories: sys-fs/quota/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: ec1d210e7d85aba515fe6519601c95f03337ade2 X-VCS-Branch: master Date: Mon, 18 Dec 2017 19:34:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 97289b13-413f-4b96-bc6b-2b6bafe56830 X-Archives-Hash: 4a61f0d6e75acfbd0df7eabdabe20858 commit: ec1d210e7d85aba515fe6519601c95f03337ade2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Dec 18 19:33:40 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Mon Dec 18 19:33:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1d210e sys-fs/quota: Require glibc without rpc support if rpc support is selected here, bug 636934 Otherwise we get file collisions: * sys-libs/glibc-2.25-r9:2.2::gentoo * /usr/include/rpcsvc/rquota.h * /usr/include/rpcsvc/rquota.x Closes: https://bugs.gentoo.org/636934 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-fs/quota/quota-4.04-r1.ebuild | 8 ++-- sys-fs/quota/quota-4.04.ebuild | 79 --------------------------------------- 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/sys-fs/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild index 0fccc223e07..b4b4a726d94 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 d077fb35d66..00000000000 --- 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 -}