Respect compiler, skip mono tests cause they are badly broken, bug #498484

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 26 insertions, 14 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index 80e7f7e9b438..51e0c379d880 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.30 2014/01/18 18:44:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.31 2014/02/19 12:27:25 pinkbyte Exp $
+
+  19 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
+  Respect compiler, skip mono tests cause they are badly broken, bug #498484
 
   18 Jan 2014; Pacho Ramos <pacho@gentoo.org> Ice-3.5.1.ebuild:
   Revert as I was hitting bug #498484 but this the stab with the wrong bug
diff --git a/dev-libs/Ice/Ice-3.5.1.ebuild b/dev-libs/Ice/Ice-3.5.1.ebuild
index 6af3cbc6fc50..75c255ffe304 100644
--- a/dev-libs/Ice/Ice-3.5.1.ebuild
+++ b/dev-libs/Ice/Ice-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.5 2014/01/18 18:44:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.6 2014/02/19 12:27:25 pinkbyte Exp $
 
 EAPI=5
 
@@ -80,10 +80,15 @@ src_prepare() {
 		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
 		cs/config/Make.rules.cs || die "sed failed"
 
+	# skip mono tests, bug #498484
+	sed -i \
+		-e 's|^\(SUBDIRS.*\)test|\1|' \
+		cs/Makefile || die "sed failed"
+
 	if ! use test ; then
 		sed -i \
 			-e 's|^\(SUBDIRS.*\)test|\1|' \
-			{cpp,cs,php,py,rb}/Makefile || die "sed failed"
+			{cpp,php,py,rb}/Makefile || die "sed failed"
 	fi
 }
 
