revert fix for bug 248162, because of bug 438934

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64

3 files changed, 19 insertions, 16 deletions

diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog
index 676ec8c2b787..b871388ba5b6 100644
--- a/dev-lang/smlnj/ChangeLog
+++ b/dev-lang/smlnj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/smlnj
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.26 2012/10/19 11:04:26 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.27 2012/10/22 12:14:09 hkbst Exp $
+
+  22 Oct 2012; Marijn Schouten <hkBst@gentoo.org> smlnj-110.75.ebuild:
+  revert fix for bug 248162, because of bug 438934
 
   19 Oct 2012; Marijn Schouten <hkBst@gentoo.org> smlnj-110.75.ebuild:
   fix bug 243886, thanks to Michael Weber (xmw@gentoo.org) for providing a
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index 13c936924023..e02ec1ac103e 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -43,6 +43,6 @@ DIST smlnj-110.75-smlnj-lib.tgz 396628 SHA256 2f8196ce2f7509c0ac0a0a69107c1d6815
 DIST smlnj-110.75-system.tgz 227376 SHA256 973f5ebd3b9823365b9dadbf370c0aa131df94d4d80ada660bb05a3010776a2e SHA512 ee6a941f269d51bdd48328c35ae642d6b5f35ef7e9516fef58fad7f6ac3b4a527678265eb7a8a9783eb5e483713fbade17cd6e204234fb9419ad430e42a536a4 WHIRLPOOL a8000d6f22a539922033e740f262b8bb0832d25fd1ba204aed53f4d979d7a2193a7b49b73187c9e4621407d43dd9aeec680b1c57780279fab81549dba29db8f1
 DIST smlnj-110.75-trace-debug-profile.tgz 3902 SHA256 e04a6740166d7f2da41923400fae3b9661d1e52dce4f64efff3a3780c9a6a43c SHA512 b2eed46e58f7b2dd6857debea4ae329dcc79946bd59a63747746d916b2dc29866d3e23a3accd678a981f2ebed0924d1fe1d03744000e877313abc33b144ec694 WHIRLPOOL a4d357c718259d076cad19174d2b4e5ae5949fe47314dca261cf16c5c37c788b5ab43c6f75ca2e37ada45ac67ac0d13df86a2c4cf2a1a4ad046912b0dc22d1c5
 EBUILD smlnj-110.71.ebuild 2217 SHA256 baec0293d49c4ba8e38f9381b8c2dd3ab836f9ef8cc7490129b38c8cc844ebe6 SHA512 82f3446a9312db4598062756829b4805a9d214ada8700df25babe036725c1e6b53c7976480a115a86d3319de4bf4307f78a29b40cb15b407481bca5ae1e249c9 WHIRLPOOL f1680433da26b6535668581da00ddfe7fb6207ea5d94005bfad885281ac248a94944072ef3bedad2f50bcd003efa16f3de7770bd8fbba87876e6d1e272e89cea
-EBUILD smlnj-110.75.ebuild 2677 SHA256 46b268e5e8c119473868b0451e662b5388290663b203baecf428904946584e98 SHA512 ae8aee381ae6ebd09b6e73aa4609ad56658be0709f2233822b1e0e494906b383a50dd0307239615c3de0c75021d586952fe0e45f526a995cb3053530c253b401 WHIRLPOOL 80643c433248ea504d70efd1df18ede4638428b0a7f8af2181df69a45e1271a338c7094b40f4704c5ffb33c655a14623901a1cc7eaa1fbf221e17f5266706969
-MISC ChangeLog 4320 SHA256 f746022008146f90dad5693ddb8721bf57055f260e5049bb6d2327d8859d2c90 SHA512 c0901e07b2bb42bc71493c4af0c66a760e6295aff03268be47d387894820e2c2beb3bf308a516839e2d22bb57a8b320a8d288f07ca758a9b2375d507e4272be6 WHIRLPOOL d891bb320486e34e039f1243aae705be28d010276eff2afb42f230ab1c9a8dd0a0367f25e312b3af70e58d46c920a7d8b31c9d3d95af948549044fc54e8ec1c8
+EBUILD smlnj-110.75.ebuild 2669 SHA256 c032ad2916b55e43aa0619f088772489366af692ae15b97cb8ef17d521b38a41 SHA512 f212d97e26a0260ed4063e1bca1a1dcd3671c47bcebd70a10f1f3ea08c9048da46aadda83b9727558a8769fca415f2b9463d43f4d0a01f790d7a0a204287647b WHIRLPOOL c3e19db105fb61f3fba190bec6e8b3be3220af25c391c19fab18f54813bf8ecc0bca5fe68d5bba5c9081237a45df37c5e2507b1451fcd9ace8909245da6f5913
+MISC ChangeLog 4443 SHA256 787f7971ceebd5be1a1289db049daa94694503f06e3ea23c7e3a50dd4085f940 SHA512 e98cc0754358bdb286e8a8b2339efd52032bd553040846a9116006af0d9f852f3ed56a13a959d7afd9d69e32dcb3f77017cbdc8fc5bceb591ae3688da66de8ac WHIRLPOOL 138e80f5afd29541cb7c640e68e3becebf9972fb0e0bc9a6785bc3d45eb6066af26b7adffaf4c146b67b003c7062c011dd46dbe79ce82f5c92c473e8b701bc0f
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
diff --git a/dev-lang/smlnj/smlnj-110.75.ebuild b/dev-lang/smlnj/smlnj-110.75.ebuild
index afbfa8153d0d..1a61ddb2f799 100644
--- a/dev-lang/smlnj/smlnj-110.75.ebuild
+++ b/dev-lang/smlnj/smlnj-110.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.3 2012/10/19 11:04:26 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.4 2012/10/22 12:14:09 hkbst Exp $
 
 EAPI="4"
 
@@ -70,7 +70,7 @@ src_unpack() {
 	echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl
 }
 
-DIR=/usr/libexec
+DIR=/usr
 
 src_prepare() {
 	# respect CC et al. (bug 243886)
@@ -84,10 +84,10 @@ src_prepare() {
 			-i base/runtime/objs/${file}
 	done
 
-	# stash bin and lib somewhere (bug 248162)
-	sed -e "/@BINDIR@/s:\$BINDIR:${DIR}:" \
-		-e "/@LIBDIR@/s:\$LIBDIR:${DIR}/lib:" \
-		-i config/install.sh || die
+#	# stash bin and lib somewhere (bug 248162)
+#	sed -e "/@BINDIR@/s:\$BINDIR:${DIR}:" \
+#		-e "/@LIBDIR@/s:\$LIBDIR:${DIR}/lib:" \
+#		-i config/install.sh || die
 }
 
 src_compile() {
@@ -98,16 +98,16 @@ src_install() {
 	mkdir -p "${D}"/${DIR} || die
 	mv bin lib "${D}"/${DIR} || die
 
-	for file in "${D}"/${DIR}/bin/*; do
-		dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die
-	done
+#	for file in "${D}"/${DIR}/bin/*; do
+#		dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die
+#	done
 
 #	for file in $(find "${D}"/usr/lib/${PN}/bin/ -maxdepth 1 -type f ! -name ".*"); do
 #		dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die
 #	done
 
-# 	for file in "${D}"/usr/bin/{*,.*}; do
-# 		[[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file}
-# #		[[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file}
-# 	done
+	for file in "${D}"/usr/bin/{*,.*}; do
+		[[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file}
+ #		[[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file}
+	done
 }