Don't abort with src_test, just because there is no testsuite (#297954); allow building on amd64 multilib

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 26 insertions, 19 deletions

diff --git a/dev-lang/tendra/ChangeLog b/dev-lang/tendra/ChangeLog
index 509fdcfd2ad5..ff8e19893e00 100644
--- a/dev-lang/tendra/ChangeLog
+++ b/dev-lang/tendra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tendra
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/ChangeLog,v 1.8 2008/12/14 20:59:32 truedfx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/ChangeLog,v 1.9 2009/12/23 19:53:47 truedfx Exp $
+
+  23 Dec 2009; Harald van Dijk <truedfx@gentoo.org>
+  tendra-5.0_pre20070510-r2.ebuild:
+  Don't abort with src_test, just because there is no testsuite (#297954);
+  allow building on amd64 multilib
 
 *tendra-5.0_pre20070510-r2 (14 Dec 2008)
 
diff --git a/dev-lang/tendra/Manifest b/dev-lang/tendra/Manifest
index 0e0c68f6ef06..ca6b84768cbb 100644
--- a/dev-lang/tendra/Manifest
+++ b/dev-lang/tendra/Manifest
@@ -5,15 +5,15 @@ DIST TenDRA-4.1.2.tar.bz2 2852170 RMD160 fa5c6c840e828739b201900a173a230619a9de9
 DIST tendra-1073.tbz2 5030282 RMD160 ee0a3f5ba6a81af2105c3b839fb984f62694fe85 SHA1 7d682402255c8568cde4fd6b3e8a4a498aaab30a SHA256 45e383220ec7e57514966531ce8455d937d86e6081a1765f4e504aafbc7a797b
 DIST tendra-4.1.2-minix.patch.bz2 5936 RMD160 8949192b4efe14a8659a55e6d56d175ad4692457 SHA1 36ef117bd06265eacf2b4f1441ccf2c4fbbc3354 SHA256 da9879cc30f0eba30f78923b16e37c5f00ce59dd193de0c8550cf87d0f6f15c5
 DIST tendra-4.1.2-misc.patch.bz2 5001 RMD160 93d713fcf9a3463f2a585a0a69f25f0c17b31fbb SHA1 22ddb06ce29f94aae5d661263835da14d55a89dc SHA256 ba6a46371f84ee68d09b5681bbe4b0e54127b66cf29cf7aee19bc238f7e2e6f6
-DIST tendra-patches-1.5.tbz2 129222 RMD160 09cb0581b945683d8797c2fe9769d6c383dec9b5 SHA1 0b3dbc7040f503adcfde4ced4c581d62eea8fd01 SHA256 80561107efee04c57f2e7dde9da697cb1a633a3885f5198de11805aaceab9c89
+DIST tendra-patches-1.6.tbz2 129655 RMD160 f9a390d0e50c903d22ab473a2407b312829b4ccd SHA1 7280c37b5094d6a3d1f0e0662f933a99ebd78b3b SHA256 1024e3e374d1da2ffac508a10806d154acbc62f819e91e15ccd6f333ac5c27bf
 EBUILD tendra-4.1.2.ebuild 1313 RMD160 a94062c581654f2db50371d73e2b4ea70f96c975 SHA1 05e7d0d3a8c7354c17013bdafd5a72a9bbffe40f SHA256 a833739e4741effb1c13324e55cba48fbeb0c521bb4c6f9dff10c8dfb2899f67
-EBUILD tendra-5.0_pre20070510-r2.ebuild 1147 RMD160 00403d15919db9a65f536ce768b5fc9ba2507368 SHA1 8e205ede8f72be6b3f0b2f19e14df5dcbc1b0ff9 SHA256 edde829886a98c708f4e375c6733c60f989e3452e6d557ac1768c7f2b79552d2
-MISC ChangeLog 1671 RMD160 969760c4040da965ec3d7512ff940d5956b96fca SHA1 a6bb8700c5097776892fd38a3241a7c765f0ef8f SHA256 f02d9ee8b4bf63e30bfaba82c3459673d709c84424509ccad6fedd73bfdeb6f9
+EBUILD tendra-5.0_pre20070510-r2.ebuild 1245 RMD160 e35430d9596b3e21907908193399cde6095c8d7a SHA1 1d6ef971ac26e0b0b4a86ea34498abe005519858 SHA256 3e28a056a31961f79768bc55ffc74321c5b8c343991cbccf21433e7c4fd4aad0
+MISC ChangeLog 1870 RMD160 82310c37a6c1f06af9ecf773660d034a12096f8a SHA1 bf2ea67d304550b6882dbd5c2c7be831a72dfa10 SHA256 7ad01e81b1cebf48d3f387fbd7dceb202c6309c94be62a591562588b5c402855
 MISC metadata.xml 252 RMD160 c826f2e1707932bad2f8a58648686e4e288ea866 SHA1 66dc4db06caa55ead3c264eed13a73a7c47f9bbc SHA256 c175c348db84c15f005fda2244e4fb613fd3d774876f457b240f083f3335b50d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAklFc+0ACgkQwnQyISwouHx6gwCgv2P4LpXm1PbregsxDm1x//jN
-jyMAniS2VBbw3x3vN8cJt5LEuO6u0Vkf
-=qPku
+iEYEARECAAYFAksydXcACgkQwnQyISwouHy3mgCghfwueRV6jPUG8s/TmtKgBczj
+dcgAoLGgddQBtfoEbW5+a6aOtwW4fudo
+=jxr/
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild b/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild
index 65b887db5615..5add3d072109 100644
--- a/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild
+++ b/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild,v 1.1 2008/12/14 20:59:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild,v 1.2 2009/12/23 19:53:47 truedfx Exp $
 
-inherit eutils flag-o-matic bsdmk
+inherit bsdmk eutils flag-o-matic multilib
 
 REV=1073
-PATCHVER=1.5
+PATCHVER=1.6
 
 DESCRIPTION="A C/C++ compiler initially developed by DERA"
 HOMEPAGE="http://www.tendra.org/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${PN}-${REV}.tbz2
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -26,7 +26,9 @@ RDEPEND="!dev-lang/tcc"
 S=${WORKDIR}/trunk
 
 pkg_setup() {
-	export MAKE=$(get_bmake)
+	export BMAKE="$(get_bmake) ${MAKEOPTS}"
+
+	use amd64 && multilib_toolchain_setup x86
 }
 
 src_unpack() {
@@ -38,12 +40,12 @@ src_unpack() {
 src_compile() {
 	replace-flags '-O*' '-O'
 
-	PREFIX=/usr sh makedefs || die "makedefs failed"
-	emake -DBOOTSTRAP || die "bootstrap failed"
-	emake || die "build failed"
+	HOSTARCH=i386 PREFIX=/usr sh makedefs || die "makedefs failed"
+	${BMAKE} -DBOOTSTRAP || die "bootstrap failed"
+	${BMAKE} || die "build failed"
 }
 
 src_install() {
-	emake PREFIX="${D}usr" \
+	${BMAKE} PREFIX="${D}usr" \
 		MAN_DIR='${PREFIX}/share/man' install || die "install failed"
 }