Dropped rpath definitions, #359781; Bumped to EAPI=4

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index 3a986e9479681ea9985c7af1fecd5ea913c81a13..2acec7a86ac62850d5ba97bd23a37d8140d04cfd 100644 (file)
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/blt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.47 2011/08/05 11:12:07 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.48 2011/10/24 17:50:58 jlec Exp $
+
+*blt-2.4z-r10 (24 Oct 2011)
+
+  24 Oct 2011; Justin Lecher <jlec@gentoo.org> +blt-2.4z-r10.ebuild,
+  metadata.xml:
+  Dropped rpath definitions, #359781; Bumped to EAPI=4
 
   05 Aug 2011; Naohiro Aota <naota@gentoo.org> blt-2.4z-r9.ebuild:
   Add ~x86-fbsd.

diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index b0a9db62f0a2a99bb3ec803b570ab4ce5b69c351..8b2d11c8f9389b88cfa417742355925dbaa41c92 100644 (file)
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX blt-2.4z-darwin.patch 1186 RMD160 fda20dc982aa1d7bce63e3ed248b7504e1389e5f SHA1 f6e19c0444943a106afaf9708e0bcc06f53f8636 SHA256 3cbdbbf123aeb4b4a727704c2daabddb7a4a44e23c2d0bd7652c0b0b0aa8d297
 AUX blt-2.4z-ldflags.patch 1086 RMD160 dc9bb13405d8c89aa86ed57e994abef8059163db SHA1 813a6f7461364568b35630a1d5e281334efc8d7e SHA256 20245d45dfb0e96afe1127fa40209a7881fbd3f3880ef04af9496809a308f06e
@@ -11,15 +11,16 @@ AUX blt2.4z-64bit.patch 891 RMD160 f2bc82f9a98d632480fc678af7a94fdf8899810d SHA1
 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-8.5.2.tar.gz 2326234 RMD160 1012e0a21a9b45957d6482e55e21b9e54e3f1db2 SHA1 217986ef73dfbb9f64d4af7da0248e28ee2f6cab SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16
+EBUILD blt-2.4z-r10.ebuild 3304 RMD160 716d6ab933274cc3aec96320813749e90a5d4566 SHA1 a489e3679f750fb81b106aa1d2edf1d5702a90b7 SHA256 ec2aedc2447601334b7f5f1b9c4b73fc85834f37f1a0c5c0192cb87b095b0f92
 EBUILD blt-2.4z-r5.ebuild 1977 RMD160 43678707ba9c6b0e394113ec9c8882447b8feca2 SHA1 d4b6fd944ac48a4443ad685f86e0e2a6f7459fc1 SHA256 ea16bcd0a3745126b1a28944600866f565b60e8dadcc142122eea501fadc6fae
 EBUILD blt-2.4z-r8.ebuild 3277 RMD160 55dc9b187156f640de49c32e36395719aec92c3c SHA1 b1058412ea466a287fc9aef55f147cf561c2768f SHA256 a50f5b2a8117829ce1b2816a81ac7515d5dca00bd255f9ac45bc827cd8227642
 EBUILD blt-2.4z-r9.ebuild 3330 RMD160 5f385075916fa9df0066f996b1f2efefd461bb31 SHA1 aa3feed4f8aa42fda3b0fdc1d904fef79430ebea SHA256 066849a92b732b24ba67e9695bde90e375fac767c66f72cbecf4fc470aeca4ba
-MISC ChangeLog 6519 RMD160 aac84bdcc60911e75d4e17b3cb40e4398bf1ed26 SHA1 3626b1208a0858cd310d7340572a4f9f105e8281 SHA256 6362be7146c5a650861c88873d83d21cb604d60284f6393debcfeb8b97bb84b7
-MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+MISC ChangeLog 6688 RMD160 c91550df839f2ec3eb792bc33edb855ed008c8d6 SHA1 1d17d55ba8f8a0fe0d74680075a27945ce5d2326 SHA256 4ce216f913070128eb8f0325aa54720b0e1a24ceb29fcfcdfd5d9081e0fd2338
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk470BQACgkQGpDnPLSHuMCExgCgiQC/8N12mAYGHBa95bAlFu7f
-mVMAoMjyNCN0a3n4SnUD1l5rUT78LG+x
-=z7Cg
+iEYEAREKAAYFAk6lpY0ACgkQgAnW8HDreRYR4gCgmGEWG8wd5aa43rlJ8rQHbb7F
+F5sAoLNWomofrcVjr3Vp5xhql/Ls5YU/
+=e3ng
 -----END PGP SIGNATURE-----

diff --git a/dev-tcltk/blt/blt-2.4z-r10.ebuild b/dev-tcltk/blt/blt-2.4z-r10.ebuild
new file mode 100644 (file)
index 0000000..4d23364
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r10.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.1 2011/10/24 17:50:58 jlec Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_V_SUFFIX="-8.5.2"
+
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
+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"
+
+IUSE="jpeg X"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+       dev-lang/tk
+       jpeg? ( virtual/jpeg )
+       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 and drop RPATH
+       sed \
+               -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
+               -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
+               -i configure* || die "sed configure* failed"
+       sed \
+               -e "/^scriptdir =/s:lib:$(get_libdir):" \
+               -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
+
+       epatch "${FILESDIR}"/${P}-linking.patch
+       epatch "${FILESDIR}"/${P}-darwin.patch
+}
+
+src_configure() {
+       # bug 167934
+       append-flags -fPIC
+
+       LC_ALL=C \
+       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)
+
+}
+
+src_compile() {
+       # parallel borks
+       emake -j1 LDFLAGS="${LDFLAGS}"
+}
+
+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
+       emake -j1 INSTALL_ROOT="${D}" install
+
+       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$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
+       dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
+}

diff --git a/dev-tcltk/blt/metadata.xml b/dev-tcltk/blt/metadata.xml
index d9408d8ab0785e07f978c7e43d45c302f8dd1a8d..815cc916f2b618800a230fc210b5dcb89f243616 100644 (file)
--- a/dev-tcltk/blt/metadata.xml
+++ b/dev-tcltk/blt/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+       <herd>tcltk</herd>
 </pkgmetadata>