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

(Portage version: 2.2.01.18826-prefix/cvs/Darwin powerpc)

4 files changed, 116 insertions, 21 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/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*)