From cce70db7938b85359aee71e71d98787410ed8fb2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 23 Feb 2008 03:05:18 +0000 Subject: Make sure we respect LINGUAS #205948 by Arvid Norlander, update the ACL patch #208246 by Oliver Borm, and version bump #211113. Package-Manager: portage-2.2_pre2 --- sys-apps/acl/ChangeLog | 11 ++++- sys-apps/acl/Manifest | 29 ++++++------ sys-apps/acl/acl-2.2.45.ebuild | 18 +++++--- sys-apps/acl/acl-2.2.47.ebuild | 68 +++++++++++++++++++++++++++++ sys-apps/acl/files/acl-2.2.45-linguas.patch | 11 +++++ 5 files changed, 115 insertions(+), 22 deletions(-) create mode 100644 sys-apps/acl/acl-2.2.47.ebuild create mode 100644 sys-apps/acl/files/acl-2.2.45-linguas.patch (limited to 'sys-apps/acl') diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog index a85cd3e9cc6a..bb5dd920889c 100644 --- a/sys-apps/acl/ChangeLog +++ b/sys-apps/acl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/acl -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.91 2007/11/19 06:38:32 kumba Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.92 2008/02/23 03:05:17 vapier Exp $ + +*acl-2.2.47 (23 Feb 2008) + + 23 Feb 2008; Mike Frysinger + +files/acl-2.2.45-linguas.patch, acl-2.2.45.ebuild, +acl-2.2.47.ebuild: + Make sure we respect LINGUAS #205948 by Arvid Norlander, update the ACL + patch #208246 by Oliver Borm, and version bump #211113. 19 Nov 2007; Joshua Kinard acl-2.2.45.ebuild: Stable on mips, per #197204. diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest index bed5cedd15f9..94b10fd72cee 100644 --- a/sys-apps/acl/Manifest +++ b/sys-apps/acl/Manifest @@ -1,17 +1,20 @@ -AUX acl-2.2.29-nfs-glue.patch 709 RMD160 a7d2199a69cd045ebd094024e2e33ec752c0760a SHA1 cdb28eccefd61252b279eeb4b1fd21810e3c0b7f SHA256 ad9f47e7588f5791ad7327570758a233d79ca7ec2e09c91b03c2c838c51cff56 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX acl-2.2.32-only-symlink-when-needed.patch 836 RMD160 5b36f392f12d2382dd051c9766ae128a71b659ec SHA1 79fefd16a84e51797165fc8438382382156a149b SHA256 fede0dc42499b8903e42ea976d2ebfe8965750a8b2b116433364e657fbc8189d -AUX acl-2.2.41-nfs-glue.patch 583 RMD160 cc8d8da93cbeb8e1de632bd4ce5db09111eabd96 SHA1 b70922c2fde82e835838f5ec78cb687b99ca82b5 SHA256 8981f1031150d605f5b922a7c970fb785acb052e210ea7ec76b88c6ddccc13a7 -AUX acl-2.2.42-nfs-glue.patch 622 RMD160 484004542096deb85e87a58acb92732682635e1f SHA1 3fa3429257d1000568b4864101c09395dffcff0b SHA256 25cb309b417fb22f48c55a1ae9a0364078312b228ce15fccf025a87c50f72913 -AUX acl-2.2.44-LDFLAGS.patch 350 RMD160 c2ce51a7041266d3693f0c9d9ad4104695d7ba4b SHA1 e4b73214d66485d4072af97b6746cd60f7ba24cf SHA256 3f22d171d3da057e7a5edc94955e4702f1a3d83eaa93e7740685022ea3fe3314 AUX acl-2.2.45-libtool.patch 1144 RMD160 bdb8f729772c296429265586c0b5253f2b1e96ad SHA1 ee9d3dccaf93af4a6f8355e4c36dea5ca2f818b6 SHA256 5d6df5fe58c9dee90a2abe4d7ce6bd3cc61f2431de27d0c8d9cc34ba440bf69b -DIST acl-2.2.29-CITI_NFS4_ALL-3.dif 172937 RMD160 3768f0a235b4f228e0e60f4a3b59d1920a6b0ae4 SHA1 e91139278326d8738e599e361f823f2ea099d867 SHA256 8458adb2d9ed83b5a643143a09e349722f90f98c6d09fc1f6e4c5d5969c3de64 -DIST acl-2.2.41-CITI_NFS4_ALL-3.dif 97128 RMD160 cf1ab5799b117a7736d34cc4c9b4a747c07fc245 SHA1 2f7d9bb7b7e214c06cd442e53573efe6fa8e566a SHA256 3f4e2986cce2f71c448d91637e587a15f1bc945a0897837de44ed428456ccf69 -DIST acl-2.2.42-CITI_NFS4_ALL-1.dif 96775 RMD160 704fff2c1b9698c10f6e9596a8ae7f763bd3cd37 SHA1 765dd826a26b16e96f417045e51df20f145273da SHA256 71b8fb89e62dffd466a929c08ee598c8c376546e166bd4ed6109367b9ae4a30c -DIST acl_2.2.39-1.tar.gz 122091 RMD160 5e6797b580c561a52d10b36d82587f8b80024a43 SHA1 596cfa3461e93d5ad402ba2c4f6e8f1d4118a635 SHA256 1c01909c1d293a8599b94f9bc75e41a07878067211f08c09c66b1070924b6066 -DIST acl_2.2.44-1.tar.gz 152771 RMD160 1d99cb704b4a4a6a4cd1ffea661a33c342890251 SHA1 a981fb573ac3eea13f25f5d6e485a9e188877433 SHA256 1f6d6e71849590539b668765056654b1936674a9805109c8d1dddcaff76d5ac8 +AUX acl-2.2.45-linguas.patch 314 RMD160 b2a3965b0918963a9d94bed169a6bbe1cd495954 SHA1 80632125303a9c8ce4cb95685031a8257f5870fe SHA256 a250aa592dd4160a758433db718f5826259eb8db8f1e9afbf24e4c24e1e5ba31 +DIST acl-2.2.42-CITI_NFS4_ALL-2.dif 97276 RMD160 d1cbac2f52d4889a96b3225f301a60cf5e91286e SHA1 543bf9fa9c91dad8c5bfbe58b7122963b712a08c SHA256 10c930e4c6d147d03ad6dc67e38663522fd277525c149d932a8279e2cbe1b95e DIST acl_2.2.45-1.tar.gz 152771 RMD160 10b6e54e908abd47e95b71b87df0870c5148bfc9 SHA1 264fae8dce2d19a11d50df9d1adbae301a442f1c SHA256 2a38087b64814242908452eda9fe2478b6f9100cf3083e0c9a9e2492579962ad -EBUILD acl-2.2.39-r1.ebuild 1747 RMD160 f5056aa2d139b334996b36d910f52f03bfea6825 SHA1 d6e185f2e1d9817b38acb06e2de6cf68b584dabb SHA256 5b62382cdb02f7682e6361998c67d9da2a8d35d54f2dc3f53fe51d754204219a -EBUILD acl-2.2.44.ebuild 1766 RMD160 6b534f3d5ab0fe05d91790dd530fcd22f6956c83 SHA1 447f323ac406b7ea817ae6bc8dfa93319a499ff6 SHA256 74e1c5be8a93e8ce6553459aca927821d142dd2988b7871bdafcf8a982440af8 -EBUILD acl-2.2.45.ebuild 1835 RMD160 054a7b0197a92e0156f1551c69da861fec8b10cd SHA1 09c81976dad9cf200e225742ca4451959148db41 SHA256 8749f3114d485c25ea624536eb32b8f3beac94a686b0dc9093904fe0f3c38406 -MISC ChangeLog 11256 RMD160 4f7a159181e15247b26d4c2169614603b56a1fb5 SHA1 a7959ac48643f9bb2ce4720a70b791a666dceb52 SHA256 ca4e278123b0c2609e75c4947a270117fda78454a8eb7ea4a16b8092105211f8 +DIST acl_2.2.47-1.tar.gz 154823 RMD160 22e62f828c68adde101222bb9f55cf3e93b9d95b SHA1 989a54cc2c600182cac9efafeaa73a4623852d1d SHA256 240906fbea566f5d2dc354d67c3c9e776ad7f8a35a189da2f411c4e9847969c8 +EBUILD acl-2.2.45.ebuild 2115 RMD160 723cd27cf68ead16efa336543fdca116458e54b8 SHA1 238525c181945da4a15a99efa3fa46777d049100 SHA256 e8f2892fa31fee614d57ff4f68b6b12da490fc46705411edcfec84b46acc301b +EBUILD acl-2.2.47.ebuild 2127 RMD160 80e09295fd6a729dcf88dfa4d7b7e9e1c9c5a5e7 SHA1 33e499c159787b5bac1d532ded80c8c7d2544632 SHA256 28f0247253abc116c36823c01174f6aad245945c6ebd6d93b864182184699594 +MISC ChangeLog 11541 RMD160 354dee32ce8e45657e0198d3c96acffa6d9c85b4 SHA1 1ace29b0e0208ccdce306f90b2916898f90ca0db SHA256 e083aa572ea2504b5e13719f43cb4b42f114c19757c049e546caa2f40109ba09 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHv410j9hvisErhMIRAr9/AJ9Tttk7IkOEULMViySxw7hfQ+JfZgCbBhB8 +I5vk/FzXUuu8TENVBoUCuLM= +=v+jQ +-----END PGP SIGNATURE----- diff --git a/sys-apps/acl/acl-2.2.45.ebuild b/sys-apps/acl/acl-2.2.45.ebuild index f0165e4f2693..8e47a1b4bfe4 100644 --- a/sys-apps/acl/acl-2.2.45.ebuild +++ b/sys-apps/acl/acl-2.2.45.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.45.ebuild,v 1.12 2007/12/11 10:18:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.45.ebuild,v 1.13 2008/02/23 03:05:17 vapier Exp $ inherit eutils autotools toolchain-funcs @@ -9,7 +9,7 @@ DESCRIPTION="Access control list utilities, libraries and headers" HOMEPAGE="http://oss.sgi.com/projects/xfs/" SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz ftp://xfs.org/mirror/SGI/cmd_tars/${MY_P}.tar.gz - nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-1/acl-2.2.42-CITI_NFS4_ALL-1.dif )" + 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" @@ -25,19 +25,23 @@ src_unpack() { unpack ${MY_P}.tar.gz cd "${S}" if use nfs ; then - cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-1.dif . || die - epatch \ - "${FILESDIR}"/acl-2.2.42-nfs-glue.patch \ - acl-2.2.42-CITI_NFS4_ALL-1.dif + cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die + sed -i '/^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.45-libtool.patch #158068 + epatch "${FILESDIR}"/${PN}-2.2.45-linguas.patch #205948 epatch "${FILESDIR}"/${PN}-2.2.32-only-symlink-when-needed.patch sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ include/builddefs.in \ || die "failed to update builddefs" + # libtool will clobber install-sh which is really a custom file + mv install-sh acl.install-sh || die AT_M4DIR="m4" eautoreconf + mv acl.install-sh install-sh || die + strip-linguas po } src_compile() { diff --git a/sys-apps/acl/acl-2.2.47.ebuild b/sys-apps/acl/acl-2.2.47.ebuild new file mode 100644 index 000000000000..bab0fef14f9e --- /dev/null +++ b/sys-apps/acl/acl-2.2.47.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.47.ebuild,v 1.1 2008/02/23 03:05:17 vapier Exp $ + +inherit eutils autotools toolchain-funcs + +MY_P="${PN}_${PV}-1" +DESCRIPTION="Access control list utilities, libraries and headers" +HOMEPAGE="http://oss.sgi.com/projects/xfs/" +SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz + ftp://xfs.org/mirror/SGI/cmd_tars/${MY_P}.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" +IUSE="nfs nls" + +RDEPEND=">=sys-apps/attr-2.4 + nfs? ( net-libs/libnfsidmap )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${MY_P}.tar.gz + cd "${S}" + if use nfs ; then + cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die + sed -i '/^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.45-libtool.patch #158068 + epatch "${FILESDIR}"/${PN}-2.2.45-linguas.patch #205948 + epatch "${FILESDIR}"/${PN}-2.2.32-only-symlink-when-needed.patch + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ + include/builddefs.in \ + || die "failed to update builddefs" + # libtool will clobber install-sh which is really a custom file + mv install-sh acl.install-sh || die + AT_M4DIR="m4" eautoreconf + mv acl.install-sh install-sh || die + strip-linguas po +} + +src_compile() { + unset PLATFORM #184564 + export OPTIMIZER=${CFLAGS} + export DEBUG=-DNDEBUG + + econf \ + $(use_enable nls gettext) \ + --libexecdir=/usr/$(get_libdir) \ + --bindir=/bin \ + || die + emake || die +} + +src_install() { + emake DIST_ROOT="${D}" install install-dev install-lib || die + prepalldocs + + # move shared libs to / + dodir /$(get_libdir) + mv "${D}"/usr/$(get_libdir)/libacl.so* "${D}"/$(get_libdir)/ || die + gen_usr_ldscript libacl.so +} diff --git a/sys-apps/acl/files/acl-2.2.45-linguas.patch b/sys-apps/acl/files/acl-2.2.45-linguas.patch new file mode 100644 index 000000000000..b26d9459195a --- /dev/null +++ b/sys-apps/acl/files/acl-2.2.45-linguas.patch @@ -0,0 +1,11 @@ +--- po/Makefile.orig 2008-02-22 21:56:25.000000000 -0500 ++++ po/Makefile 2008-02-22 21:56:31.000000000 -0500 +@@ -6,7 +6,7 @@ + include $(TOPDIR)/include/builddefs + + POTHEAD = $(PKG_NAME).pot +-LINGUAS = de es fr gl pl sv ++LINGUAS ?= de es fr gl pl sv + LSRCFILES = $(LINGUAS:%=%.po) $(POTHEAD) + LDIRT = $(POTHEAD) + -- cgit v1.2.3-65-gdbad