From 4bc6db7851406873548a0ef41f2c5e87f1fc07bd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 13 Apr 2007 10:45:05 +0000 Subject: [PATCH] Dont install rpc stuf when USE=-rpc #174208 by Simon Arlott. Package-Manager: portage-2.1.2.3 --- sys-fs/quota/ChangeLog | 7 ++- sys-fs/quota/Manifest | 32 ++++++---- sys-fs/quota/files/digest-quota-3.14-r1 | 3 + sys-fs/quota/quota-3.14-r1.ebuild | 82 +++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 sys-fs/quota/files/digest-quota-3.14-r1 create mode 100644 sys-fs/quota/quota-3.14-r1.ebuild diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog index ab1321af347d..19d26a49c541 100644 --- a/sys-fs/quota/ChangeLog +++ b/sys-fs/quota/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/quota # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.20 2007/04/06 20:53:11 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.21 2007/04/13 10:45:05 vapier Exp $ + +*quota-3.14-r1 (13 Apr 2007) + + 13 Apr 2007; Mike Frysinger +quota-3.14-r1.ebuild: + Dont install rpc stuf when USE=-rpc #174208 by Simon Arlott. 06 Apr 2007; Brent Baude quota-3.13.ebuild: Marking quota ppc for bug #172154 diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest index 7ec7404ba3a3..932e0daf5623 100644 --- a/sys-fs/quota/Manifest +++ b/sys-fs/quota/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX quota-3.06-no-stripping.patch 583 RMD160 7ccf602a30a714284b2f1fb205c6b7f36601a64f SHA1 f2ba9a26a260fdaec8028f8e7dd18c276f5f561d SHA256 89840a957563191b3bec910c8564fc46c00f972e46409aa3bc329d6966985d25 MD5 e7dd5ca4d40c611ea2f88232e50431e9 files/quota-3.06-no-stripping.patch 583 RMD160 7ccf602a30a714284b2f1fb205c6b7f36601a64f files/quota-3.06-no-stripping.patch 583 @@ -41,14 +44,14 @@ EBUILD quota-3.13.ebuild 1831 RMD160 f4d6ad4d4d80af1441fcd33c3465080b63151dc6 SH MD5 7a940ead73556adc10ed84091a63648a quota-3.13.ebuild 1831 RMD160 f4d6ad4d4d80af1441fcd33c3465080b63151dc6 quota-3.13.ebuild 1831 SHA256 a00a40607e984bcfe87e73ea15d5719356557b48b71609f1c3c15f199536f040 quota-3.13.ebuild 1831 -EBUILD quota-3.14.ebuild 1897 RMD160 860683a91a9482b8de1c4171bd04baad9c16431b SHA1 dedd8ac0c04a9be9e0bc51d02a05709b39efa567 SHA256 feb6b295bdae38f7a93f24d890fe1b775564f27e56bfd996f2e657e13a8dcddd -MD5 687906303eb0e7c260f2d2af3746f23d quota-3.14.ebuild 1897 -RMD160 860683a91a9482b8de1c4171bd04baad9c16431b quota-3.14.ebuild 1897 -SHA256 feb6b295bdae38f7a93f24d890fe1b775564f27e56bfd996f2e657e13a8dcddd quota-3.14.ebuild 1897 -MISC ChangeLog 7032 RMD160 ad564c469eb97a00b2e28bba7009cf0e319cb8a4 SHA1 b0b0ede9c02410bfda93ef65e5c59c5f6c27fc51 SHA256 bf4cba0bc26825631964495c5ba61c979d17883f16c28311e958e980ca35b3d4 -MD5 e4251a724a76f51c9c22360801efbc3f ChangeLog 7032 -RMD160 ad564c469eb97a00b2e28bba7009cf0e319cb8a4 ChangeLog 7032 -SHA256 bf4cba0bc26825631964495c5ba61c979d17883f16c28311e958e980ca35b3d4 ChangeLog 7032 +EBUILD quota-3.14-r1.ebuild 1967 RMD160 627075911d9ff96149f6811857090e078bb6ff6c SHA1 8a789c2152c04b1cd5f327d92bfb08e6ebecfc69 SHA256 3a793efbf33cf97837488928255673fb8a1824f2ed7ff361325f161dedbbe3ff +MD5 83698b5b6f7c4e16e0c2d871454883d6 quota-3.14-r1.ebuild 1967 +RMD160 627075911d9ff96149f6811857090e078bb6ff6c quota-3.14-r1.ebuild 1967 +SHA256 3a793efbf33cf97837488928255673fb8a1824f2ed7ff361325f161dedbbe3ff quota-3.14-r1.ebuild 1967 +MISC ChangeLog 7199 RMD160 4753780dc87ad1520a1bd819b34fb6ba836ce3d8 SHA1 a76392d404bdb4daca7e616bb4e8890c79c1f07b SHA256 9038f38e2ad7c62fc0534b6b040aabbc75922c98f322f14895dd58db1ace1834 +MD5 745812a65ce78b19eb360bb394717a80 ChangeLog 7199 +RMD160 4753780dc87ad1520a1bd819b34fb6ba836ce3d8 ChangeLog 7199 +SHA256 9038f38e2ad7c62fc0534b6b040aabbc75922c98f322f14895dd58db1ace1834 ChangeLog 7199 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -59,6 +62,13 @@ SHA256 618acae87685428ed4b44556d1d6ca0054a5ec40f8f91426666ee7ba3d0fefb1 files/di MD5 0e30faf8d12f4e8da14d1fd9c324f940 files/digest-quota-3.13 232 RMD160 e892a5bc8cc281e6dc13078bad4340aa82533b0a files/digest-quota-3.13 232 SHA256 4d4e73469f406f6e2c741294ece82511f9008da16707970be174644f40655b4d files/digest-quota-3.13 232 -MD5 37131a36be21bf4f6e8f4aaa5b7ae2ee files/digest-quota-3.14 232 -RMD160 7540ee574b2a7c369950e4b633a86fb0606447dd files/digest-quota-3.14 232 -SHA256 96ade84b7117b1ccb61ead95571b069cd5b95cc2f9a93c42c247a81fc9984a31 files/digest-quota-3.14 232 +MD5 37131a36be21bf4f6e8f4aaa5b7ae2ee files/digest-quota-3.14-r1 232 +RMD160 7540ee574b2a7c369950e4b633a86fb0606447dd files/digest-quota-3.14-r1 232 +SHA256 96ade84b7117b1ccb61ead95571b069cd5b95cc2f9a93c42c247a81fc9984a31 files/digest-quota-3.14-r1 232 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGH19j8bi6rjpTunYRAtr8AJ0ay77KEdmqLs5gyus52bX9dgVxTQCgvD1V +9PSXRbdZnRnUVLxm3Uq9sG4= +=3l/S +-----END PGP SIGNATURE----- diff --git a/sys-fs/quota/files/digest-quota-3.14-r1 b/sys-fs/quota/files/digest-quota-3.14-r1 new file mode 100644 index 000000000000..e24c9b388848 --- /dev/null +++ b/sys-fs/quota/files/digest-quota-3.14-r1 @@ -0,0 +1,3 @@ +MD5 e6ae17d4bf26012e820c3582ec7af487 quota-3.14.tar.gz 249016 +RMD160 2282bb8b14d6e61beea0841cac5a67eec9f3d85d quota-3.14.tar.gz 249016 +SHA256 e4226a5dc77303d417905658210ce861e1eb904bc2c7acd401c3a1373715942d quota-3.14.tar.gz 249016 diff --git a/sys-fs/quota/quota-3.14-r1.ebuild b/sys-fs/quota/quota-3.14-r1.ebuild new file mode 100644 index 000000000000..34f3d9fb4235 --- /dev/null +++ b/sys-fs/quota/quota-3.14-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2007 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.1 2007/04/13 10:45:05 vapier Exp $ + +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 ~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 + + 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 +} -- 2.26.2