public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/, sys-fs/quota/files/
@ 2016-02-15 13:58 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2016-02-15 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     0ca37b549d8b6543182dc17957ce7b7ce32f4074
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 13:55:24 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 13:58:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca37b54

sys-fs/quota: Removed old.

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/quota/Manifest                      |  1 -
 sys-fs/quota/files/quota-4.01-cflags.patch | 58 ----------------------
 sys-fs/quota/files/quota-4.01-mnt.patch    | 13 -----
 sys-fs/quota/quota-4.01.ebuild             | 80 ------------------------------
 4 files changed, 152 deletions(-)

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index affd0f3..1311971 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,4 +1,3 @@
 DIST quota-3.17.tar.gz 439168 SHA256 253320993bb132814c724ca268a6346368be41846ad600f65ee4232ec8597d6f SHA512 7d200862f5ebee024295352289d940a1b728cb017e7c2c4f422a5a98d58ba8f62130640a4c08bdec02f94ea0f4abe146fb494c039b43021fd410ec17fd32b238 WHIRLPOOL e334f22a7c2f8097a2f7145217d1cf134a135a1b6705470121e3a9c0492d59677508bfaa06bcb4eecb9992491910f5b29068e005cafb5086df39da591e375613
-DIST quota-4.01.tar.gz 458123 SHA256 a36300bbc126b79b745bf937245092808b4585aa3309ef3335d4ab9d873cd206 SHA512 57f79efe7e538f3109d0e44e4f87388ec4e8134f34ba92a30acb5d223090e8fb0087dfc558a951facc7f9b4d2301b4e305b710576363c13f5e70b06c91194dda WHIRLPOOL ff4aba698fe067e33c7c4fcd2463d5b5b2f557e49d59cb98cceefb145a7e0d2ee371e411a6d8c4d51ddd28c102d34c95f03a733dac47dd52582ea4d31f102c31
 DIST quota-4.02.tar.gz 489289 SHA256 f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795 SHA512 547e08893b95928e5d183d29bee70d1932f85a675b96f64446e5a723d0759ad2d31223f8b6a5652cd698fce4907a15c294b91c18de32faddbef4975c9f22f2aa WHIRLPOOL eb102a14dfe780b7ed062c3c7abec1ef766beb31c18d92c5115ca703672ebb7e7bfb0479885c6c8c78520554aeb477bc1f4d48fbb76b0336047f42b55af49036
 DIST quota-4.03.tar.gz 564352 SHA256 9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8 WHIRLPOOL 4a6354f7732e6c60782dbfb60fbfae47c96c438315572dccaf7d2563b8dab5eb46072f999481abe237df8dafaf252b095c9bcd5d58beecdf75db6aca8d46f4ab

