quotactl.2 manpage collision with sys-apps/manpages

7 files changed, 86 insertions, 27 deletions

diff --git a/sys-apps/quota/ChangeLog b/sys-apps/quota/ChangeLog
index 233d4857aefa..20948d1cff07 100644
--- a/sys-apps/quota/ChangeLog
+++ b/sys-apps/quota/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/quota
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/ChangeLog,v 1.18 2003/11/23 23:49:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/ChangeLog,v 1.19 2003/12/10 10:18:57 seemant Exp $
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> quota-3.06-r1.ebuild,
+  quota-3.06-r2.ebuild, quota-3.06.ebuild, quota-3.09.ebuild,
+  files/quota-no-quotactl-manpage.patch:
+  patch to make quotactl.2 manpage not install, because sys-apps/manpages offers
+  a better version
 
   23 Nov 2003; Seemant Kulleen <seemant@gentoo.org> quota-3.06-r2.ebuild,
   quota-3.09.ebuild:
diff --git a/sys-apps/quota/Manifest b/sys-apps/quota/Manifest
index bcec4fb8e47d..fac21e15b685 100644
--- a/sys-apps/quota/Manifest
+++ b/sys-apps/quota/Manifest
@@ -1,11 +1,12 @@
-MD5 d09b84f0a4617b168b8abc1cc598ae9c ChangeLog 3046
+MD5 435eff5ff8bd36fae5e4e4f9e371a2e7 quota-3.06.ebuild 1043
+MD5 5d668f51c8afb4c543aa363316d932fc quota-3.06-r2.ebuild 1223
+MD5 b80f9464e51dc32d41dfedb8a8790740 quota-3.06-r1.ebuild 1106
+MD5 a6779d5af06dd0d7d6329599d8264b6e quota-3.09.ebuild 1200
+MD5 4df9611cfe690a8c909a35146f54bb08 ChangeLog 3324
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 4668abbe04d7918e598bb9b21c831155 quota-3.06-r1.ebuild 884
-MD5 868993f88d9ff1e6ce1df372bd93f237 quota-3.06-r2.ebuild 1021
-MD5 bccad1fe62cc1ac9e1828e8dc992b798 quota-3.06.ebuild 820
-MD5 ca449a928234162a70013ae67f5ae659 quota-3.09.ebuild 1018
+MD5 0d3ff3aaef898c9bb1d7243e20e93913 files/quota-no-quotactl-manpage.patch 958
+MD5 a26d206672c294341ce1ebed4acc45b1 files/quota.rc 441
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06 62
+MD5 0a55ad0559999fe3044a502022c513ed files/digest-quota-3.09 62
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r1 62
 MD5 fe63ca32e32411f6aa067fdc6d451ae9 files/digest-quota-3.06-r2 62
-MD5 0a55ad0559999fe3044a502022c513ed files/digest-quota-3.09 62
-MD5 a26d206672c294341ce1ebed4acc45b1 files/quota.rc 441
diff --git a/sys-apps/quota/files/quota-no-quotactl-manpage.patch b/sys-apps/quota/files/quota-no-quotactl-manpage.patch
new file mode 100644
index 000000000000..bf0014d0459f
--- /dev/null
+++ b/sys-apps/quota/files/quota-no-quotactl-manpage.patch
@@ -0,0 +1,19 @@
+diff -urN quota-tools.orig/Makefile.in quota-tools/Makefile.in
+--- quota-tools.orig/Makefile.in	2003-04-08 06:04:25.000000000 -0700
++++ quota-tools/Makefile.in	2003-12-10 02:07:40.000000000 -0800
+@@ -88,7 +88,6 @@
+ 	-$(INSTALL) -m $(DEF_CONF_MODE) quotatab $(ROOTDIR)$(sysconfdir)
+ 	-$(INSTALL) -m $(DEF_CONF_MODE) quotagrpadmins $(ROOTDIR)$(sysconfdir)
+ 	-mkdir -p $(ROOTDIR)$(mandir)/man1
+-	-mkdir -p $(ROOTDIR)$(mandir)/man2
+ 	-mkdir -p $(ROOTDIR)$(mandir)/man3
+ 	-mkdir -p $(ROOTDIR)$(mandir)/man8
+ 	-$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc
+@@ -96,7 +95,6 @@
+ 	-$(INSTALL) -s -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
+ 	-$(INSTALL) -s -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
+ 	-$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3
+ 	-$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8
+ 
diff --git a/sys-apps/quota/quota-3.06-r1.ebuild b/sys-apps/quota/quota-3.06-r1.ebuild
index f2e29623da0f..b56ba6eccbb6 100644
--- a/sys-apps/quota/quota-3.06-r1.ebuild
+++ b/sys-apps/quota/quota-3.06-r1.ebuild
@@ -1,22 +1,31 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r1.ebuild,v 1.8 2003/12/10 10:06:45 trance Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r1.ebuild,v 1.9 2003/12/10 10:18:57 seemant Exp $
 
 IUSE="nls"
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 RESTRICT="nomirror"
-HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc "
+KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips amd64 ~ia64"
 
 DEPEND="virtual/glibc
 	sys-apps/tcp-wrappers"
 
