fix bug 259338

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 80 insertions, 3 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index 890c8c865e23..5078eb33c214 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/blt
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.25 2008/10/27 05:26:08 mescalinum Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.26 2009/08/08 02:44:02 mescalinum Exp $
+
+*blt-2.4z-r5 (08 Aug 2009)
+
+  08 Aug 2009; Federico Ferri <mescalinum@gentoo.org> +blt-2.4z-r5.ebuild,
+  +files/pkgIndex.tcl:
+  fix bug 259338
 
   27 Oct 2008; Federico Ferri <mescalinum@gentoo.org>
   +files/blt-2.4z-tcl8.5-fixpkgruntime.patch:
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index a6da5889a52a..1e3ebd0ff844 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -3,10 +3,12 @@ AUX blt-2.4z-r4-fix-makefile2.patch 728 RMD160 12969f521f1079670b639626061e7db4a
 AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 RMD160 ec7999c78fe95bdfff2785c125d48b0b09776e4e SHA1 e41d9334db9dd1fc4f5fe03777c940dedbcb0c24 SHA256 a44ed43bbb946d8fc11bb8f416680a536ffc7c0d78faf33030ec378d67d3d287
 AUX blt2.4z-64bit.patch 891 RMD160 f2bc82f9a98d632480fc678af7a94fdf8899810d SHA1 22624ed8ba4b002212f5f2bf3adb5ac80c923439 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b7e460435408000ca2f5
 AUX blt2.4z-install.diff 1057 RMD160 4531572aa1177ab362d522964a8f62d6401ff237 SHA1 47b65e77e663cf95282612216a2fb4c8d8dda725 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8
+AUX pkgIndex.tcl 146 RMD160 fdb0f974b517685ba1f207b11eea1f3a4c4f2f14 SHA1 c005d612949e1a70a34fa83098d1a36bf51a912c SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d
 DIST BLT2.4z.tar.gz 2200973 RMD160 d54d9fdb6c61391c191afab4701716d18a3d928b SHA1 29f719aa762f1762dbf4a3b0e60dc5356118ba2f SHA256 6de705eccf2ec676b4071b74ec9e211c590477fadf6f05566cfd8ed6a03c60da
 DIST blt2.4z-8.5.2.tar.gz 2326234 RMD160 1012e0a21a9b45957d6482e55e21b9e54e3f1db2 SHA1 217986ef73dfbb9f64d4af7da0248e28ee2f6cab SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16
 EBUILD blt-2.4z-r1.ebuild 1546 RMD160 fbe03e761a4805d08b09134fc99fe1841ce4ae4e SHA1 6f102bd18477c337311b0b295223d57d2b4b9de6 SHA256 b86793214d4c68ccbf47157907102a36c1280b38323fc42b2b2bd1a3290e792e
 EBUILD blt-2.4z-r2.ebuild 1606 RMD160 7e91c3a0de381bbcf6ef1e4e1e85275455ddf43f SHA1 6708d048eeaa47d8a4e7e1363a8ed771e2461563 SHA256 8549792d32cc66d72efc1809bf4bb91a7638a54a84c81b8715e7abf850a13260
 EBUILD blt-2.4z-r4.ebuild 1865 RMD160 ec33a86ba6eb1da157e63e3fe4985fc61c49098b SHA1 7adb97a3c78c6af7689f566329a7a38dce262a29 SHA256 9b3062e47715d92b1cf0419291af588b3afecd1ee6de58f4c62e7a785f790b23
-MISC ChangeLog 3666 RMD160 eaa815b21568fe49ef58d8e5c60589ec535aa0dc SHA1 0d8d7cf3dca9e2618224731989630970495e1a4b SHA256 f435a86e2496149b278e77e833266e019aeb5273690dba5c3bf4258a64c30376
+EBUILD blt-2.4z-r5.ebuild 2008 RMD160 294a0885ad6202aa25aed1cdd139b80e168611d5 SHA1 fb29104af37a0dbcfb216d794e35da23dfb093ae SHA256 b3ab410d8185d147a858d822928c28a2ec58f28adc9a8c63f46577f3ebe7d48f
+MISC ChangeLog 3810 RMD160 e9f1f23f6456a5c13835f7eb0fff98715ff750b9 SHA1 a51b54dc6c9cb9002ad7cfa2b10a47a0a43006e6 SHA256 0c49798fe9ca98ca70d6ff2a05baea2798daaaaa7aa40b712b6cc6709f6a0a20
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
diff --git a/dev-tcltk/blt/blt-2.4z-r5.ebuild b/dev-tcltk/blt/blt-2.4z-r5.ebuild
new file mode 100644
index 000000000000..8b3de29860a5
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r5.ebuild,v 1.1 2009/08/08 02:44:02 mescalinum Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_V_SUFFIX="-8.5.2"
+HOMEPAGE="http://blt.sourceforge.net/
+http://jos.decoster.googlepages.com/bltfortk8.5.2"
+SRC_URI="http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
+DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
+
+IUSE=""
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/tk-8.0
+	x11-libs/libX11"
+
+S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
+	# From blt-2.4z-6mdk.src.rpm
+	epatch "${FILESDIR}"/blt2.4z-64bit.patch
+
+	#epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
+	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
+
+	# 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() {
+	# bug 167934
+	append-flags -fPIC
+
+	econf --with-blt=/usr/$(get_libdir) || 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 -j1 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
+
+	# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
+	cp "${FILESDIR}"/pkgIndex.tcl "${D}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
+}
diff --git a/dev-tcltk/blt/files/pkgIndex.tcl b/dev-tcltk/blt/files/pkgIndex.tcl
new file mode 100644
index 000000000000..7911d8537b84
--- /dev/null
+++ b/dev-tcltk/blt/files/pkgIndex.tcl
@@ -0,0 +1,2 @@
+package ifneeded BLT 2.4 [list load [file join $dir .. libBLT24.so]]
+package ifneeded BLTlite 2.4 [list load [file join $dir .. libBLTlite24.so]]