diff --git a/sys-fs/quota/files/quota-4.01-cflags.patch b/sys-fs/quota/files/quota-4.01-cflags.patch
deleted file mode 100644
index 4e61855..0000000
--- a/sys-fs/quota/files/quota-4.01-cflags.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Apr 21 10:36:28 UTC 2014
-Subject: respect CFLAGS in linking command wrt #446281
-
---- quota-tools/Makefile.in
-+++ quota-tools/Makefile.in
-@@ -105,37 +105,47 @@
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8
- 
- quotaon: quotaon.o quotaon_xfs.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- quotacheck: quotacheck.o quotacheck_v1.o quotacheck_v2.o quotaops.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXT2LIBS)
- 
- quota: quota.o quotaops.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- quotasync: quotasync.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- quot: quot.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- repquota: repquota.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- warnquota: warnquota.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDAPLIBS)
- 
- quotastats: quotastats.o common.o pot.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- xqmstats: xqmstats.o common.o pot.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- edquota: edquota.o quotaops.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- setquota: setquota.o quotaops.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- convertquota: convertquota.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- ifneq ($(NETLINKLIBS),)
- quota_nld: quota_nld.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(NETLINKLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(NETLINKLIBS)
- endif
- 
- pot.o: pot.c pot.h

diff --git a/sys-fs/quota/files/quota-4.01-mnt.patch b/sys-fs/quota/files/quota-4.01-mnt.patch
deleted file mode 100644
index 1aa1590..0000000
--- a/sys-fs/quota/files/quota-4.01-mnt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3599717&group_id=18136&atid=318136
-
---- a/quotasys.c
-+++ b/quotasys.c
-@@ -642,7 +642,7 @@
- 		die(2, _("Cannot initialize mountpoint scan.\n"));
- 	while ((mnt = get_next_mount())) {
- #ifndef RPC
--		if (nfs_fstype(mnt->mnt_type))
-+		if (nfs_fstype(mnt->me_type))
- 			continue;
- #endif
- 		if (fmt == -1 || count) {

diff --git a/sys-fs/quota/quota-4.01.ebuild b/sys-fs/quota/quota-4.01.ebuild
deleted file mode 100644
index 337bb86..0000000
--- a/sys-fs/quota/quota-4.01.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="http://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:1.1
-	)
-	rpc? ( net-nds/rpcbind )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/quota-tools
-
-src_prepare() {
-	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 \
-		"${FILESDIR}"/${PN}-4.01-cflags.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable netlink) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota)
-}
-
-src_install() {
-	emake STRIP="" ROOTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-	rm -r "${ED}"/usr/include || die #70938
-
-	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 ldap-scripts/quota.schema
-
-		exeinto /usr/share/quota/ldap-scripts
-		doexe ldap-scripts/*.pl
-		doexe ldap-scripts/edquota_editor
-	fi
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/, sys-fs/quota/files/
@ 2016-02-15 13:58 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2016-02-15 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     259c01e6bfb7838d76f7e23a9724baea704ecc1f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 13:53:21 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 13:58:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259c01e6

sys-fs/quota: Bump to version 4.03

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/quota/Manifest                              |  1 +
 .../quota/files/quota-4.03-default_fpic_fpie.patch | 32 ++++++++
 .../files/quota-4.03-distribute_ldap-scripts.patch | 23 ++++++
 .../files/quota-4.03-dont_override_cflags.patch    | 22 ++++++
 ...a-4.03-explicitely_print_disabled_options.patch | 69 ++++++++++++++++++
 .../files/quota-4.03-fix_build_without_ldap.patch  | 85 ++++++++++++++++++++++
 sys-fs/quota/files/quota-4.03-no_rpc.patch         | 57 +++++++++++++++
 sys-fs/quota/files/quota-4.03-noldap_linking.patch | 75 +++++++++++++++++++
 .../files/quota-4.03-repqouta_F_option_arg.patch   | 27 +++++++
 sys-fs/quota/files/quota-4.03-respect_docdir.patch | 21 ++++++
 sys-fs/quota/quota-4.03.ebuild                     | 83 +++++++++++++++++++++
 11 files changed, 495 insertions(+)

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 6d6fede..affd0f3 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,3 +1,4 @@
 DIST quota-3.17.tar.gz 439168 SHA256 253320993bb132814c724ca268a6346368be41846ad600f65ee4232ec8597d6f SHA512 7d200862f5ebee024295352289d940a1b728cb017e7c2c4f422a5a98d58ba8f62130640a4c08bdec02f94ea0f4abe146fb494c039b43021fd410ec17fd32b238 WHIRLPOOL e334f22a7c2f8097a2f7145217d1cf134a135a1b6705470121e3a9c0492d59677508bfaa06bcb4eecb9992491910f5b29068e005cafb5086df39da591e375613
 DIST quota-4.01.tar.gz 458123 SHA256 a36300bbc126b79b745bf937245092808b4585aa3309ef3335d4ab9d873cd206 SHA512 57f79efe7e538f3109d0e44e4f87388ec4e8134f34ba92a30acb5d223090e8fb0087dfc558a951facc7f9b4d2301b4e305b710576363c13f5e70b06c91194dda WHIRLPOOL ff4aba698fe067e33c7c4fcd2463d5b5b2f557e49d59cb98cceefb145a7e0d2ee371e411a6d8c4d51ddd28c102d34c95f03a733dac47dd52582ea4d31f102c31
 DIST quota-4.02.tar.gz 489289 SHA256 f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795 SHA512 547e08893b95928e5d183d29bee70d1932f85a675b96f64446e5a723d0759ad2d31223f8b6a5652cd698fce4907a15c294b91c18de32faddbef4975c9f22f2aa WHIRLPOOL eb102a14dfe780b7ed062c3c7abec1ef766beb31c18d92c5115ca703672ebb7e7bfb0479885c6c8c78520554aeb477bc1f4d48fbb76b0336047f42b55af49036
+DIST quota-4.03.tar.gz 564352 SHA256 9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8 WHIRLPOOL 4a6354f7732e6c60782dbfb60fbfae47c96c438315572dccaf7d2563b8dab5eb46072f999481abe237df8dafaf252b095c9bcd5d58beecdf75db6aca8d46f4ab

diff --git a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch b/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
new file mode 100644
index 0000000..2ff519f
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
@@ -0,0 +1,32 @@
+commit cd9dff0b5b53279442458360003831b6c14adc22
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Tue Jan 5 11:20:52 2016 +0100
+
+    Set -fPIC and -pie as default params when building
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/Makefile.am b/Makefile.am
+index 7c7a866..77f8400 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,5 @@
+ ACLOCAL_AMFLAGS = -I m4
++AM_LDFLAGS = -pie
+ 
+ BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
+ 
+diff --git a/configure.ac b/configure.ac
+index 1552c15..68d5924 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
+ # ================
+ # Check for cflags
+ # ================
+-CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC"
+ AC_ARG_ENABLE([werror],
+     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
+     [enable_werror="$enableval"],

diff --git a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
new file mode 100644
index 0000000..8333915
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
@@ -0,0 +1,23 @@
+commit 861154efb90ed049e0473cc36935b8d03c78a869
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Mon Jan 4 13:01:36 2016 +0100
+
+    Distribute ldap-scripts directory too
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/Makefile.am b/Makefile.am
+index eb62617..a880ebe 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -52,7 +52,8 @@ EXTRA_DIST = \
+ 	$(man_MANS) \
+ 	$(rpcsvc_DATA) \
+ 	autogen.sh \
+-	Changelog
++	Changelog \
++	ldap-scripts
+ 
+ noinst_LIBRARIES = \
+ 	libquota.a \

diff --git a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
new file mode 100644
index 0000000..e59341a
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
@@ -0,0 +1,22 @@
+commit 776757a23e9930588950c7fcbc7827ec7a3e51c4
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Mon Jan 4 15:48:19 2016 +0100
+
+    Do not accidentaly override commandline passed CFLAGS.
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/configure.ac b/configure.ac
+index 3ba1386..1552c15 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
+ # ================
+ # Check for cflags
+ # ================
+-CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+ AC_ARG_ENABLE([werror],
+     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
+     [enable_werror="$enableval"],

diff --git a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
new file mode 100644
index 0000000..29627c0
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
@@ -0,0 +1,69 @@
+commit 6ccb66159a9eee6ca114b11b70eb06f4ac6900d7
+Author: Jan Kara <jack@suse.cz>
+Date:   Mon Jan 4 15:36:27 2016 +0100
+
+    Print explicitely disabled options properly
+    
+    Currently we printed only an empty string when some build option was
+    disabled explicitely via --disable-foo. Print 'no' in that case as well.
+    
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/configure.ac b/configure.ac
+index 39631c4..3ba1386 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ AC_ARG_ENABLE([ldapmail],
+ AS_IF([test "x$enable_ldapmail" != "xno"], [
+     build_ldap="yes"
+     AC_CHECK_LIB([ldap], [ldap_initialize], [], [
+-        build_ldap=no
++        build_ldap="no"
+         AS_IF([test "x$enable_ldapmail" = "xyes"], [
+             AC_MSG_ERROR([LDAP support required but library not found.]);
+         ])
+@@ -84,6 +84,8 @@ AS_IF([test "x$enable_ldapmail" != "xno"], [
+         AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
+         COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
+     ])
++], [
++    build_ldap="no"
+ ])
+ AC_SUBST(LDAP_LIBS)
+ 
+@@ -113,6 +115,8 @@ AS_IF([test "x$enable_ext2direct" != "xno"], [
+         AC_DEFINE([EXT2_DIRECT], 1, [Scanning of ext? filesystems using e2fslib])
+         COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT"
+     ])
++], [
++   build_ext2direct="no"
+ ])
+ AC_SUBST(EXT2FS_CFLAGS)
+ AC_SUBST(EXT2FS_LIBS)
+@@ -141,6 +145,8 @@ AS_IF([test "x$enable_netlink" != "xno"], [
+             AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.])
+         ])
+     ])
++], [
++    build_netlink="no"
+ ])
+ AM_CONDITIONAL([WITH_NETLINK], [test "x$build_netlink" != "xno"])
+ AC_SUBST(DBUS_CFLAGS)
+@@ -171,6 +177,8 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
+         AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
+         COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
+     ])
++], [
++    build_libwrap="no"
+ ])
+ AC_SUBST(WRAP_LIBS)
+ 
+@@ -199,6 +207,8 @@ AS_IF([test x"$enable_rpc" != "xno"], [
+ 	AC_DEFINE([RPC], 1, [Support for RPC])
+ 	COMPILE_OPTS="$COMPILE_OPTS RPC"
+     ])
++], [
++    build_rpc="no"
+ ])
+ AM_CONDITIONAL([WITH_RPC], [test x"$build_rpc" != "xno"])
+ 

diff --git a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
new file mode 100644
index 0000000..ba838bf
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
@@ -0,0 +1,85 @@
+commit 39fd30ce57e3c34c3649866bf9345a71f0b78667
+Author: Jan Kara <jack@suse.cz>
+Date:   Mon Jan 4 15:10:53 2016 +0100
+
+    Fix build with disabled ldap
+    
+    Reported-by: Tomas Chvatal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/warnquota.c b/warnquota.c
+index 3734f0e..e9868c1 100644
+--- a/warnquota.c
++++ b/warnquota.c
+@@ -109,13 +109,13 @@ struct configparams {
+ 	char *user_signature;
+ 	char *group_message;
+ 	char *group_signature;
++	time_t cc_before;
++#ifdef USE_LDAP_MAIL_LOOKUP
+ 	int use_ldap_mail; /* 0 */
++	int ldap_is_setup; /* 0 */
+ 	int ldap_starttls; /* 0 */
+ 	int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */
+ 	int ldap_vers; /* LDAP_VERSION3 */
+-	time_t cc_before;
+-#ifdef USE_LDAP_MAIL_LOOKUP
+-	int ldap_is_setup; /* 0 */
+ 	char ldap_host[CNF_BUFFER];
+ 	int ldap_port;
+ 	char ldap_uri[CNF_BUFFER];
+@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config)
+ 	}
+ 	maildev[0] = 0;
+ 	config->user_signature = config->user_message = config->group_signature = config->group_message = NULL;
++	config->cc_before = -1;
++
++#ifdef USE_LDAP_MAIL_LOOKUP
+ 	config->use_ldap_mail = 0;
+ 	config->ldap_starttls = 0;
+ 	config->ldap_tls = LDAP_OPT_X_TLS_NEVER;
+ 	config->ldap_vers = LDAP_VERSION3;
+-	config->cc_before = -1;
+-
+-#ifdef USE_LDAP_MAIL_LOOKUP
+ 	config->ldap_port = config->ldap_is_setup = 0;
+ 	config->ldap_host[0] = 0;
+ 	config->ldap_uri[0] = 0;
+@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config)
+ 				create_eoln(config->group_signature);
+ 				verify_format(config->group_signature, "GROUP_SIGNATURE");
+ 			}
++			else if (!strcmp(var, "CC_BEFORE")) {
++				int num;
++				char unit[10];
++
++				if (sscanf(value, "%d%s", &num, unit) != 2)
++					goto cc_parse_err;
++				if (str2timeunits(num, unit, &config->cc_before) < 0) {
++cc_parse_err:
++					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
++				}
++			}
++#ifdef USE_LDAP_MAIL_LOOKUP
+ 			else if (!strcmp(var, "LDAP_MAIL")) {
+ 				if(strcasecmp(value, "true") == 0) 
+ 					config->use_ldap_mail = 1;
+@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config)
+ 				else
+ 					config->ldap_starttls = 0;
+ 			}
+-			else if (!strcmp(var, "CC_BEFORE")) {
+-				int num;
+-				char unit[10];
+-
+-				if (sscanf(value, "%d%s", &num, unit) != 2)
+-					goto cc_parse_err;
+-				if (str2timeunits(num, unit, &config->cc_before) < 0) {
+-cc_parse_err:
+-					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
+-				}
+-			}
+-#ifdef USE_LDAP_MAIL_LOOKUP
+ 			else if (!strcmp(var, "LDAP_HOST"))
+ 				sstrncpy(config->ldap_host, value, CNF_BUFFER);
+ 			else if (!strcmp(var, "LDAP_PORT"))

