[gentoo-commits] repo/gentoo:master commit in: sys-apps/acl/, sys-apps/acl/files/

[Mike Frysinger]

commit:     9c6b4434d44aa7df5ca6e71ae6cbcbf972a29ced
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 22:49:28 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 23:47:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6b4434

sys-apps/acl: drop old <2.2.52-r1 versions

 sys-apps/acl/Manifest                            |  3 --
 sys-apps/acl/acl-2.2.49-r1.ebuild                | 62 -----------------------
 sys-apps/acl/acl-2.2.49.ebuild                   | 64 ------------------------
 sys-apps/acl/acl-2.2.51.ebuild                   | 63 -----------------------
 sys-apps/acl/acl-2.2.52.ebuild                   | 49 ------------------
 sys-apps/acl/files/acl-2.2.49-quote-strchr.patch | 25 ---------
 sys-apps/acl/files/acl-2.2.51-config-shell.patch | 53 --------------------
 sys-apps/acl/metadata.xml                        |  4 --
 8 files changed, 323 deletions(-)

diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index ef88026..fc5af6a 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,4 +1 @@
-DIST acl-2.2.42-CITI_NFS4_ALL-2.dif 97276 SHA256 10c930e4c6d147d03ad6dc67e38663522fd277525c149d932a8279e2cbe1b95e SHA512 4998e1402eeeef4159c2482a5df9a61235dadb38a0747416d2701545c5a58614a57c94907c28dbe5c390bd216fc44e2f1edf007bc55ce65ce7bd0e8786c2756d WHIRLPOOL bbee022fb8a36ceb4d49256f3fc7ab7452fe719ba13e7f2a1b436908788ff1373567a628849a0a880062221d82336023e09384de27a5339a30faa84e65b6e2dc
-DIST acl-2.2.49.src.tar.gz 362743 SHA256 b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5 SHA512 c65b1ca18c16e434f1ff5b196908d1c39d62399740826a4a9b3ef0e6ba5cc4fced838b4a844ccffc5cb26554c4755b2f4e0fd69c9045d692f9019972ce3f7f0b WHIRLPOOL 028f373f334700896b8c455f41a9f83dc6da82a6454da9da81a98e05f5f058ee88d0b1487f97e9d5b7c204a97ed125fc331bdcce6cb454ddbfbe9eeb6de0a55c
-DIST acl-2.2.51.src.tar.gz 385378 SHA256 06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225 SHA512 32b0c7f5aff27b1a0278dea2cc7aacf03f791c5bd7e9ae520bf29516bf3e52969c0a7ce9af3c2fa95b222cc70d4e19da167d008dcdf0fb46bda86cd584c96d98 WHIRLPOOL 0c41e39008c0bbb254d3ca29dc597e888d0a76820d8f78246ae06448ea5fdf9d25b54c112d86137420007641d23e172c67402d05acdc34af5b6b387b32c290a2
 DIST acl-2.2.52.src.tar.gz 386604 SHA256 179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7 WHIRLPOOL 19bcc46e56ce0226e084bb6f86e411b09418d53f094f478afd60c3c568cf2066d9f0352a4da20f6f41d6e08c13412a182a7306aa3fbe2a248d1f6388856f63a2

diff --git a/sys-apps/acl/acl-2.2.49-r1.ebuild b/sys-apps/acl/acl-2.2.49-r1.ebuild
deleted file mode 100644
index cb39907..0000000
--- a/sys-apps/acl/acl-2.2.49-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="access control list utilities, libraries and headers"
-HOMEPAGE="http://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz
-	nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-2/acl-2.2.42-CITI_NFS4_ALL-2.dif )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="nfs nls static-libs"
-
-RDEPEND=">=sys-apps/attr-2.4
-	nfs? ( net-libs/libnfsidmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	if use nfs ; then
-		cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die
-		sed -i \
-			-e '/^diff --git a.debian.changelog b.debian.changelog/,/^diff --git/d' \
-			acl-2.2.42-CITI_NFS4_ALL-2.dif || die
-		epatch acl-2.2.42-CITI_NFS4_ALL-2.dif
-	fi
-	epatch "${FILESDIR}"/${P}-quote-strchr.patch
-	sed -i \
-		-e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \
-		configure # hack PATH with AC_PATH_PROG
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die "failed to update builddefs"
-	strip-linguas po
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib || die
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	# move shared libs to /
-	gen_usr_ldscript -a acl
-}

diff --git a/sys-apps/acl/acl-2.2.49.ebuild b/sys-apps/acl/acl-2.2.49.ebuild
deleted file mode 100644
index 243dd1c..0000000
--- a/sys-apps/acl/acl-2.2.49.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="access control list utilities, libraries and headers"
-HOMEPAGE="http://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz
-	nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-2/acl-2.2.42-CITI_NFS4_ALL-2.dif )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="nfs nls"
-
-RDEPEND=">=sys-apps/attr-2.4
-	nfs? ( net-libs/libnfsidmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.src.tar.gz
-	cd "${S}"
-	if use nfs ; then
-		cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die
-		sed -i \
-			-e '/^diff --git a.debian.changelog b.debian.changelog/,/^diff --git/d' \
-			acl-2.2.42-CITI_NFS4_ALL-2.dif || die
-		epatch acl-2.2.42-CITI_NFS4_ALL-2.dif
-	fi
-	epatch "${FILESDIR}"/${P}-quote-strchr.patch
-	sed -i \
-		-e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \
-		configure # hack PATH with AC_PATH_PROG
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die "failed to update builddefs"
-	strip-linguas po
-}
-
-src_compile() {
-	use prefix || EPREFIX=
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib || die
-	prepalldocs
-
-	# move shared libs to /
-	gen_usr_ldscript -a acl
-}

