diff options
| -rw-r--r-- | dev-tcltk/blt/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-tcltk/blt/blt-2.4z-r1.ebuild | 9 | ||||
| -rw-r--r-- | dev-tcltk/blt/blt-2.4z-r2.ebuild | 64 | ||||
| -rw-r--r-- | dev-tcltk/blt/blt-2.4z.ebuild | 54 | ||||
| -rw-r--r-- | dev-tcltk/blt/files/digest-blt-2.4z-r2 (renamed from dev-tcltk/blt/files/digest-blt-2.4z) | 0 |
5 files changed, 78 insertions, 59 deletions
diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog index 756adafd1087..da2b2ee976e2 100644 --- a/dev-tcltk/blt/ChangeLog +++ b/dev-tcltk/blt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-tcltk/blt -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.20 2006/08/01 14:48:12 blubb Exp $ +# 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 $ + +*blt-2.4z-r2 (29 Apr 2007) + + 29 Apr 2007; MATSUU Takuto <matsuu@gentoo.org> -blt-2.4z.ebuild, + blt-2.4z-r1.ebuild, +blt-2.4z-r2.ebuild: + Fixed bug 167934. 01 Aug 2006; Simon Stelling <blubb@gentoo.org> blt-2.4z-r1.ebuild: stable on amd64 diff --git a/dev-tcltk/blt/blt-2.4z-r1.ebuild b/dev-tcltk/blt/blt-2.4z-r1.ebuild index be81c060d9e1..7d3d463815ce 100644 --- a/dev-tcltk/blt/blt-2.4z-r1.ebuild +++ b/dev-tcltk/blt/blt-2.4z-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.6 2006/08/01 14:48:12 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r1.ebuild,v 1.7 2007/04/29 00:40:37 matsuu Exp $ -inherit eutils +inherit eutils flag-o-matic SRC_URI="mirror://sourceforge/blt/BLT2.4z.tar.gz" HOMEPAGE="http://blt.sf.net" @@ -30,6 +30,9 @@ src_unpack() { } src_compile() { + # bug 167934 + append-flags -fPIC + cd ${S} ./configure --host=${CHOST} \ --prefix=/usr \ diff --git a/dev-tcltk/blt/blt-2.4z-r2.ebuild b/dev-tcltk/blt/blt-2.4z-r2.ebuild new file mode 100644 index 000000000000..3e96476f2fe6 --- /dev/null +++ b/dev-tcltk/blt/blt-2.4z-r2.ebuild @@ -0,0 +1,64 @@ +# 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.1 2007/04/29 00:40:37 matsuu Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +HOMEPAGE="http://blt.sourceforge.net/" +SRC_URI="mirror://sourceforge/blt/BLT2.4z.tar.gz" +DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and miscellaneous commands." + +IUSE="jpeg" +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +DEPEND=">=dev-lang/tk-8.0 + x11-libs/libX11" + +S="${WORKDIR}/${PN}${PV}" + +src_unpack() { + unpack ${A} + 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 + + # Set the correct libdir + sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ + configure* || die "sed configure* failed" + sed -i -e "/^scriptdir =/s:lib:$(get_libdir):" \ + Makefile.in demos/Makefile.in || die "sed Makefile.in failed" +} + +src_compile() { + tc-export CC CFLAGS + + # bug 167934 + append-flags -fPIC + + econf \ + --with-blt=/usr/$(get_libdir) \ + $(use_enable jpeg) || die "./configure failed" + # parallel borks + emake -j1 || die "emake failed" +} + +src_install() { + dodir /usr/bin \ + /usr/$(get_libdir)/blt2.4/demos/bitmaps \ + /usr/share/man/mann \ + /usr/include \ + || die "dodir failed" + emake INSTALL_ROOT="${D}" install || die "make install failed" + + dodoc NEWS PROBLEMS README + dohtml html/*.html + 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.ebuild b/dev-tcltk/blt/blt-2.4z.ebuild deleted file mode 100644 index 766e57433838..000000000000 --- a/dev-tcltk/blt/blt-2.4z.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z.ebuild,v 1.16 2005/05/08 22:00:30 herbs Exp $ - -inherit eutils - -SRC_URI="mirror://sourceforge/blt/BLT2.4z.tar.gz" -HOMEPAGE="http://blt.sf.net" -DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and miscellaneous commands." -DEPEND=">=dev-lang/tk-8.0" -IUSE="" -SLOT="0" -LICENSE="BSD" -KEYWORDS="x86 sparc ppc amd64" - -S="${WORKDIR}/${PN}${PV}" - -src_unpack() { - unpack ${A} - 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 - - # Set the correct libdir - sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ - ${S}/configure || die "sed failed" -} - -src_compile() { - cd ${S} - ./configure --host=${CHOST} \ - --prefix=/usr \ - --libdir=/usr/$(get_libdir) \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-x \ - --with-tcl=/usr/$(get_libdir) || die "./configure failed" - - emake -j1 CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - dodir /usr/bin \ - /usr/lib/blt2.4/demos/bitmaps \ - /usr/share/man/mann \ - /usr/include \ - || die "dodir failed" - make INSTALL_ROOT=${D} install || die "make install failed" - - dodoc NEWS PROBLEMS README -} diff --git a/dev-tcltk/blt/files/digest-blt-2.4z b/dev-tcltk/blt/files/digest-blt-2.4z-r2 index bd31562d3021..bd31562d3021 100644 --- a/dev-tcltk/blt/files/digest-blt-2.4z +++ b/dev-tcltk/blt/files/digest-blt-2.4z-r2 |