diff --git a/sys-fs/quota/files/quota-4.03-no_rpc.patch b/sys-fs/quota/files/quota-4.03-no_rpc.patch
new file mode 100644
index 0000000..c4f5007
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-no_rpc.patch
@@ -0,0 +1,57 @@
+From 07ec5c783ac16ed20735d6cb8ab167833f5877ee Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 15 Feb 2016 14:36:28 +0100
+Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested.
+
+This fixes a buch of undefined references:
+
+x86_64-pc-linux-gnu-gcc  -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa
+ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st
+yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_
+svc.o svc_socket.o libquota.a
+rquota_svc.o: In function `rquotaprog_2':
+rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args'
+rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args'
+rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args'
+rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args'
+rquota_svc.o: In function `rquotaprog_1':
+rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args'
+rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args'
+rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args'
+rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args'
+collect2: error: ld returned 1 exit status
+Makefile:901: recipe for target 'rpc.rquotad' failed
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 77f8400..6d7ea0e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -116,8 +116,11 @@ sbin_PROGRAMS = \
+ 	xqmstats \
+ 	edquota \
+ 	setquota \
+-	convertquota \
++	convertquota
++if WITH_RPC
++sbin_PROGRAMS += \
+ 	rpc.rquotad
++endif
+ if WITH_NETLINK
+ sbin_PROGRAMS += \
+ 	quota_nld
+-- 
+2.7.1
+

