From c17057037f4ae83c2e2a9a80c48f30632b6c5fd8 Mon Sep 17 00:00:00 2001 From: Tom Gall Date: Mon, 10 Dec 2007 17:33:57 +0000 Subject: added ~ppc64, change 64 bit fix to always apply (it's safe), syntax fixes (Portage version: 2.1.3.19) --- dev-tcltk/blt/ChangeLog | 6 +++++- dev-tcltk/blt/blt-2.4z-r1.ebuild | 22 ++++++++++------------ dev-tcltk/blt/blt-2.4z-r2.ebuild | 12 +++++------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'dev-tcltk') diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog index da2b2ee976e2..fc8ee7b1b0cf 100644 --- a/dev-tcltk/blt/ChangeLog +++ b/dev-tcltk/blt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tcltk/blt # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.21 2007/04/29 00:40:37 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.22 2007/12/10 17:33:57 tgall Exp $ + + 10 Dec 2007; Tom Gall blt-2.4z-r1.ebuild, + blt-2.4z-r2.ebuild: + added ~ppc64, change 64 bit fix to always apply (it's safe) *blt-2.4z-r2 (29 Apr 2007) diff --git a/dev-tcltk/blt/blt-2.4z-r1.ebuild b/dev-tcltk/blt/blt-2.4z-r1.ebuild index 7d3d463815ce..8184bb69fd1a 100644 --- a/dev-tcltk/blt/blt-2.4z-r1.ebuild +++ b/dev-tcltk/blt/blt-2.4z-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r1.ebuild,v 1.7 2007/04/29 00:40:37 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r1.ebuild,v 1.8 2007/12/10 17:33:57 tgall Exp $ inherit eutils flag-o-matic @@ -11,29 +11,27 @@ DEPEND=">=dev-lang/tk-8.0" IUSE="" SLOT="0" LICENSE="BSD" -KEYWORDS="amd64 ppc sparc x86" +KEYWORDS="amd64 ppc ~ppc64 sparc x86" S="${WORKDIR}/${PN}${PV}" src_unpack() { unpack ${A} - epatch ${FILESDIR}/blt2.4z-install.diff + epatch "${FILESDIR}"/blt2.4z-install.diff - if [ "${ARCH}" = "amd64" -o "${ARCH}" = "ia64" ] ; then - # From blt-2.4z-6mdk.src.rpm - epatch ${FILESDIR}/blt2.4z-64bit.patch - fi + # From blt-2.4z-6mdk.src.rpm + epatch "${FILESDIR}"/blt2.4z-64bit.patch # Set the correct libdir sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ - ${S}/configure || die "sed failed" + "${S}"/configure || die "sed failed" } src_compile() { # bug 167934 append-flags -fPIC - cd ${S} + cd "${S}" ./configure --host=${CHOST} \ --prefix=/usr \ --libdir=/usr/$(get_libdir) \ @@ -51,10 +49,10 @@ src_install() { /usr/share/man/mann \ /usr/include \ || die "dodir failed" - make INSTALL_ROOT=${D} install || die "make install failed" + emake -j1 INSTALL_ROOT="${D}" install || die "make install failed" dodoc NEWS PROBLEMS README - for f in `ls ${D}/usr/share/man/mann` ; do - mv ${D}/usr/share/man/mann/${f} ${D}/usr/share/man/mann/${f/.n/.nblt} + for f in `ls "${D}"/usr/share/man/mann` ; do + mv "${D}"/usr/share/man/mann/${f} "${D}"/usr/share/man/mann/${f/.n/.nblt} done } diff --git a/dev-tcltk/blt/blt-2.4z-r2.ebuild b/dev-tcltk/blt/blt-2.4z-r2.ebuild index ca7d856e4d31..bc23097da740 100644 --- a/dev-tcltk/blt/blt-2.4z-r2.ebuild +++ b/dev-tcltk/blt/blt-2.4z-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r2.ebuild,v 1.2 2007/04/29 00:59:53 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r2.ebuild,v 1.3 2007/12/10 17:33:57 tgall Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -11,7 +11,7 @@ DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry IUSE="" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" DEPEND=">=dev-lang/tk-8.0 x11-libs/libX11" @@ -23,10 +23,8 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/blt2.4z-install.diff - if [ "${ARCH}" = "amd64" -o "${ARCH}" = "ia64" ] ; then - # From blt-2.4z-6mdk.src.rpm - epatch "${FILESDIR}"/blt2.4z-64bit.patch - fi + # From blt-2.4z-6mdk.src.rpm + epatch "${FILESDIR}"/blt2.4z-64bit.patch # Set the correct libdir sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ @@ -52,7 +50,7 @@ src_install() { /usr/share/man/mann \ /usr/include \ || die "dodir failed" - emake INSTALL_ROOT="${D}" install || die "make install failed" + emake -j1 INSTALL_ROOT="${D}" install || die "make install failed" dodoc NEWS PROBLEMS README dohtml html/*.html -- cgit v1.2.3-65-gdbad