From 6e777ccc15d8180e47c3a605d84e6f1b8e2681d3 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Sun, 29 Apr 2007 00:40:37 +0000 Subject: [PATCH] Fixed bug #167934. Package-Manager: portage-2.1.2.4 --- dev-tcltk/blt/ChangeLog | 10 ++- dev-tcltk/blt/Manifest | 30 ++++----- dev-tcltk/blt/blt-2.4z-r1.ebuild | 9 ++- dev-tcltk/blt/blt-2.4z-r2.ebuild | 64 +++++++++++++++++++ dev-tcltk/blt/blt-2.4z.ebuild | 54 ---------------- .../{digest-blt-2.4z => digest-blt-2.4z-r2} | 0 6 files changed, 93 insertions(+), 74 deletions(-) create mode 100644 dev-tcltk/blt/blt-2.4z-r2.ebuild delete mode 100644 dev-tcltk/blt/blt-2.4z.ebuild rename dev-tcltk/blt/files/{digest-blt-2.4z => digest-blt-2.4z-r2} (100%) 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 -blt-2.4z.ebuild, + blt-2.4z-r1.ebuild, +blt-2.4z-r2.ebuild: + Fixed bug 167934. 01 Aug 2006; Simon Stelling blt-2.4z-r1.ebuild: stable on amd64 diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest index 90ede4d4b03c..95af69fdfb32 100644 --- a/dev-tcltk/blt/Manifest +++ b/dev-tcltk/blt/Manifest @@ -7,25 +7,25 @@ MD5 aa8c1dfd524ccc5b50a03df01db5cde3 files/blt2.4z-install.diff 1057 RMD160 4531572aa1177ab362d522964a8f62d6401ff237 files/blt2.4z-install.diff 1057 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8 files/blt2.4z-install.diff 1057 DIST BLT2.4z.tar.gz 2200973 RMD160 d54d9fdb6c61391c191afab4701716d18a3d928b SHA1 29f719aa762f1762dbf4a3b0e60dc5356118ba2f SHA256 6de705eccf2ec676b4071b74ec9e211c590477fadf6f05566cfd8ed6a03c60da -EBUILD blt-2.4z-r1.ebuild 1534 RMD160 19db3c39d479490bec6d74e4a5d01d6cdc648ef0 SHA1 63027d433ea7028db80bbb2440e8631cd0ca2988 SHA256 d5c356301639bed5314bae580efe755f1ce9e603d4e466395cb767848b2259d9 -MD5 54a03ddbc52489450f23cc1ee85305a9 blt-2.4z-r1.ebuild 1534 -RMD160 19db3c39d479490bec6d74e4a5d01d6cdc648ef0 blt-2.4z-r1.ebuild 1534 -SHA256 d5c356301639bed5314bae580efe755f1ce9e603d4e466395cb767848b2259d9 blt-2.4z-r1.ebuild 1534 -EBUILD blt-2.4z.ebuild 1410 RMD160 ab1d7f748ea0a9b69547762c00d2556ce023ddf1 SHA1 2eda946ecc6552cd3a8b718d38a6d6baecd869a6 SHA256 c2c485b286b73457366eade40246f8e1ea5ee40730ee7c366a32209b25a122c3 -MD5 e4d91ad87d8feb1b14acc00d191e3512 blt-2.4z.ebuild 1410 -RMD160 ab1d7f748ea0a9b69547762c00d2556ce023ddf1 blt-2.4z.ebuild 1410 -SHA256 c2c485b286b73457366eade40246f8e1ea5ee40730ee7c366a32209b25a122c3 blt-2.4z.ebuild 1410 -MISC ChangeLog 2865 RMD160 8da351d9c410433b89cb87e8f1955e8ee96f882c SHA1 4ea57b47004552b316a3406bd62684aede184c9c SHA256 94ddb0927168800fa53b6e4709f67aac551aebe54e16f0f1d5b2a0f7918b720a -MD5 a5d31d5e0ef8c2036c55d7f9f786fc6d ChangeLog 2865 -RMD160 8da351d9c410433b89cb87e8f1955e8ee96f882c ChangeLog 2865 -SHA256 94ddb0927168800fa53b6e4709f67aac551aebe54e16f0f1d5b2a0f7918b720a ChangeLog 2865 +EBUILD blt-2.4z-r1.ebuild 1583 RMD160 99759786e3e85d05c93e5448b60a1f8e46b41ca9 SHA1 7f53a73d68d7399d55d1ac1085288c23db2ddd7f SHA256 c19ad13bf181954adb7c8eb5ac4670e4741ba3d6d96efce600448aa80f59a915 +MD5 d4d03316f573354ea8ee25df80a0fc24 blt-2.4z-r1.ebuild 1583 +RMD160 99759786e3e85d05c93e5448b60a1f8e46b41ca9 blt-2.4z-r1.ebuild 1583 +SHA256 c19ad13bf181954adb7c8eb5ac4670e4741ba3d6d96efce600448aa80f59a915 blt-2.4z-r1.ebuild 1583 +EBUILD blt-2.4z-r2.ebuild 1690 RMD160 6b34f0d925ec85f3a553bc6665ab251f25793d24 SHA1 8933e44301d252259b041f8ff7660d58a03e47b7 SHA256 640fa207381e793de7dc19c4759675c08bf5a068144b23df8cb737bef4d6327f +MD5 cdf46a847620e7c5701fbd1c9e8a50d5 blt-2.4z-r2.ebuild 1690 +RMD160 6b34f0d925ec85f3a553bc6665ab251f25793d24 blt-2.4z-r2.ebuild 1690 +SHA256 640fa207381e793de7dc19c4759675c08bf5a068144b23df8cb737bef4d6327f blt-2.4z-r2.ebuild 1690 +MISC ChangeLog 3025 RMD160 d7a94e7d4f275d5c37822c7e48815e7ed741f924 SHA1 ec9f8eb7755f22d7455f1acd6445df6a38bbd6e6 SHA256 e75c1b1421fc863f53b3ec50d0d72b2424a824a403b5fee91cae77fa4b708639 +MD5 711c8008f2eaf5b1cd86fbbf533b8510 ChangeLog 3025 +RMD160 d7a94e7d4f275d5c37822c7e48815e7ed741f924 ChangeLog 3025 +SHA256 e75c1b1421fc863f53b3ec50d0d72b2424a824a403b5fee91cae77fa4b708639 ChangeLog 3025 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata.xml 158 -MD5 2b083c6d765a93aec0d204064f6ece88 files/digest-blt-2.4z 226 -RMD160 eb4d36c5eb18cda77305ced6d3fe877db332d547 files/digest-blt-2.4z 226 -SHA256 9a0faab94caeb14723721e80e16e6ea12230cb70f51ff590d397060d27245509 files/digest-blt-2.4z 226 MD5 2b083c6d765a93aec0d204064f6ece88 files/digest-blt-2.4z-r1 226 RMD160 eb4d36c5eb18cda77305ced6d3fe877db332d547 files/digest-blt-2.4z-r1 226 SHA256 9a0faab94caeb14723721e80e16e6ea12230cb70f51ff590d397060d27245509 files/digest-blt-2.4z-r1 226 +MD5 2b083c6d765a93aec0d204064f6ece88 files/digest-blt-2.4z-r2 226 +RMD160 eb4d36c5eb18cda77305ced6d3fe877db332d547 files/digest-blt-2.4z-r2 226 +SHA256 9a0faab94caeb14723721e80e16e6ea12230cb70f51ff590d397060d27245509 files/digest-blt-2.4z-r2 226 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 similarity index 100% rename from dev-tcltk/blt/files/digest-blt-2.4z rename to dev-tcltk/blt/files/digest-blt-2.4z-r2 -- 2.26.2