Add symlink so that -lBLT hits the shared lib

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

3 files changed, 111 insertions, 5 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index 6b2a1998fbe1..4dc86cbe402c 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/blt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.33 2010/03/06 12:16:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.34 2010/03/21 20:05:21 jlec Exp $
+
+*blt-2.4z-r7 (21 Mar 2010)
+
+  21 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org> +blt-2.4z-r7.ebuild:
+  Add symlink so that -lBLT hits the shared lib
 
 *blt-2.4z-r6 (06 Mar 2010)
 
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 914a386434f3..9252ad370729 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -13,12 +13,13 @@ DIST blt2.4z-8.5.2.tar.gz 2326234 RMD160 1012e0a21a9b45957d6482e55e21b9e54e3f1db
 EBUILD blt-2.4z-r1.ebuild 1546 RMD160 fbe03e761a4805d08b09134fc99fe1841ce4ae4e SHA1 6f102bd18477c337311b0b295223d57d2b4b9de6 SHA256 b86793214d4c68ccbf47157907102a36c1280b38323fc42b2b2bd1a3290e792e
 EBUILD blt-2.4z-r5.ebuild 2019 RMD160 3c4621ed1444563a5230d93bbaacf9ce996142a1 SHA1 2125adf5c0a69ecaff278dad225af8d4d2b4de70 SHA256 50c7cbb9a84c13ba123372af8bf7ecdfe2b960a3ed7ff6b89b8679555af1a2d4
 EBUILD blt-2.4z-r6.ebuild 2927 RMD160 4891fa495042809d0439ebe7f56939f105990ead SHA1 0ffaa8becfbffeef615a81f5b341391c8e914c3b SHA256 e2050eb7017efc14a0a1c082a789ae9182a4dac2dd32dc7dc678988cb0b44935
-MISC ChangeLog 4658 RMD160 7ab25883d60ff129f296a808df57d7a60c688ec6 SHA1 060283dca176aa8bdafe9c79ef367160f08868ec SHA256 c44b8444c795852dbb176e9b50ff32c297e5b7dd6fb72f321bdf86846bdfafbc
+EBUILD blt-2.4z-r7.ebuild 3108 RMD160 cf5f64fd794027caac7a39fde7dbc3024ca93595 SHA1 5ef78d2187cc1fe55acc1b8fc4397f1782d34ba5 SHA256 d0cfc0f380eece2a045bd7e41f5164214823aca024180d06e602220192d529e9
+MISC ChangeLog 4810 RMD160 cf10c6c9feaa2379594b7fef83064d4348ed3501 SHA1 ffb6ee9f27c936f6bb32b77f73f3c94820aaa073 SHA256 69d8e10b4ec6d5d7b31a38d53c82e2a804b2f25d68cf35a62f5b8e8c63088c8c
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuSR40ACgkQgAnW8HDreRZP8ACg0cxpuALsVI7I0XWKpr+VVz4R
-rwUAoK7aXP8a0Lkfa5f57oQ1SatXQ0L2
-=cSvd
+iEYEARECAAYFAkumfAYACgkQgAnW8HDreRZsPQCeJXgDMiGJZvjid/X/yccICCgg
+DdkAn2fpL95ITwc9PL6QhWz5cuYknDT0
+=WGqw
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r7.ebuild b/dev-tcltk/blt/blt-2.4z-r7.ebuild
new file mode 100644
index 000000000000..d97f98521187
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r7.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r7.ebuild,v 1.1 2010/03/21 20:05:21 jlec Exp $
+
+EAPI="3"
+
+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="jpeg X"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-lang/tk-8.0
+	jpeg? ( media-libs/jpeg:0 )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
+
+src_prepare() {
+	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
+
+	epatch "${FILESDIR}"/${P}-ldflags.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_configure() {
+	# bug 167934
+	append-flags -fPIC
+
+	econf \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		--with-blt="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclincls="${EPREFIX}"/usr/include \
+		--with-tkincls="${EPREFIX}"/usr/include \
+		--with-tcllibs="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tklibs="${EPREFIX}"/usr/$(get_libdir) \
+		--with-cc="$(tc-getCC)" \
+		--with-cflags="${CFLAGS}" \
+		$(use_enable jpeg) \
+		$(use_with X x) \
+		|| die "./configure failed"
+
+}
+
+src_compile() {
+	# parallel borks
+	emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	sed \
+		-e "s:../src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:../bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
+		-i demos/{,scripts/}*.tcl || die
+
+	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 "${ED}"/usr/share/man/mann` ; do
+		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
+	done
+
+	# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
+	cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
+
+	# fix for linking against shared lib with -lBLT or -lBLTlite
+	dosym libBLT24.so /usr/$(get_libdir)/libBLT.so || die
+	dosym libBLTlite24.so /usr/$(get_libdir)/libBLTlite.so || die
+}