Version bump. Removed old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

11 files changed, 31 insertions, 465 deletions

diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog
index 5e489dcdcb7c..20477826072c 100644
--- a/sys-fs/quota/ChangeLog
+++ b/sys-fs/quota/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/quota
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.66 2014/04/21 10:53:25 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.67 2014/12/15 09:20:54 polynomial-c Exp $
+
+*quota-4.02 (15 Dec 2014)
+
+  15 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -quota-3.14-r1.ebuild,
+  -quota-3.15.ebuild, -quota-3.16.ebuild, -quota-3.17.ebuild,
+  -quota-4.00.ebuild, +quota-4.02.ebuild, -files/quota-3.06-no-stripping.patch,
+  -files/quota-3.13-configure-LANG.patch, -files/quota-3.14-headers.patch,
+  -files/quota.rc, -files/quota.rc6:
+  Version bump. Removed old.
 
   21 Apr 2014; Julian Ospald <hasufell@gentoo.org> quota-4.01.ebuild,
   +files/quota-4.01-cflags.patch:
diff --git a/sys-fs/quota/files/quota-3.06-no-stripping.patch b/sys-fs/quota/files/quota-3.06-no-stripping.patch
deleted file mode 100644
index 0ab5385a454b..000000000000
--- a/sys-fs/quota/files/quota-3.06-no-stripping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/quota-3.13-configure-LANG.patch b/sys-fs/quota/files/quota-3.13-configure-LANG.patch
deleted file mode 100644
index 663bf0b28a8f..000000000000
--- a/sys-fs/quota/files/quota-3.13-configure-LANG.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/sys-fs/quota/files/quota-3.14-headers.patch b/sys-fs/quota/files/quota-3.14-headers.patch
deleted file mode 100644
index 54bb6772b0ac..000000000000
--- a/sys-fs/quota/files/quota-3.14-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- quota.c
-+++ quota.c
-@@ -43,6 +43,7 @@
- #include <sys/param.h>
- #include <getopt.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <pwd.h>
- #include <grp.h>
- #include <time.h>
diff --git a/sys-fs/quota/files/quota.rc b/sys-fs/quota/files/quota.rc
deleted file mode 100644
index 58e81872a4c9..000000000000
--- a/sys-fs/quota/files/quota.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/files/quota.rc,v 1.1 2004/10/03 10:28:05 vapier Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting Quota"
-	if [ -x /sbin/quotacheck ]
-	then
-		echo "Checking quotas. This may take some time."
-		/sbin/quotacheck -avug
-		echo "Done."
-	fi
-	if [ -x /sbin/quotaon ]
-	then
-		echo "Turning on quota"
-		/sbin/quotaon -avug
-	fi
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping quota"
-	if [ -x /sbin/quotaoff ]
-	then
-		echo "Turning quota off"
-		/sbin/quotaoff -avug
-	fi
-	eend $?
-}
diff --git a/sys-fs/quota/files/quota.rc6 b/sys-fs/quota/files/quota.rc6
deleted file mode 100644
index 75e6e80ca0fb..000000000000
--- a/sys-fs/quota/files/quota.rc6
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/files/quota.rc6,v 1.4 2012/12/08 19:50:27 vapier Exp $
-
-depend() {
-	need localmount
-	use portmap
-}
-
-start() {
-	if [ "${RUN_QUOTACHECK}" = "yes" ] ; then
-		ebegin "Checking quotas (may take a while)"
-		/usr/sbin/quotacheck ${QUOTACHECK_OPTS}
-		eend $?
-	fi
-
-	ebegin "Starting quota"
-	/usr/sbin/quotaon ${QUOTAON_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping quota"
-	/usr/sbin/quotaoff ${QUOTAOFF_OPTS}
-	eend $?
-}
diff --git a/sys-fs/quota/quota-3.14-r1.ebuild b/sys-fs/quota/quota-3.14-r1.ebuild
deleted file mode 100644
index 4dd9085c8987..000000000000
--- a/sys-fs/quota/quota-3.14-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.14-r1.ebuild,v 1.10 2011/02/06 11:03:20 leio Exp $
-
-inherit eutils flag-o-matic
-
-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 hppa ia64 ~mips ppc sparc x86"
-IUSE="nls tcpd ldap rpc"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	tcpd? ( sys-apps/tcp-wrappers )
-	rpc? ( net-nds/portmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/quota-tools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-3.13-configure-LANG.patch #131432
-	epatch "${FILESDIR}"/${PN}-3.14-headers.patch
-
-	# patch to prevent quotactl.2 manpage from being installed
-	# that page is provided by man-pages instead
-	epatch "${FILESDIR}"/${PN}-no-quotactl-manpage.patch
-
-	# Don't strip binaries (from Fedora)
-	epatch "${FILESDIR}"/quota-3.06-no-stripping.patch
-
-	append-cppflags -DLDAP_DEPRECATED=1
-
-	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
-}
-
-src_compile() {
-	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}}
-	emake ROOTDIR="${D}" install || die
-	rm -r "${D}"/usr/include #70938
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	dodoc doc/*
-	dodoc README.*
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/quota.rc6 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	else
-		rm -f "${D}"/usr/sbin/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
-}
diff --git a/sys-fs/quota/quota-3.15.ebuild b/sys-fs/quota/quota-3.15.ebuild
deleted file mode 100644
index d161f10d0d1e..000000000000
--- a/sys-fs/quota/quota-3.15.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.15.ebuild,v 1.6 2009/01/21 20:22:45 jer Exp $
-
-inherit eutils flag-o-matic
-
-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 hppa ia64 ~mips ppc sparc x86"
-IUSE="nls tcpd ldap rpc"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	rpc? ( net-nds/portmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/quota-tools
-
-src_unpack() {
-	unpack ${A}
-	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
-
-	# Don't strip binaries (from Fedora)
-	epatch "${FILESDIR}"/quota-3.06-no-stripping.patch
-
-	# This was for openldap-2.2 support before,
-	# Now we only support >=2.3
-	append-cppflags -DLDAP_DEPRECATED=0
-
-	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake ROOTDIR="${D}" install || die
-	rm -r "${D}"/usr/include || die #70938
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	dodoc doc/*
-	dodoc README.*
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/quota.rc6 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	else
-		rm -f "${D}"/usr/sbin/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
-}
diff --git a/sys-fs/quota/quota-3.16.ebuild b/sys-fs/quota/quota-3.16.ebuild
deleted file mode 100644
index 343efba41790..000000000000
--- a/sys-fs/quota/quota-3.16.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.16.ebuild,v 1.1 2008/11/20 00:41:06 vapier Exp $
-
-inherit eutils flag-o-matic
-
-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 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="nls tcpd ldap rpc"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	rpc? ( net-nds/portmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/quota-tools
-
-src_unpack() {
-	unpack ${A}
-	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
-
-	# This was for openldap-2.2 support before,
-	# Now we only support >=2.3
-	append-cppflags -DLDAP_DEPRECATED=0
-
-	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake STRIP="" ROOTDIR="${D}" install || die
-	rm -r "${D}"/usr/include || die #70938
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	dodoc doc/*
-	dodoc README.*
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/quota.rc6 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	else
-		rm -f "${D}"/usr/sbin/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
-}
diff --git a/sys-fs/quota/quota-3.17.ebuild b/sys-fs/quota/quota-3.17.ebuild
deleted file mode 100644
index c9af3f528ade..000000000000
--- a/sys-fs/quota/quota-3.17.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.17.ebuild,v 1.12 2011/04/22 09:59:18 jlec Exp $
-
-inherit eutils flag-o-matic
-
-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="nls tcpd ldap rpc"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	rpc? ( || ( net-nds/portmap net-nds/rpcbind ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/quota-tools
-
-src_unpack() {
-	unpack ${A}
-	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
-
-	# This was for openldap-2.2 support before,
-	# Now we only support >=2.3
-	append-cppflags -DLDAP_DEPRECATED=0
-
-	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake STRIP="" ROOTDIR="${D}" install || die
-	rm -r "${D}"/usr/include || die #70938
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	rm -rf doc/CVS
-	dodoc doc/*
-	dodoc README.*
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/quota.rc6 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	else
-		rm -f "${D}"/usr/sbin/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
-}
diff --git a/sys-fs/quota/quota-4.00.ebuild b/sys-fs/quota/quota-4.02.ebuild
index 580dcc10f11c..c191112b3f8c 100644
--- a/sys-fs/quota/quota-4.00.ebuild
+++ b/sys-fs/quota/quota-4.02.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-4.00.ebuild,v 1.3 2012/12/24 02:29:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-4.02.ebuild,v 1.1 2014/12/15 09:20:54 polynomial-c Exp $
 
-EAPI="2"
+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
 }
 
 src_configure() {
@@ -41,30 +51,28 @@ src_configure() {
 }
 
 src_install() {
-	emake STRIP="" ROOTDIR="${D}" install || die
+	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
-	doins warnquota.conf quotatab || die
+	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
-	else
-		rm -f "${D}"/usr/sbin/rpc.rquotad
 	fi
 
 	if use ldap ; then
 		insinto /etc/openldap/schema
 		insopts -m0644
-		doins ldap-scripts/quota.schema || die
+		doins ldap-scripts/quota.schema
 
 		exeinto /usr/share/quota/ldap-scripts
-		doexe ldap-scripts/*.pl || die
-		doexe ldap-scripts/edquota_editor || die
+		doexe ldap-scripts/*.pl
+		doexe ldap-scripts/edquota_editor
 	fi
 }