QA and prefix support, fixing bug 247195

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

4 files changed, 142 insertions, 7 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/Manifest b/dev-tcltk/blt/Manifest
index 8a0f59e2c1c9..914a386434f3 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX blt-2.4z-ldflags.patch 1086 RMD160 dc9bb13405d8c89aa86ed57e994abef8059163db SHA1 813a6f7461364568b35630a1d5e281334efc8d7e SHA256 20245d45dfb0e96afe1127fa40209a7881fbd3f3880ef04af9496809a308f06e
 AUX blt-2.4z-r4-fix-makefile.patch 817 RMD160 dcd6f91b7be961df99143ebe6f7acebb116e01b6 SHA1 4049c4c4eda24fc2c57def93f09c24176c83a132 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8
 AUX blt-2.4z-r4-fix-makefile2.patch 728 RMD160 12969f521f1079670b639626061e7db4a74ea352 SHA1 ac130c9472a7bf0d8b76390f22c73d812d7e646b SHA256 aece52e1771d097498cf88bb1fe286ac698a46af0d07163c4b9d184440ab7d39
 AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 RMD160 ec7999c78fe95bdfff2785c125d48b0b09776e4e SHA1 e41d9334db9dd1fc4f5fe03777c940dedbcb0c24 SHA256 a44ed43bbb946d8fc11bb8f416680a536ffc7c0d78faf33030ec378d67d3d287
@@ -11,12 +12,13 @@ DIST BLT2.4z.tar.gz 2200973 RMD160 d54d9fdb6c61391c191afab4701716d18a3d928b SHA1
 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-r5.ebuild 2019 RMD160 3c4621ed1444563a5230d93bbaacf9ce996142a1 SHA1 2125adf5c0a69ecaff278dad225af8d4d2b4de70 SHA256 50c7cbb9a84c13ba123372af8bf7ecdfe2b960a3ed7ff6b89b8679555af1a2d4
-MISC ChangeLog 4417 RMD160 7a6659deeb302de73d9b5989034e0fbd8aa2016a SHA1 f74f3d45671b524fc417113f9d2b8d9b968c0a1e SHA256 eebc1911a51d8158114d6b4905bbeea3db75c7dbc46e4dc0f15207956f983159
+EBUILD blt-2.4z-r6.ebuild 2927 RMD160 4891fa495042809d0439ebe7f56939f105990ead SHA1 0ffaa8becfbffeef615a81f5b341391c8e914c3b SHA256 e2050eb7017efc14a0a1c082a789ae9182a4dac2dd32dc7dc678988cb0b44935
+MISC ChangeLog 4658 RMD160 7ab25883d60ff129f296a808df57d7a60c688ec6 SHA1 060283dca176aa8bdafe9c79ef367160f08868ec SHA256 c44b8444c795852dbb176e9b50ff32c297e5b7dd6fb72f321bdf86846bdfafbc
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkq4u2IACgkQkKaRLQcq0GK2kACeNi9ZciX9k7KcahiLwa9z/DnC
-WLAAn2uiZ8hWHI4dCnDSothx6dkAYJEI
-=J46H
+iEYEARECAAYFAkuSR40ACgkQgAnW8HDreRZP8ACg0cxpuALsVI7I0XWKpr+VVz4R
+rwUAoK7aXP8a0Lkfa5f57oQ1SatXQ0L2
+=cSvd
 -----END PGP SIGNATURE-----
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