diff --git a/sys-fs/quota/files/quota-4.03-noldap_linking.patch b/sys-fs/quota/files/quota-4.03-noldap_linking.patch
new file mode 100644
index 0000000..dbaca69b
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-noldap_linking.patch
@@ -0,0 +1,75 @@
+commit 1d9542df5d2ae5c21a1e96d100f899b3d7b2f27c
+Author: Jan Kara <jack@suse.cz>
+Date:   Tue Jan 19 11:40:15 2016 +0100
+
+    Don't link all binaries with ldap library
+    
+    The default action-if-found of AC_CHECK_LIB() is to append checked
+    library to LIBS. Thus check for ldap library resulted in unwanted
+    addition of -lldap to LIBS as [] is an empty string in M4 and the
+    default action is used.
+    
+    Fix the problem by providing proper action-if-found which was currently
+    just hidden behind the check. Also do similar cleanup for
+    AC_CHECK_HEADER check although there it didn't have any undesired
+    side-effect.
+    
+    Reported-by: Petr Písař <petrp@users.sf.net>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/configure.ac b/configure.ac
+index 68d5924..d17b18c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,18 +72,17 @@ AC_ARG_ENABLE([ldapmail],
+     [enable_ldapmail=auto]
+ )
+ AS_IF([test "x$enable_ldapmail" != "xno"], [
+-    build_ldap="yes"
+-    AC_CHECK_LIB([ldap], [ldap_initialize], [], [
++    AC_CHECK_LIB([ldap], [ldap_initialize], [
++	build_ldap="yes"
++        LDAP_LIBS="-lldap -llber"
++        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
++        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
++    ], [
+         build_ldap="no"
+         AS_IF([test "x$enable_ldapmail" = "xyes"], [
+             AC_MSG_ERROR([LDAP support required but library not found.]);
+         ])
+     ])
+-    AS_IF([test "x$build_ldap" = "xyes"], [
+-        LDAP_LIBS="-lldap -llber"
+-        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
+-        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
+-    ])
+ ], [
+     build_ldap="no"
+ ])
+@@ -163,8 +162,12 @@ AC_ARG_ENABLE([libwrap],
+     [enable_libwrap=auto]
+ )
+ AS_IF([test "x$enable_libwrap" != "xno"], [
+-    build_libwrap="yes"
+-    AC_CHECK_HEADER([tcpd.h],[], [
++    AC_CHECK_HEADER([tcpd.h], [
++    	build_libwrap="yes"
++        WRAP_LIBS="-lwrap"
++        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
++        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
++    ], [
+         build_libwrap="no"
+         AS_IF([test "x$enable_libwrap" = "xyes"] , [
+             AC_MSG_ERROR([tcpd.h not found and requested])
+@@ -172,11 +175,6 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
+             AC_MSG_WARN([tcpd.h not found])
+         ])
+     ])
+-    AS_IF([test "x$build_libwrap" != "xno"], [
+-        WRAP_LIBS="-lwrap"
+-        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
+-        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
+-    ])
+ ], [
+     build_libwrap="no"
+ ])

diff --git a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
new file mode 100644
index 0000000..d4fffd4
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
@@ -0,0 +1,27 @@
+commit ab2bf5b51a1ca14cef63e8a7a88b039f173a210a
+Author: Eric Sandeen <sandeen@redhat.com>
+Date:   Mon Jan 18 20:11:01 2016 -0600
+
+    repquota: -F option takes an arg
+    
+    Commit a5876145 added a new -O option which takes an
+    argument, but in the process lost the argument specifier
+    for "F".  As a result, the use of "-F" segfaults when NULL
+    is sent to name2fmt() instead of the provided argument.
+    
+    Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/repquota.c b/repquota.c
+index 744af70..6fe9f0c 100644
+--- a/repquota.c
++++ b/repquota.c
+@@ -90,7 +90,7 @@ static void parse_options(int argcnt, char **argstr)
+ 		{ NULL, 0, NULL, 0 }
+ 	};
+ 
+-	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiFO:", long_opts, NULL)) != -1) {
++	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiF:O:", long_opts, NULL)) != -1) {
+ 		switch (ret) {
+ 			case '?':
+ 			case 'h':

diff --git a/sys-fs/quota/files/quota-4.03-respect_docdir.patch b/sys-fs/quota/files/quota-4.03-respect_docdir.patch
new file mode 100644
index 0000000..214b3ad
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-respect_docdir.patch
@@ -0,0 +1,21 @@
+commit cac9a60c29106763cc6abd6f372f25f97d4122a3
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Mon Jan 4 15:26:36 2016 +0100
+
+    Respect the docdir declaration and do not override.
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/Makefile.am b/Makefile.am
+index a880ebe..7c7a866 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4
+ 
+ BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
+ 
+-docdir = $(datadir)/doc/@PACKAGE@
+ doc_DATA = \
+ 	README.mailserver \
+ 	README.ldap-support \

diff --git a/sys-fs/quota/quota-4.03.ebuild b/sys-fs/quota/quota-4.03.ebuild
new file mode 100644
index 0000000..a129780
--- /dev/null
+++ b/sys-fs/quota/quota-4.03.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://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 )
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	# Patches from upstream
+	"${FILESDIR}/${P}-fix_build_without_ldap.patch"
+	"${FILESDIR}/${P}-distribute_ldap-scripts.patch"
+	"${FILESDIR}/${P}-explicitely_print_disabled_options.patch"
+	"${FILESDIR}/${P}-respect_docdir.patch"
+	"${FILESDIR}/${P}-dont_override_cflags.patch"
+	"${FILESDIR}/${P}-default_fpic_fpie.patch"
+	"${FILESDIR}/${P}-repqouta_F_option_arg.patch"
+	"${FILESDIR}/${P}-noldap_linking.patch"
+
+	# Patches not (yet) upstreamed
+	"${FILESDIR}/${P}-no_rpc.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable ldap ldapmail) \
+		$(use_enable netlink) \
+		$(use_enable rpc) \
+		$(use_enable rpc rpcsetquota)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+	rm -r "${ED}"/usr/include || die #70938
+
+	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 ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe ldap-scripts/*.pl
+		doexe ldap-scripts/edquota_editor
+	fi
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/, sys-fs/quota/files/
@ 2019-04-29  0:25 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2019-04-29  0:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4ef6b79ce1ed8862e4d3bc6e04c68242a4b33f7b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 00:25:41 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 00:25:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef6b79c

sys-fs/quota: Removed old.

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/quota/Manifest                              |  1 -
 .../quota/files/quota-4.03-default_fpic_fpie.patch | 32 --------
 .../files/quota-4.03-distribute_ldap-scripts.patch | 23 ------
 .../files/quota-4.03-dont_override_cflags.patch    | 22 ------
 ...a-4.03-explicitely_print_disabled_options.patch | 69 ------------------
 .../files/quota-4.03-fix_build_without_ldap.patch  | 85 ----------------------
 sys-fs/quota/files/quota-4.03-no_rpc.patch         | 57 ---------------
 sys-fs/quota/files/quota-4.03-noldap_linking.patch | 75 -------------------
 .../files/quota-4.03-repqouta_F_option_arg.patch   | 27 -------
 sys-fs/quota/files/quota-4.03-respect_docdir.patch | 21 ------
 sys-fs/quota/quota-4.03.ebuild                     | 83 ---------------------
 sys-fs/quota/quota-4.04-r1.ebuild                  | 81 ---------------------
 12 files changed, 576 deletions(-)

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index a33aab6419d..43911e834b7 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,3 +1,2 @@
-DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727f4ff12e960da3251091b026c1458adecc0ed3a803da3bfcef6c857f612c44c7800ecc53c9ae53450d10338 SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8
 DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2

diff --git a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch b/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
deleted file mode 100644
index 2ff519f2b84..00000000000
--- a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit cd9dff0b5b53279442458360003831b6c14adc22
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Tue Jan 5 11:20:52 2016 +0100
-
-    Set -fPIC and -pie as default params when building
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/Makefile.am b/Makefile.am
-index 7c7a866..77f8400 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,5 @@
- ACLOCAL_AMFLAGS = -I m4
-+AM_LDFLAGS = -pie
- 
- BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
- 
-diff --git a/configure.ac b/configure.ac
-index 1552c15..68d5924 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
- # ================
- # Check for cflags
- # ================
--CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC"
- AC_ARG_ENABLE([werror],
-     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
-     [enable_werror="$enableval"],

diff --git a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
deleted file mode 100644
index 83339159e0f..00000000000
--- a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 861154efb90ed049e0473cc36935b8d03c78a869
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Mon Jan 4 13:01:36 2016 +0100
-
-    Distribute ldap-scripts directory too
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/Makefile.am b/Makefile.am
-index eb62617..a880ebe 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -52,7 +52,8 @@ EXTRA_DIST = \
- 	$(man_MANS) \
- 	$(rpcsvc_DATA) \
- 	autogen.sh \
--	Changelog
-+	Changelog \
-+	ldap-scripts
- 
- noinst_LIBRARIES = \
- 	libquota.a \

diff --git a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
deleted file mode 100644
index e59341a702a..00000000000
--- a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 776757a23e9930588950c7fcbc7827ec7a3e51c4
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Mon Jan 4 15:48:19 2016 +0100
-
-    Do not accidentaly override commandline passed CFLAGS.
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/configure.ac b/configure.ac
-index 3ba1386..1552c15 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
- # ================
- # Check for cflags
- # ================
--CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
- AC_ARG_ENABLE([werror],
-     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
-     [enable_werror="$enableval"],

diff --git a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
deleted file mode 100644
index 29627c03ab3..00000000000
--- a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 6ccb66159a9eee6ca114b11b70eb06f4ac6900d7
-Author: Jan Kara <jack@suse.cz>
-Date:   Mon Jan 4 15:36:27 2016 +0100
-
-    Print explicitely disabled options properly
-    
-    Currently we printed only an empty string when some build option was
-    disabled explicitely via --disable-foo. Print 'no' in that case as well.
-    
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/configure.ac b/configure.ac
-index 39631c4..3ba1386 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,7 +74,7 @@ AC_ARG_ENABLE([ldapmail],
- AS_IF([test "x$enable_ldapmail" != "xno"], [
-     build_ldap="yes"
-     AC_CHECK_LIB([ldap], [ldap_initialize], [], [
--        build_ldap=no
-+        build_ldap="no"
-         AS_IF([test "x$enable_ldapmail" = "xyes"], [
-             AC_MSG_ERROR([LDAP support required but library not found.]);
-         ])
-@@ -84,6 +84,8 @@ AS_IF([test "x$enable_ldapmail" != "xno"], [
-         AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
-         COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
-     ])
-+], [
-+    build_ldap="no"
- ])
- AC_SUBST(LDAP_LIBS)
- 
-@@ -113,6 +115,8 @@ AS_IF([test "x$enable_ext2direct" != "xno"], [
-         AC_DEFINE([EXT2_DIRECT], 1, [Scanning of ext? filesystems using e2fslib])
-         COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT"
-     ])
-+], [
-+   build_ext2direct="no"
- ])
- AC_SUBST(EXT2FS_CFLAGS)
- AC_SUBST(EXT2FS_LIBS)
-@@ -141,6 +145,8 @@ AS_IF([test "x$enable_netlink" != "xno"], [
-             AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.])
-         ])
-     ])
-+], [
-+    build_netlink="no"
- ])
- AM_CONDITIONAL([WITH_NETLINK], [test "x$build_netlink" != "xno"])
- AC_SUBST(DBUS_CFLAGS)
-@@ -171,6 +177,8 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
-         AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
-         COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
-     ])
-+], [
-+    build_libwrap="no"
- ])
- AC_SUBST(WRAP_LIBS)
- 
-@@ -199,6 +207,8 @@ AS_IF([test x"$enable_rpc" != "xno"], [
- 	AC_DEFINE([RPC], 1, [Support for RPC])
- 	COMPILE_OPTS="$COMPILE_OPTS RPC"
-     ])
-+], [
-+    build_rpc="no"
- ])
- AM_CONDITIONAL([WITH_RPC], [test x"$build_rpc" != "xno"])
- 

diff --git a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
deleted file mode 100644
index ba838bfe283..00000000000
--- a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-commit 39fd30ce57e3c34c3649866bf9345a71f0b78667
-Author: Jan Kara <jack@suse.cz>
-Date:   Mon Jan 4 15:10:53 2016 +0100
-
-    Fix build with disabled ldap
-    
-    Reported-by: Tomas Chvatal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/warnquota.c b/warnquota.c
-index 3734f0e..e9868c1 100644
---- a/warnquota.c
-+++ b/warnquota.c
-@@ -109,13 +109,13 @@ struct configparams {
- 	char *user_signature;
- 	char *group_message;
- 	char *group_signature;
-+	time_t cc_before;
-+#ifdef USE_LDAP_MAIL_LOOKUP
- 	int use_ldap_mail; /* 0 */
-+	int ldap_is_setup; /* 0 */
- 	int ldap_starttls; /* 0 */
- 	int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */
- 	int ldap_vers; /* LDAP_VERSION3 */
--	time_t cc_before;
--#ifdef USE_LDAP_MAIL_LOOKUP
--	int ldap_is_setup; /* 0 */
- 	char ldap_host[CNF_BUFFER];
- 	int ldap_port;
- 	char ldap_uri[CNF_BUFFER];
-@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config)
- 	}
- 	maildev[0] = 0;
- 	config->user_signature = config->user_message = config->group_signature = config->group_message = NULL;
-+	config->cc_before = -1;
-+
-+#ifdef USE_LDAP_MAIL_LOOKUP
- 	config->use_ldap_mail = 0;
- 	config->ldap_starttls = 0;
- 	config->ldap_tls = LDAP_OPT_X_TLS_NEVER;
- 	config->ldap_vers = LDAP_VERSION3;
--	config->cc_before = -1;
--
--#ifdef USE_LDAP_MAIL_LOOKUP
- 	config->ldap_port = config->ldap_is_setup = 0;
- 	config->ldap_host[0] = 0;
- 	config->ldap_uri[0] = 0;
-@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config)
- 				create_eoln(config->group_signature);
- 				verify_format(config->group_signature, "GROUP_SIGNATURE");
- 			}
-+			else if (!strcmp(var, "CC_BEFORE")) {
-+				int num;
-+				char unit[10];
-+
-+				if (sscanf(value, "%d%s", &num, unit) != 2)
-+					goto cc_parse_err;
-+				if (str2timeunits(num, unit, &config->cc_before) < 0) {
-+cc_parse_err:
-+					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
-+				}
-+			}
-+#ifdef USE_LDAP_MAIL_LOOKUP
- 			else if (!strcmp(var, "LDAP_MAIL")) {
- 				if(strcasecmp(value, "true") == 0) 
- 					config->use_ldap_mail = 1;
-@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config)
- 				else
- 					config->ldap_starttls = 0;
- 			}
--			else if (!strcmp(var, "CC_BEFORE")) {
--				int num;
--				char unit[10];
--
--				if (sscanf(value, "%d%s", &num, unit) != 2)
--					goto cc_parse_err;
--				if (str2timeunits(num, unit, &config->cc_before) < 0) {
--cc_parse_err:
--					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
--				}
--			}
--#ifdef USE_LDAP_MAIL_LOOKUP
- 			else if (!strcmp(var, "LDAP_HOST"))
- 				sstrncpy(config->ldap_host, value, CNF_BUFFER);
- 			else if (!strcmp(var, "LDAP_PORT"))