@@ -100,7 +105,7 @@ src_configure() {
 
 	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
 	sed -i \
-		-e "s|c++|$(tc-getCXX)|" \
+		-e "s|g++|$(tc-getCXX)|" \
 		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
 		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
 		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
@@ -131,9 +136,8 @@ src_configure() {
 }
 
 src_compile() {
-	if tc-is-cross-compiler ; then
-		export CXX="${CHOST}-g++"
-	fi
+	# Do not remove this export or build will break!
+	tc-export CXX
 
 	emake -C cpp ${MAKE_RULES} || die "emake failed"
 
@@ -257,7 +261,8 @@ src_test() {
 	fi
 
 	if use mono ; then
-#		ewarn "Tests for C# are currently disabled."
-		run_tests cs || die "emake cs test failed"
+		# skip mono tests, bug #498484
+		ewarn "Tests for C# are currently disabled."
+#		run_tests cs || die "emake cs test failed"
 	fi
 }
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index eb1988bb1bd4..23262de874e5 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -12,13 +12,17 @@ DIST Ice-3.5.1.pdf 8279548 SHA256 236f509a3868301ebe688f50417f30155ffa1d330a6c7a
 DIST Ice-3.5.1.tar.gz 4799296 SHA256 989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392 SHA512 610fa317bd75e64802d1b5216db4747f86157d3246a2022397bafaefdd9b1b78d131733762003ee779065401c8a83120db65cf9b86fbf1914266309571baf58f WHIRLPOOL 0b760edcd7e3eb1220af81a2236634b86775a18050b0645e4e662bf0fb543aa14177d83e2c8659a62bd5bf6e403384998b893e84b9d547c32bbc2064b5f7de9c
 EBUILD Ice-3.4.2.ebuild 6943 SHA256 223d6682df8a00fbe262b9fa881cc67110e75b7eccd6769137b551715f087339 SHA512 ddb90a72e4adb1a660d54ab562ec1d54492c417f94cdc7e02db6db0b147c3c9ed49c09f11a267da2d1c821ae5563dd639c5dda18adc64ef2b024d0a04c2d95ad WHIRLPOOL 81f67259aa23356b35d0673d6fd0f91acf41a72538d021c6061b30e3368558593cc6f3b2f124eddd1582a864723b97cdafa8b2ac770ac2e754965aa51037083c
 EBUILD Ice-3.5.0-r1.ebuild 6742 SHA256 b313b7484483e7ed33895e786bf2cab4b1e89333df61609050e6c6d4b906dd49 SHA512 d0c9969881a9cf7f433f2c2a9398f1b8099f6968dac016ff27e09214d69be742507f94b450d816d1bebcad8473a4d24cf3c34d7259073d0f8961476c0d99dd94 WHIRLPOOL 3076974438db2d3f7a4cba7bc41d4f97985881107a0739f8feadfa38317aa933254eac393378f299dc39097fa547eee852c9e0262edfee1800b9c1ec3884015b
-EBUILD Ice-3.5.1.ebuild 6778 SHA256 0d853116ad674b9a28f20816e3df5e9bf407f0fa808abae78e2dc0d5940b0f9d SHA512 b8c4d0172c1489249e97564bfca89508a94047003f1728024684c86a83b9a1b8a95549656b015df5fd9619f90ea8b51d07d56fa362eefa019996223fc24cb111 WHIRLPOOL 67831d84f5461f30f3b700f0593748de64cd9784e14f5107540c487cf702c11e07a191cbfcfc1fe2e1b20c2193d491a67b2f79572e517b12b296de888b01627a
-MISC ChangeLog 11971 SHA256 6c5b0851343901720540a9d8d12d5dbfb9d73ba4c44af9ae7afbc15e0c283ab5 SHA512 9338f75b1d94d880b0f3d9d9d51e8642344de89a5cb3c8275a20e38b7647f8324ca4604cf39bdc53e7b53ef11d00fa8b225bd1a7fe426d57947444873301808b WHIRLPOOL f541ed95edaddd1f8373ebf99101a43acc344c5e6ac528b0c02d62f2db6adf344573fc1316642b5d1b26cb2366dda37c3019e922d91740388b99fd69048c7e71
+EBUILD Ice-3.5.1.ebuild 6923 SHA256 f422cff1332cfb39c4a59560c3ce9f9d1e3fb97d5871eca8921ff86d0fbe968d SHA512 13333c6dec89c0510c5db88b594cc2cbf9b00b7e297abd81868200653887fe1b1fa76225cb5a58aeb5b1401970f95e97508278ae6da7496cda7bd87729453ad4 WHIRLPOOL 78854f3b193ed0f92ec9dc5fa472df9392a6970ec30137ced9e948f557f63d3e9308219c7feb524c50f430e8cc67222087f600106c9e2f86ce80e18e9de504b4
+MISC ChangeLog 12120 SHA256 212b17ae8b2a1bcaf14f3765b0074359046329b008fc8d1947a7458fc5aa6cf7 SHA512 adcd6d9b78c5d731747a5d85ca3a9956bea3ecb74e8f2d0792d5ee83bbf4598be82eb67891b0bba12db38df5128f753f8f60376d348fbc521dc4663e6552bd5a WHIRLPOOL a690f8195887b2f0dabaf99ddc6477f1d765aac585fa86d4e804ba25b180bfb62556ca99a77700f8302addd3f6783613030284fa423e5340c1a0280122527f08
 MISC metadata.xml 339 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 SHA512 a52d0a34b45483cbf16e870e458c31e002a62fbe4c18b7839964476696a8650c6db254392f8ff6166f4a434958eb2384cd3267f004c45726d75907983f494e60 WHIRLPOOL 8362526bb468b608b63bb17ea08ee20050904aeed1728efea1e48420fb2b5e820cedcedbecee0a37c0a2b061e0a06aa67ce6b18e148d4fbb785d528e6a80c2f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLay3IACgkQCaWpQKGI+9R0rACfd6h358t9ow7M70ZFEJSdD8Ry
-jCMAn3VscpOgEF04mE20x7G7dQDzm427
-=/ol+
+iQEcBAEBCAAGBQJTBKMjAAoJECo/aRed9267LYUH/ibRYmW19reGzt6eTl71owTD
+yqXP3y/Skrf6JgI//YFqZl6y5/WrBC5I/nfC3Z0lsY/6t5i7t7aIf2SE6+EA6erS
+kZNK17WDIVqg/hkx61PTS0wmDFses37nCgHcL/R3DV3Q/KN8VML7XRiVylD8l3za
+P59qGMfDRCuZovIY1l+HGh2DOGvzUWM/ugwLeravC3D1+urPswuh4+wwMvsSWMPu
+EM1FBFCaez7p8BjJ9F3bYp5LvIV5UHbo5wwxel+G/FQR/NUa3LaOVQw3S9CqUjeK
+IS5IwAj46/+hIajZTPbF72IHWCIHurkpGTG4AUiCQNOyPxugg6SWA/QDWxnRpbo=
+=EOAC
 -----END PGP SIGNATURE-----