Fix broken darwin patch, thanks Honza Macháček in bug #373695

Package-Manager: portage-2.2.01.18826-prefix/cvs/Darwin powerpc

5 files changed, 124 insertions, 28 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index afee96b6fd67..8520e067fc8c 100644
--- 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.44 2011/06/27 17:30:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.45 2011/07/01 14:54:53 grobian Exp $
+
+*blt-2.4z-r9 (01 Jul 2011)
+
+  01 Jul 2011; Fabian Groffen <grobian@gentoo.org> blt-2.4z-r8.ebuild,
+  +blt-2.4z-r9.ebuild, files/blt-2.4z-darwin.patch:
+  Fix broken darwin patch, thanks Honza Macháček in bug #373695
 
   27 Jun 2011; Fabian Groffen <grobian@gentoo.org> blt-2.4z-r8.ebuild:
   Marked *-solaris, bug #355373
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 79de618f622f..78c2b2446cd7 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX blt-2.4z-darwin.patch 1500 RMD160 45dc13b26d930aeb9ceda9e233a1d8f342e72be4 SHA1 e05e7e9b7e29cb5db491a73909e15f9e5e9bad82 SHA256 6b0d0c5a0de8aba4c8c9529c99cb358e269b459c3ae4c3dd8c7ef4e160cbdf8a
+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
 AUX blt-2.4z-linking.patch 684 RMD160 14fda8108cebdcfa170677976dd1af80b2f489cc SHA1 77d56fbe846bf4990ddbb64b4eacd2350447886e SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6a973b9a14201f45e5467a2
 AUX blt-2.4z-r4-fix-makefile.patch 817 RMD160 dcd6f91b7be961df99143ebe6f7acebb116e01b6 SHA1 4049c4c4eda24fc2c57def93f09c24176c83a132 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8
@@ -12,13 +12,14 @@ AUX blt2.4z-install.diff 1057 RMD160 4531572aa1177ab362d522964a8f62d6401ff237 SH
 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-r5.ebuild 1977 RMD160 43678707ba9c6b0e394113ec9c8882447b8feca2 SHA1 d4b6fd944ac48a4443ad685f86e0e2a6f7459fc1 SHA256 ea16bcd0a3745126b1a28944600866f565b60e8dadcc142122eea501fadc6fae
-EBUILD blt-2.4z-r8.ebuild 3317 RMD160 c5b87fa3c78441141cc9869f0d34c2bd87459ae5 SHA1 747859f2d0af034a7b8e2c0a7c1ea65d4469fb7c SHA256 9c224900c1a7514ad45d071f9f9eb12735745eb603916a7ed2f8e47a719692fd
-MISC ChangeLog 6122 RMD160 de425a69b9c6d993fa430eb79db40785b2bfaa27 SHA1 e706d47261fedb03722d56febe434f3576b57d6f SHA256 f0f617146b1bc472d770881bd020c064696c5b99eba693dd8eab5aa1d0e530d4
+EBUILD blt-2.4z-r8.ebuild 3277 RMD160 55dc9b187156f640de49c32e36395719aec92c3c SHA1 b1058412ea466a287fc9aef55f147cf561c2768f SHA256 a50f5b2a8117829ce1b2816a81ac7515d5dca00bd255f9ac45bc827cd8227642
+EBUILD blt-2.4z-r9.ebuild 3316 RMD160 86ae89aaa884bd9efce07f89d8baa95e27d3e228 SHA1 d67e690e14f2b8220b2c76056bfdf3c09eba18bc SHA256 6d595fefacd55029272007a58632377d64ef49d0b0fea01beac01a16f0ae28bc
+MISC ChangeLog 6340 RMD160 cfbb3f4a8ee0d4bc4908e10c5a665f4758138c66 SHA1 cd19c1d11650dca1b2c936990c7d71d6447680c8 SHA256 856b2a3e3e161a2755e39bac8e3b591ad2c720959e81e976165037e8c777dc63
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (SunOS)
+Version: GnuPG v2.0.17 (Darwin)
 
-iEYEARECAAYFAk4IviMACgkQX3X2B8XHTollQgCfaDTfPhEC6dnesS7v05drHKac
-1CoAn095OfIfa7y5Ep3XXrADv5oAHGRv
-=g77I
+iEYEARECAAYFAk4N35EACgkQX3X2B8XHTonSOACdG+FB1vhR8+iO9A4Kbw9nEW1a
+eXwAn0wmgkLU/9TYq+4C4Xp/wFfjGfPN
+=iDEW
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r8.ebuild b/dev-tcltk/blt/blt-2.4z-r8.ebuild
index bc6667665fcb..943cd35b3bab 100644
--- a/dev-tcltk/blt/blt-2.4z-r8.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r8.ebuild
@@ -1,6 +1,6 @@
 # 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-r8.ebuild,v 1.10 2011/06/27 17:30:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.11 2011/07/01 14:54:53 grobian Exp $
 
 EAPI="3"
 
@@ -44,7 +44,6 @@ src_prepare() {
 		Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
 
 	epatch "${FILESDIR}"/${P}-linking.patch
-	epatch "${FILESDIR}"/${P}-darwin.patch
 }
 
 src_configure() {
diff --git a/dev-tcltk/blt/blt-2.4z-r9.ebuild b/dev-tcltk/blt/blt-2.4z-r9.ebuild
new file mode 100644
index 000000000000..ddb129e46e7f
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r9.ebuild
@@ -0,0 +1,104 @@
+# 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-r9.ebuild,v 1.1 2011/07/01 14:54:53 grobian 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="Extension to Tk, adding new widgets, geometry managers, and misc commands"
+
+IUSE="jpeg X"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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
+	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"
+
+	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}" || 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$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) || die
+	dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) || die
+}
diff --git a/dev-tcltk/blt/files/blt-2.4z-darwin.patch b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
index 1922e3e4db65..0d766fe5e17f 100644
--- a/dev-tcltk/blt/files/blt-2.4z-darwin.patch
+++ b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
@@ -20,15 +20,7 @@
    *)
      SHLIB_SUFFIX="so"
      ;;
-@@ -1053,7 +1053,6 @@
- SHLIB_LD_FLAGS="$TCL_LD_FLAGS"
- SHLIB_RUNPATH="$TCL_LD_SEARCH_FLAGS"
- 
--SHLIB_SUFFIX=".so"
- SHLIB_TARGET=""
- SHLIB_CFLAGS=""
- SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}"
-@@ -1145,6 +1145,12 @@
+@@ -1145,6 +1145,13 @@
      LDFLAGS=""
      ;;
  
@@ -36,6 +28,7 @@
 +    SHLIB_CFLAGS=""
 +    SHLIB_LD="${CC}"
 +    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    SHLIB_SUFFIX=".dylib"
 +    ;;
 +
    *-dgux*)
@@ -63,15 +56,7 @@
    *)
      SHLIB_SUFFIX="so"
      ;;
-@@ -3853,7 +3853,6 @@
- SHLIB_LD_FLAGS="$TCL_LD_FLAGS"
- SHLIB_RUNPATH="$TCL_LD_SEARCH_FLAGS"
- 
--SHLIB_SUFFIX=".so"
- SHLIB_TARGET=""
- SHLIB_CFLAGS=""
- SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}"
-@@ -3943,6 +3943,12 @@
+@@ -3943,6 +3943,13 @@
      LDFLAGS=""
      ;;
  
@@ -79,6 +64,7 @@
 +    SHLIB_CFLAGS=""
 +    SHLIB_LD="${CC}"
 +    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    SHLIB_SUFFIX=".dylib"
 +    ;;
 +
    *-dgux*)