From 71eb2388f003e6022ffac6fc9ff2e4a39d127996 Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Tue, 29 Dec 2009 01:39:03 +0000 Subject: Add prefix keywords (~amd64-linux, ~ia64-linux, ~x86-linux) and a patch to find make, et al. in PATH instead of hardcoded directories (Portage version: -svn/cvs/Linux i686) --- sys-apps/acl/ChangeLog | 7 +- sys-apps/acl/acl-2.2.47-r1.ebuild | 16 ++-- sys-apps/acl/files/acl-2.2.47-search-PATH.patch | 108 ++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 9 deletions(-) create mode 100644 sys-apps/acl/files/acl-2.2.47-search-PATH.patch diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog index 560bc3ce139f..422fd2591fb5 100644 --- a/sys-apps/acl/ChangeLog +++ b/sys-apps/acl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/acl # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.100 2009/07/02 01:30:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.101 2009/12/29 01:39:03 abcd Exp $ + + 29 Dec 2009; Jonathan Callen acl-2.2.47-r1.ebuild, + +files/acl-2.2.47-search-PATH.patch: + Add prefix keywords (~amd64-linux, ~ia64-linux, ~x86-linux) and a patch to + find make, et al. in PATH instead of hardcoded directories *acl-2.2.47-r1 (02 Jul 2009) diff --git a/sys-apps/acl/acl-2.2.47-r1.ebuild b/sys-apps/acl/acl-2.2.47-r1.ebuild index 66e779b5b059..869c34486866 100644 --- a/sys-apps/acl/acl-2.2.47-r1.ebuild +++ b/sys-apps/acl/acl-2.2.47-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/07/02 01:30:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.47-r1.ebuild,v 1.2 2009/12/29 01:39:03 abcd Exp $ inherit eutils autotools toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +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 @@ -35,6 +35,7 @@ src_unpack() { 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 + epatch "${FILESDIR}"/${P}-search-PATH.patch sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ @@ -48,15 +49,16 @@ src_unpack() { } src_compile() { + use prefix || EPREFIX= unset PLATFORM #184564 export OPTIMIZER=${CFLAGS} export DEBUG=-DNDEBUG econf \ $(use_enable nls gettext) \ - --libexecdir=/usr/$(get_libdir) \ - --bindir=/bin \ - || die + --libexecdir="${EPREFIX}"/usr/$(get_libdir) \ + --bindir="${EPREFIX}"/bin + emake || die } @@ -65,7 +67,5 @@ src_install() { prepalldocs # move shared libs to / - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/libacl.so* "${D}"/$(get_libdir)/ || die - gen_usr_ldscript libacl.so + gen_usr_ldscript -a acl } diff --git a/sys-apps/acl/files/acl-2.2.47-search-PATH.patch b/sys-apps/acl/files/acl-2.2.47-search-PATH.patch new file mode 100644 index 000000000000..eb67ebf1b32c --- /dev/null +++ b/sys-apps/acl/files/acl-2.2.47-search-PATH.patch @@ -0,0 +1,108 @@ +On prefix, we want the versions from within EPREFIX, so just search the PATH -- don't +try to be clever about where the tools may be found + +--- acl-2.2.47.orig/m4/package_utilies.m4 ++++ acl-2.2.47/m4/package_utilies.m4 +@@ -22,57 +22,39 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], + AC_SUBST(cc) + AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) + +- if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) +- fi +- if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, make,, /usr/bin) +- fi ++ AC_PATH_PROG(MAKE, gmake) ++ AC_PATH_PROG(MAKE, make) + make=$MAKE + AC_SUBST(make) + AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) + + AC_PROG_LIBTOOL + +- if test -z "$TAR"; then +- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) +- fi ++ AC_PATH_PROG(TAR, tar) + tar=$TAR + AC_SUBST(tar) +- if test -z "$ZIP"; then +- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) +- fi ++ AC_PATH_PROG(ZIP, gzip) + + zip=$ZIP + AC_SUBST(zip) + +- if test -z "$MAKEDEPEND"; then +- AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true) +- fi ++ AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true) + makedepend=$MAKEDEPEND + AC_SUBST(makedepend) + +- if test -z "$AWK"; then +- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) +- fi ++ AC_PROG_AWK + awk=$AWK + AC_SUBST(awk) + +- if test -z "$SED"; then +- AC_PATH_PROG(SED, sed,, /bin:/usr/bin) +- fi ++ AC_PROG_SED + sed=$SED + AC_SUBST(sed) + +- if test -z "$ECHO"; then +- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) +- fi ++ AC_PATH_PROG(ECHO, echo) + echo=$ECHO + AC_SUBST(echo) + +- if test -z "$SORT"; then +- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) +- fi ++ AC_PATH_PROG(SORT, sort) + sort=$SORT + AC_SUBST(sort) + +@@ -80,31 +62,23 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], + AC_PROG_LN_S + + if test "$enable_gettext" = yes; then +- if test -z "$MSGFMT"; then +- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) +- fi ++ AC_PATH_PROG(MSGFMT, msgfmt) + msgfmt=$MSGFMT + AC_SUBST(msgfmt) + AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) + +- if test -z "$MSGMERGE"; then +- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) +- fi ++ AC_PATH_PROG(MSGMERGE, msgmerge) + msgmerge=$MSGMERGE + AC_SUBST(msgmerge) + AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext) + +- if test -z "$XGETTEXT"; then +- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin) +- fi ++ AC_PATH_PROG(XGETTEXT, xgettext) + xgettext=$XGETTEXT + AC_SUBST(xgettext) + AC_PACKAGE_NEED_UTILITY($1, "$xgettext", xgettext, gettext) + fi + +- if test -z "$RPM"; then +- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) +- fi ++ AC_PATH_PROG(RPM, rpm) + rpm=$RPM + AC_SUBST(rpm) + -- cgit v1.2.3-65-gdbad