Fix for Darwin and Prefix, marked *-macos, bug #355373

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

4 files changed, 111 insertions, 9 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index 686d45ae48f6..43c8ac961a90 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.42 2011/06/13 12:38:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.43 2011/06/27 17:22:24 grobian Exp $
+
+  27 Jun 2011; Fabian Groffen <grobian@gentoo.org> blt-2.4z-r8.ebuild,
+  +files/blt-2.4z-darwin.patch:
+  Fix for Darwin and Prefix, marked *-macos, bug #355373
 
   13 Jun 2011; Justin Lecher <jlec@gentoo.org> blt-2.4z-r8.ebuild:
   Fix compilation under et_EE locale, #367539
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 9fbbaa4c121d..a53099964025 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,3 +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-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
@@ -8,6 +12,13 @@ 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 3134 RMD160 7146d44bf46e760ca406d1e91f5a2243976eff0a SHA1 53cef84e4ee081c419be4c1e369c96238d110f2f SHA256 c25b3c90d50c952fffc30ddfad3cf1c9478e1c0712f59088e951fd7cf34b377f
-MISC ChangeLog 5854 RMD160 68974dad15a4244a714dc185ade367583d0da208 SHA1 036eca79c15a2bc4c0347cbfa4ed3619387bb849 SHA256 79feecd3b121d0cb899d77692eead452577c0750d5b4858740882329371a1815
+EBUILD blt-2.4z-r8.ebuild 3258 RMD160 87c3d9def8c476ac99421ac572e56b5a7cda45ee SHA1 3ebfec0bf36f54942de8e79a1c3067636584e188 SHA256 cd4d16a257e71777aa4de7eff46090e3af37fa9aa2ece4983ad0356a79ea6aaa
+MISC ChangeLog 6018 RMD160 5eb387872d7c0498599183373a249f9ef6c465d0 SHA1 7f04aec16fb00309fe73061eafb92020dd763757 SHA256 67f4370adad7b975d56f7f35d0585a0d6ee6e0ccfbc637a3a9da2728ef6516af
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (Darwin)
+
+iEYEARECAAYFAk4IvCYACgkQX3X2B8XHTomSXwCfYSJyoekoc+JiOhsvecPtPKaa
+wV4Ani5q0uXPcTt3qh9/tf9qWnW2RQzY
+=DJKk
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r8.ebuild b/dev-tcltk/blt/blt-2.4z-r8.ebuild
index 84a33f975a71..535b4749b2e7 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.8 2011/06/13 12:38:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.9 2011/06/27 17:22:24 grobian Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc co
 IUSE="jpeg X"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="
 	dev-lang/tk
@@ -44,6 +44,7 @@ src_prepare() {
 		Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
 
 	epatch "${FILESDIR}"/${P}-linking.patch
+	epatch "${FILESDIR}"/${P}-darwin.patch
 }
 
 src_configure() {
@@ -75,8 +76,8 @@ src_compile() {
 
 src_install() {
 	sed \
-		-e "s:../src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:../bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-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
@@ -98,6 +99,6 @@ src_install() {
 	cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
 
 	# fix for linking against shared lib with -lBLT or -lBLTlite
-	dosym libBLT24.so /usr/$(get_libdir)/libBLT.so || die
-	dosym libBLTlite24.so /usr/$(get_libdir)/libBLTlite.so || die
+	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
new file mode 100644
index 000000000000..1922e3e4db65
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
@@ -0,0 +1,86 @@
+--- configure.in
++++ configure.in
+@@ -183,9 +183,6 @@
+       blt_lib_prefix=""
+     fi
+     ;;
+-  *-*-macosx)
+-    blt_platform="macosx"
+-    ;;
+   *)
+     blt_platform="unix"
+     ;;
+@@ -728,6 +725,9 @@
+   *-hpux*)
+     SHLIB_SUFFIX="sl"
+     ;;
++  *-darwin*)
++    SHLIB_SUFFIX="dylib"
++    ;;
+   *)
+     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 @@
+     LDFLAGS=""
+     ;;
+ 
++  *-darwin*)
++    SHLIB_CFLAGS=""
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    ;;
++
+   *-dgux*)
+     SHLIB_CFLAGS="-K PIC"
+     SHLIB_LD="cc"
+--- configure
++++ configure
+@@ -1279,9 +1279,6 @@
+       blt_lib_prefix=""
+     fi
+     ;;
+-  *-*-macosx)
+-    blt_platform="macosx"
+-    ;;
+   *)
+     blt_platform="unix"
+     ;;
+@@ -3396,6 +3393,9 @@
+   *-hpux*)
+     SHLIB_SUFFIX="sl"
+     ;;
++  *-darwin*)
++    SHLIB_SUFFIX="dylib"
++    ;;
+   *)
+     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 @@
+     LDFLAGS=""
+     ;;
+ 
++  *-darwin*)
++    SHLIB_CFLAGS=""
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    ;;
++
+   *-dgux*)
+     SHLIB_CFLAGS="-K PIC"
+     SHLIB_LD="cc"