revision bump, now using fork from jdc - fixes #212711

Package-Manager: portage-2.1.4.4

5 files changed, 112 insertions, 2 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index e3359c4bba42..71c0ffdbd9c2 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2008/02/17 04:19:39 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.24 2008/10/26 13:51:06 mescalinum Exp $
+
+*blt-2.4z-r4 (26 Oct 2008)
+
+  26 Oct 2008; Federico Ferri <mescalinum@gentoo.org>
+  +files/blt-2.4z-r4-fix-makefile.patch,
+  +files/blt-2.4z-r4-fix-makefile2.patch, +blt-2.4z-r4.ebuild:
+  revision bump, now using fork from jdc - fixes #212711
 
   16 Feb 2008; Tom Gall <tgall@gentoo.org> blt-2.4z-r1.ebuild:
   stable on ppc64
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index efbf8742a5ca..cc6d20a6a4d0 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,7 +1,11 @@
+AUX blt-2.4z-r4-fix-makefile.patch 728 RMD160 da244400b70514fd1a93d7fe4e879c3994b97d89 SHA1 b993491b81aba8338324a0c4eb6d0bdae6c4a7b7 SHA256 0e86408ddd6d97ed4fe198c29a06e6c28e72116690672757e6926222df45cea7
+AUX blt-2.4z-r4-fix-makefile2.patch 647 RMD160 f2d6f56fa1a0a2b15aab40b358f3b1053ad4c1d5 SHA1 8dca3a1a5812fecc01f783c39eb91f18b9c55a11 SHA256 1e1b42984e4fc1fc9c56de989c388c3543e830afd1679ea652dccc5793b9f050
 AUX blt2.4z-64bit.patch 891 RMD160 f2bc82f9a98d632480fc678af7a94fdf8899810d SHA1 22624ed8ba4b002212f5f2bf3adb5ac80c923439 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b7e460435408000ca2f5
 AUX blt2.4z-install.diff 1057 RMD160 4531572aa1177ab362d522964a8f62d6401ff237 SHA1 47b65e77e663cf95282612216a2fb4c8d8dda725 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8
 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
-MISC ChangeLog 3254 RMD160 c118a38ae295f2064560181165fee4c9fb45113f SHA1 451af103ef999f8f06f518fe36872b0bc268ee4e SHA256 90f2be8360c167f5c1643a3e1ea53558afe51327afe0f0c0ba57b4f76b6335ea
+EBUILD blt-2.4z-r4.ebuild 1865 RMD160 ec33a86ba6eb1da157e63e3fe4985fc61c49098b SHA1 7adb97a3c78c6af7689f566329a7a38dce262a29 SHA256 9b3062e47715d92b1cf0419291af588b3afecd1ee6de58f4c62e7a785f790b23
+MISC ChangeLog 3503 RMD160 a7da3e61bc58966d76146c1f6c007d458da02bcb SHA1 758216af22a2c3c5dd3259d1641f457b7026d028 SHA256 f363857cbb600e1ec338e6be74495595bf6dfae055cafd1f6f24b709db6016bb
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
diff --git a/dev-tcltk/blt/blt-2.4z-r4.ebuild b/dev-tcltk/blt/blt-2.4z-r4.ebuild
new file mode 100644
index 000000000000..0bf778fffab2
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r4.ebuild,v 1.1 2008/10/26 13:51:06 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
+}
diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch
new file mode 100644
index 000000000000..0b5b852df70c
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch
@@ -0,0 +1,20 @@
+--- library/Makefile.in.orig	2008-10-26 14:30:28.000000000 +0100
++++ library/Makefile.in	2008-10-26 14:31:40.000000000 +0100
+@@ -45,7 +45,7 @@ all: pkgIndex
+ 
+ pkgIndex: 
+ 	rm -f pkgIndex.tcl
+-	sed -e 's/%VERSION%/$(version)/' $(srcdir)/pkgIndex.tcl.in | \
++	sed -e 's/%VERSION%/$(version)/' $(INSTALL_ROOT)$(srcdir)/pkgIndex.tcl.in | \
+ 	sed -e 's/%LIB_PREFIX%/$(lib_prefix)/' | \
+ 	sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl
+ 
+@@ -58,7 +58,7 @@ install: mkdirs pkgIndex
+ 	for i in $(miscFiles) ; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
+ 	done 
+-	$(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
+ 
+ mkdirs:
+ 	@for i in $(instdirs) ; do \
diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch
new file mode 100644
index 000000000000..42b919d7c21f
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2008-10-26 14:36:22.000000000 +0100
++++ Makefile.in	2008-10-26 14:37:04.000000000 +0100
+@@ -47,9 +47,9 @@ install-all:
+ 	(cd library; $(MAKE) install)
+ 	(cd man; $(MAKE) install)
+ 	(cd demos; $(MAKE) install)
+-	$(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
+-	$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
+-	$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
++	$(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
++	$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
++	$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
+ 
+ mkdirs:
+ 	@for i in $(instdirs) ; do \