From: Jonathan Callen Date: Mon, 22 Feb 2010 21:08:41 +0000 (+0000) Subject: Transfer prefix keywords, bump EAPI X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b64af5be23fdbb3702c490cf149cbb5d3d0836e3;p=gentoo.git Transfer prefix keywords, bump EAPI Package-Manager: portage--svn/cvs/Linux i686 --- diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog index 4901b7375703..660e756c0e52 100644 --- a/app-text/catdoc/ChangeLog +++ b/app-text/catdoc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/catdoc -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.24 2009/06/09 12:39:47 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.25 2010/02/22 21:07:22 abcd Exp $ + + 22 Feb 2010; Jonathan Callen catdoc-0.94.2-r1.ebuild: + Transfer prefix keywords, bump EAPI 09 Jun 2009; Diego E. Pettenò catdoc-0.94.2-r1.ebuild, +files/catdoc-0.94.2+autoconf-2.63.patch: diff --git a/app-text/catdoc/catdoc-0.94.2-r1.ebuild b/app-text/catdoc/catdoc-0.94.2-r1.ebuild index 60e8ac94c16f..b16390b7d344 100644 --- a/app-text/catdoc/catdoc-0.94.2-r1.ebuild +++ b/app-text/catdoc/catdoc-0.94.2-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.2 2009/06/09 12:39:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.3 2010/02/22 21:07:22 abcd Exp $ +EAPI=3 WANT_AUTOMAKE=none inherit autotools eutils @@ -19,30 +20,27 @@ DEPEND="tk? ( >=dev-lang/tk-8.1 )" DOCS="CODING.STD CREDITS NEWS README TODO" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/${P}-flags.patch" epatch "${FILESDIR}/${P}+autoconf-2.63.patch" - eautoconf -} -src_compile() { + # Fix for case-insensitive filesystems + echo ".PHONY: all install clean distclean dist" >> Makefile.in - local myconf="--with-install-root=${D}" + eautoconf +} - use tk \ - && myconf="${myconf} --with-wish=/usr/bin/wish" \ - || myconf="${myconf} --disable-wordview" +src_configure() { + econf --with-install-root="${D}" \ + $(use_with tk wish "${EPREFIX}"/usr/bin/wish) \ + $(use_with !tk wordview) +} - econf ${myconf} || die +src_compile() { emake LIB_DIR=/usr/share/catdoc || die - } src_install() { - - emake -j1 mandir=/usr/share/man/man1 install || die + emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die dodoc ${DOCS} - } diff --git a/app-text/psutils/ChangeLog b/app-text/psutils/ChangeLog index 1965f35c2f97..2f411341a04d 100644 --- a/app-text/psutils/ChangeLog +++ b/app-text/psutils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/psutils -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/ChangeLog,v 1.22 2009/09/23 16:37:48 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/ChangeLog,v 1.23 2010/02/22 21:08:41 abcd Exp $ + + 22 Feb 2010; Jonathan Callen psutils-1.17-r1.ebuild: + Transfer prefix keywords, bump EAPI 23 Sep 2009; Patrick Lauer psutils-1.17.ebuild, psutils-1.17-r1.ebuild: diff --git a/app-text/psutils/psutils-1.17-r1.ebuild b/app-text/psutils/psutils-1.17-r1.ebuild index 2bf1edb9cc44..dde98483311c 100644 --- a/app-text/psutils/psutils-1.17-r1.ebuild +++ b/app-text/psutils/psutils-1.17-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/psutils-1.17-r1.ebuild,v 1.2 2009/09/23 16:37:48 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/psutils-1.17-r1.ebuild,v 1.3 2010/02/22 21:08:41 abcd Exp $ + +EAPI=3 inherit toolchain-funcs eutils @@ -10,7 +12,7 @@ SRC_URI="ftp://ftp.enst.fr/pub/unix/a2ps/${P}.tar.gz" LICENSE="as-is" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="" @@ -19,12 +21,10 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/${P}-ldflags.patch" sed \ - -e "s:/usr/local:\$(DESTDIR)/usr:" \ + -e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \ "${S}/Makefile.unix" > "${S}/Makefile" }