+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
+}
+
 src_install() {
 	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,2,3,8}}
 	make ROOTDIR=${D} install || die
diff --git a/sys-apps/quota/quota-3.06-r2.ebuild b/sys-apps/quota/quota-3.06-r2.ebuild
index babb6b543e7b..2a36223125f5 100644
--- a/sys-apps/quota/quota-3.06-r2.ebuild
+++ b/sys-apps/quota/quota-3.06-r2.ebuild
@@ -1,30 +1,38 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r2.ebuild,v 1.2 2003/11/23 23:49:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r2.ebuild,v 1.3 2003/12/10 10:18:57 seemant Exp $
 
 IUSE="nls tcpd"
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
 RESTRICT="nomirror"
-HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
 
 DEPEND="virtual/glibc
 	tcpd? ( sys-apps/tcp-wrappers )"
 
-src_compile() {
+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
+
 	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
-	econf || die
-	emake || die
 }
 
 src_install() {
 	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,2,3,8}}
+
+	rm -f quotactl.2
 	make ROOTDIR=${D} install || die
 #	install -m 644 warnquota.conf ${D}/etc
 	insinto /etc
diff --git a/sys-apps/quota/quota-3.06.ebuild b/sys-apps/quota/quota-3.06.ebuild
index 411d60a190d5..cd936c330df9 100644
--- a/sys-apps/quota/quota-3.06.ebuild
+++ b/sys-apps/quota/quota-3.06.ebuild
@@ -1,20 +1,30 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06.ebuild,v 1.11 2003/10/28 12:55:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06.ebuild,v 1.12 2003/12/10 10:18:57 seemant Exp $
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
 RESTRICT="nomirror"
-HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha ~hppa ~mips ~arm ~ia64"
 
 DEPEND="virtual/glibc
 	sys-apps/tcp-wrappers"
 
+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
+}
+
 src_compile() {
 	econf || die "./configure failed"
 	emake || die
diff --git a/sys-apps/quota/quota-3.09.ebuild b/sys-apps/quota/quota-3.09.ebuild
index cd8b70ac9b57..59d6c761ab5f 100644
--- a/sys-apps/quota/quota-3.09.ebuild
+++ b/sys-apps/quota/quota-3.09.ebuild
@@ -1,30 +1,36 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.09.ebuild,v 1.2 2003/11/23 23:49:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.09.ebuild,v 1.3 2003/12/10 10:18:57 seemant Exp $
 
 IUSE="nls tcpd"
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
 RESTRICT="nomirror"
-HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
 
 DEPEND="virtual/glibc
 	tcpd? ( sys-apps/tcp-wrappers )"
 
-src_compile() {
+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
+
 	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
-	econf || die
-	emake || die
 }
 
 src_install() {
-	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,2,3,8}}
+	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,3,8}}
 	make ROOTDIR=${D} install || die
 #	install -m 644 warnquota.conf ${D}/etc
 	insinto /etc