diff --git a/sys-apps/acl/acl-2.2.51.ebuild b/sys-apps/acl/acl-2.2.51.ebuild
deleted file mode 100644
index 81e6130..0000000
--- a/sys-apps/acl/acl-2.2.51.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="access control list utilities, libraries and headers"
-HOMEPAGE="http://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz
-	nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-2/acl-2.2.42-CITI_NFS4_ALL-2.dif )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
-IUSE="nfs nls static-libs"
-
-RDEPEND=">=sys-apps/attr-2.4
-	nfs? ( net-libs/libnfsidmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	if use nfs ; then
-		cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die
-		sed -i \
-			-e '/^diff --git a.debian.changelog b.debian.changelog/,/^diff --git/d' \
-			acl-2.2.42-CITI_NFS4_ALL-2.dif || die
-		epatch acl-2.2.42-CITI_NFS4_ALL-2.dif
-	fi
-	epatch "${FILESDIR}"/${PN}-2.2.49-quote-strchr.patch
-	epatch "${FILESDIR}"/${PN}-2.2.51-config-shell.patch #365397
-	sed -i \
-		-e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \
-		configure # hack PATH with AC_PATH_PROG
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die "failed to update builddefs"
-	strip-linguas po
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib || die
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	# move shared libs to /
-	gen_usr_ldscript -a acl
-}

diff --git a/sys-apps/acl/acl-2.2.52.ebuild b/sys-apps/acl/acl-2.2.52.ebuild
deleted file mode 100644
index ccb800c..0000000
--- a/sys-apps/acl/acl-2.2.52.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="access control list utilities, libraries and headers"
-HOMEPAGE="http://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND=">=sys-apps/attr-2.4"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die
-	strip-linguas po
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib || die
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# move shared libs to /
-	gen_usr_ldscript -a acl
-}

diff --git a/sys-apps/acl/files/acl-2.2.49-quote-strchr.patch b/sys-apps/acl/files/acl-2.2.49-quote-strchr.patch
deleted file mode 100644
index d2510da..0000000
--- a/sys-apps/acl/files/acl-2.2.49-quote-strchr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7565e4fcb9209782ed02f3caff246cf5ea816674 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Fri, 8 Jan 2010 21:28:31 -0500
-Subject: [PATCH] quote: pull in string.h for strchr prototype
-
-Signed-off-by: Mike Frysinger <vapier@g.o>
----
- libmisc/quote.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libmisc/quote.c b/libmisc/quote.c
-index f98c887..bf8f9eb 100644
---- a/libmisc/quote.c
-+++ b/libmisc/quote.c
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
-+#include <string.h>
- #include "misc.h"
- 
- const char *quote(const char *str, const char *quote_chars)
--- 
-1.6.6
-

diff --git a/sys-apps/acl/files/acl-2.2.51-config-shell.patch b/sys-apps/acl/files/acl-2.2.51-config-shell.patch
deleted file mode 100644
index 78b3f0f..0000000
--- a/sys-apps/acl/files/acl-2.2.51-config-shell.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/365397
-
-From 10bfb16245ec4b55c1f5b6dc5554913bc9b13c9c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Mon, 16 May 2011 01:59:52 -0400
-Subject: [PATCH] use SHELL from configure
-
-If /bin/sh is not a functional enough shell, configure will select a
-SHELL of /bin/bash or better.  But the current build helpers always
-hardcode /bin/sh, so if libtool itself configures itself for /bin/bash,
-things will fail when it attempts to do:
-	SHELL = /bin/sh
-	LIBTOOL = $(SHELL) .../libtool
-	...
-	eval: 1: base_compile+= -pipe: not found
-	...
-
-So rather than hardcoding SHELL to /bin/sh, set it to @SHELL@ and let
-configure find a good value for us.
-
-Signed-off-by: Mike Frysinger <vapier@g.o>
----
- include/builddefs.in |    1 +
- include/buildmacros  |    1 -
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/builddefs.in b/include/builddefs.in
-index d054a56..434ce95 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -46,6 +46,7 @@ MAKE		= @make@
- ECHO		= @echo@
- SORT		= @sort@
- LN_S		= @LN_S@
-+SHELL		= @SHELL@
- LIBTOOL		= @LIBTOOL@
- MAKEDEPEND	= @makedepend@
- 
-diff --git a/include/buildmacros b/include/buildmacros
-index ab89182..8efb32e 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -42,7 +42,6 @@ OBJECTS = $(ASFILES:.s=.o) \
- 
- INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
- 
--SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
- DIST_DIR = $(TOPDIR)/dist
- 
--- 
-1.7.5.rc3
-

diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
index 63978cc..ede75b3 100644
--- a/sys-apps/acl/metadata.xml
+++ b/sys-apps/acl/metadata.xml
@@ -3,11 +3,7 @@
 <pkgmetadata>
 <maintainer type="project">
 	<email>base-system@g.o</email>
-	<name>Gentoo Base System</name>
 </maintainer>
-<use>
-	<flag name="nfs">add support for NFS acls</flag>
-</use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:xfs:acl</remote-id>
 </upstream>