diff --git a/sys-fs/quota/files/quota-4.03-no_rpc.patch b/sys-fs/quota/files/quota-4.03-no_rpc.patch
deleted file mode 100644
index c4f5007fca5..00000000000
--- a/sys-fs/quota/files/quota-4.03-no_rpc.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 07ec5c783ac16ed20735d6cb8ab167833f5877ee Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 15 Feb 2016 14:36:28 +0100
-Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested.
-
-This fixes a buch of undefined references:
-
-x86_64-pc-linux-gnu-gcc  -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa
-ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st
-yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_
-svc.o svc_socket.o libquota.a
-rquota_svc.o: In function `rquotaprog_2':
-rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args'
-rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args'
-rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args'
-rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args'
-rquota_svc.o: In function `rquotaprog_1':
-rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args'
-rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args'
-rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args'
-rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args'
-collect2: error: ld returned 1 exit status
-Makefile:901: recipe for target 'rpc.rquotad' failed
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 77f8400..6d7ea0e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -116,8 +116,11 @@ sbin_PROGRAMS = \
- 	xqmstats \
- 	edquota \
- 	setquota \
--	convertquota \
-+	convertquota
-+if WITH_RPC
-+sbin_PROGRAMS += \
- 	rpc.rquotad
-+endif
- if WITH_NETLINK
- sbin_PROGRAMS += \
- 	quota_nld
--- 
-2.7.1
-

