QA and prefix support, fixing bug 247195

(Portage version: 2.2_rc65/cvs/Linux x86_64)

3 files changed, 135 insertions, 2 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index f8a96b88ceaf..6b2a1998fbe1 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/blt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.32 2009/09/22 11:55:33 maekke Exp $
+# 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 $
+
+*blt-2.4z-r6 (06 Mar 2010)
+
+  06 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org> +blt-2.4z-r6.ebuild,
+  +files/blt-2.4z-ldflags.patch:
+  EAPI=3, respecting CC & LDFLAGS per 247195, ~{amd86,x86}-linux keyworded,
+  corrected shebangs in demos
 
   22 Sep 2009; Markus Meier <maekke@gentoo.org> blt-2.4z-r5.ebuild:
   amd64 stable, bug #281404
diff --git a/dev-tcltk/blt/blt-2.4z-r6.ebuild b/dev-tcltk/blt/blt-2.4z-r6.ebuild
new file mode 100644
index 000000000000..e99d585d70b6
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r6.ebuild
@@ -0,0 +1,96 @@
+# 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-r6.ebuild,v 1.1 2010/03/06 12:16:07 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
+}
diff --git a/dev-tcltk/blt/files/blt-2.4z-ldflags.patch b/dev-tcltk/blt/files/blt-2.4z-ldflags.patch
new file mode 100644
index 000000000000..bc795d060de8
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-ldflags.patch
@@ -0,0 +1,30 @@
+diff --git a/src/shared/Makefile.in b/src/shared/Makefile.in
+index 5d93e82..db14156 100644
+--- a/src/shared/Makefile.in
++++ b/src/shared/Makefile.in
+@@ -18,7 +18,7 @@ SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ @LD_RUN_PATH@
+ SHLIB_TCL_ONLY_LIB_SPECS = @SHLIB_TCL_ONLY_LIB_SPECS@ 
+ SHLIB_LIB_SPECS = @SHLIB_LIB_SPECS@ 
+ SHLIB_LD =	@SHLIB_LD@
+-LDFLAGS =	@LDFLAGS@ @LD_RUN_PATH@
++LDFLAGS +=	@LDFLAGS@
+ 
+ prefix =	@prefix@
+ exec_prefix =	@exec_prefix@
+@@ -144,14 +144,14 @@ $(lib_so): $(OBJS)
+ 	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \
+ 		$(srcdir)/bltInit.c
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
+ 		$(SHLIB_LIB_SPECS)
+ 
+ $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
+ 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
+ 		$(srcdir)/bltInit.c
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
+ 		$(SHLIB_TCL_ONLY_LIB_SPECS)
+ 
+ install: mkdirs install-lib install-demo