diff --git a/sys-fs/quota/files/quota-4.03-noldap_linking.patch b/sys-fs/quota/files/quota-4.03-noldap_linking.patch
deleted file mode 100644
index dbaca69bb7d..00000000000
--- a/sys-fs/quota/files/quota-4.03-noldap_linking.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-commit 1d9542df5d2ae5c21a1e96d100f899b3d7b2f27c
-Author: Jan Kara <jack@suse.cz>
-Date:   Tue Jan 19 11:40:15 2016 +0100
-
-    Don't link all binaries with ldap library
-    
-    The default action-if-found of AC_CHECK_LIB() is to append checked
-    library to LIBS. Thus check for ldap library resulted in unwanted
-    addition of -lldap to LIBS as [] is an empty string in M4 and the
-    default action is used.
-    
-    Fix the problem by providing proper action-if-found which was currently
-    just hidden behind the check. Also do similar cleanup for
-    AC_CHECK_HEADER check although there it didn't have any undesired
-    side-effect.
-    
-    Reported-by: Petr Písař <petrp@users.sf.net>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/configure.ac b/configure.ac
-index 68d5924..d17b18c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,18 +72,17 @@ AC_ARG_ENABLE([ldapmail],
-     [enable_ldapmail=auto]
- )
- AS_IF([test "x$enable_ldapmail" != "xno"], [
--    build_ldap="yes"
--    AC_CHECK_LIB([ldap], [ldap_initialize], [], [
-+    AC_CHECK_LIB([ldap], [ldap_initialize], [
-+	build_ldap="yes"
-+        LDAP_LIBS="-lldap -llber"
-+        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
-+        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
-+    ], [
-         build_ldap="no"
-         AS_IF([test "x$enable_ldapmail" = "xyes"], [
-             AC_MSG_ERROR([LDAP support required but library not found.]);
-         ])
-     ])
--    AS_IF([test "x$build_ldap" = "xyes"], [
--        LDAP_LIBS="-lldap -llber"
--        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
--        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
--    ])
- ], [
-     build_ldap="no"
- ])
-@@ -163,8 +162,12 @@ AC_ARG_ENABLE([libwrap],
-     [enable_libwrap=auto]
- )
- AS_IF([test "x$enable_libwrap" != "xno"], [
--    build_libwrap="yes"
--    AC_CHECK_HEADER([tcpd.h],[], [
-+    AC_CHECK_HEADER([tcpd.h], [
-+    	build_libwrap="yes"
-+        WRAP_LIBS="-lwrap"
-+        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
-+        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
-+    ], [
-         build_libwrap="no"
-         AS_IF([test "x$enable_libwrap" = "xyes"] , [
-             AC_MSG_ERROR([tcpd.h not found and requested])
-@@ -172,11 +175,6 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
-             AC_MSG_WARN([tcpd.h not found])
-         ])
-     ])
--    AS_IF([test "x$build_libwrap" != "xno"], [
--        WRAP_LIBS="-lwrap"
--        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
--        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
--    ])
- ], [
-     build_libwrap="no"
- ])

diff --git a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
deleted file mode 100644
index d4fffd4f03f..00000000000
--- a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit ab2bf5b51a1ca14cef63e8a7a88b039f173a210a
-Author: Eric Sandeen <sandeen@redhat.com>
-Date:   Mon Jan 18 20:11:01 2016 -0600
-
-    repquota: -F option takes an arg
-    
-    Commit a5876145 added a new -O option which takes an
-    argument, but in the process lost the argument specifier
-    for "F".  As a result, the use of "-F" segfaults when NULL
-    is sent to name2fmt() instead of the provided argument.
-    
-    Signed-off-by: Eric Sandeen <sandeen@redhat.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/repquota.c b/repquota.c
-index 744af70..6fe9f0c 100644
---- a/repquota.c
-+++ b/repquota.c
-@@ -90,7 +90,7 @@ static void parse_options(int argcnt, char **argstr)
- 		{ NULL, 0, NULL, 0 }
- 	};
- 
--	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiFO:", long_opts, NULL)) != -1) {
-+	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiF:O:", long_opts, NULL)) != -1) {
- 		switch (ret) {
- 			case '?':
- 			case 'h':

diff --git a/sys-fs/quota/files/quota-4.03-respect_docdir.patch b/sys-fs/quota/files/quota-4.03-respect_docdir.patch
deleted file mode 100644
index 214b3ad1f17..00000000000
--- a/sys-fs/quota/files/quota-4.03-respect_docdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit cac9a60c29106763cc6abd6f372f25f97d4122a3
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Mon Jan 4 15:26:36 2016 +0100
-
-    Respect the docdir declaration and do not override.
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/Makefile.am b/Makefile.am
-index a880ebe..7c7a866 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4
- 
- BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
- 
--docdir = $(datadir)/doc/@PACKAGE@
- doc_DATA = \
- 	README.mailserver \
- 	README.ldap-support \

diff --git a/sys-fs/quota/quota-4.03.ebuild b/sys-fs/quota/quota-4.03.ebuild
deleted file mode 100644
index 2bab377c69b..00000000000
--- a/sys-fs/quota/quota-4.03.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-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 )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	# Patches from upstream
-	"${FILESDIR}/${P}-fix_build_without_ldap.patch"
-	"${FILESDIR}/${P}-distribute_ldap-scripts.patch"
-	"${FILESDIR}/${P}-explicitely_print_disabled_options.patch"
-	"${FILESDIR}/${P}-respect_docdir.patch"
-	"${FILESDIR}/${P}-dont_override_cflags.patch"
-	"${FILESDIR}/${P}-default_fpic_fpie.patch"
-	"${FILESDIR}/${P}-repqouta_F_option_arg.patch"
-	"${FILESDIR}/${P}-noldap_linking.patch"
-
-	# Patches not (yet) upstreamed
-	"${FILESDIR}/${P}-no_rpc.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable netlink) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-	rm -r "${ED}"/usr/include || die #70938
-
-	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
-}

diff --git a/sys-fs/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild
deleted file mode 100644
index 9b5fdbca442..00000000000
--- a/sys-fs/quota/quota-4.04-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 ~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
-		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
-		net-libs/libtirpc
-		net-libs/rpcsvc-proto
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glibc226.patch"
-)
-
-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
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-04-29  0:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-29  0:25 [gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/, sys-fs/quota/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2016-02-15 13:58 Lars Wendler
2016-02-15 13:58 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox