Don't fail tests if dev-lang/yasm is not installed, bug #318805

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

4 files changed, 57 insertions, 6 deletions

diff --git a/dev-libs/udis86/ChangeLog b/dev-libs/udis86/ChangeLog
index d4efe7b6c8cf..7aee24073dee 100644
--- a/dev-libs/udis86/ChangeLog
+++ b/dev-libs/udis86/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/udis86
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/ChangeLog,v 1.6 2010/05/11 21:02:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/ChangeLog,v 1.7 2010/05/12 14:13:00 chithanh Exp $
+
+  12 May 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  udis86-1.7.ebuild, +files/udis86-1.7-yasm.patch:
+  Don't fail tests if dev-lang/yasm is not installed, bug #318805, patch
+  from jer
 
   11 May 2010; Brent Baude <ranger@gentoo.org> udis86-1.7.ebuild:
   keyworded ~arch for ppc64, bug 317149
diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index 94f310535b77..0145446dc02c 100644
--- a/dev-libs/udis86/Manifest
+++ b/dev-libs/udis86/Manifest
@@ -1,4 +1,5 @@
+AUX udis86-1.7-yasm.patch 907 RMD160 d80c8dddf6652354c71129ca0b929d082def73ae SHA1 07dfc8c886feea5fce1df15a3af8f17e4e60c723 SHA256 08d298ac390103bb1b45d5807a24c14cc5332968a06be00064668f673126597b
 DIST udis86-1.7.tar.gz 696651 RMD160 42f39d8c2c6941913e18a85777d157825e6d1d33 SHA1 1a9949e33024542a24a948af5d9cbee34ff64695 SHA256 6128d266abcabed6077fdeebd2fbb7fb48eb599efbdae98922de2f6acd82ce3a
-EBUILD udis86-1.7.ebuild 647 RMD160 d78f5de0fb40b72d89920180b3c408696385625f SHA1 b2dd88cd93ad61e5b609835966f081e3dd2245d9 SHA256 3563561bfa644485437387fdb1c2cf94069a82d527b34d9b52628b6ea9df23af
-MISC ChangeLog 978 RMD160 8edb3176c7bd6716f0d106dcccb3d7666b75bbf5 SHA1 3f0536b9b76cd2a2c027406837cc3e7343a51a09 SHA256 3cc655aaad108a48b8431a86b4b284189f6789074a3514ed56b7a27fce4695b5
+EBUILD udis86-1.7.ebuild 844 RMD160 41ebc64c899a100246fa3c91a571906e78d5f765 SHA1 c44c22daaebe846134fe769aca58d9283185ea76 SHA256 52254122f4b4d2b3dfd079f68cb20a6a23c025d6c4449d59333850e1fd1279a9
+MISC ChangeLog 1185 RMD160 2d7eed27be2b04ca615bf93c7ce8b0c420ba4d66 SHA1 5321937a86126b708724fe11e8b06e28e4b03f8b SHA256 6d1a9f446e7b1ab0b057be615ce023828cbc4384660d907d0cc45a1290a14fdf
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
diff --git a/dev-libs/udis86/files/udis86-1.7-yasm.patch b/dev-libs/udis86/files/udis86-1.7-yasm.patch
new file mode 100644
index 000000000000..3d3eecdf8283
--- /dev/null
+++ b/dev-libs/udis86/files/udis86-1.7-yasm.patch
@@ -0,0 +1,35 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,9 @@
+ AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
+ 
++AC_PATH_PROG([YASM], yasm,)
++AC_SUBST(YASM)
++
+ # If this is a gnu compiler, pass -Wall
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+ 	CFLAGS="$CFLAGS -Wall"
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -10,7 +10,7 @@
+ ovrrun_LDADD   = ../libudis86/libudis86.la
+ ovrrun_CFLAGS  = -I$(top_srcdir)/libudis86 -I$(top_srcdir)
+ 
+-YASM = yasm
++YASM = @YASM@
+ 
+ dist_check_DATA = test16.asm test32.asm test64.asm testjmp.asm testobscure.asm \
+ 		 testjmp.ref testobscure.ref randtest.raw randtest16.ref      \
+@@ -18,7 +18,10 @@
+ 
+ check-local: tests
+ 
+-tests: test16 test32 test64 testjmp bufovrrun randraw
++yasm_tests: test16 test32 test64 testjmp
++no_yasm_tests: bufovrrun randraw
++
++tests: $(if $(YASM), yasm_tests) no_yasm_tests
+ 
+ test16: gen 
+ 	$(YASM) -f bin -o test16.bin $(top_srcdir)/tests/test16.asm
diff --git a/dev-libs/udis86/udis86-1.7.ebuild b/dev-libs/udis86/udis86-1.7.ebuild
index 1dce723b6c99..86ba546a4b1a 100644
--- a/dev-libs/udis86/udis86-1.7.ebuild
+++ b/dev-libs/udis86/udis86-1.7.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7.ebuild,v 1.6 2010/05/11 21:02:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7.ebuild,v 1.7 2010/05/12 14:13:00 chithanh Exp $
+
+EAPI=3
+inherit autotools
 
 DESCRIPTION="Disassembler library for the x86/-64 architecture sets."
 HOMEPAGE="http://udis86.sourceforge.net/"
@@ -12,11 +15,18 @@ KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="test? (
-	x86? ( dev-lang/yasm )
-	amd64? ( dev-lang/yasm )
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+		x86-fbsd? ( dev-lang/yasm )
 	)"
 RDEPEND=""
 
+src_prepare() {
+	# Don't fail tests if dev-lang/yasm is not installed, bug #318805
+	epatch "${FILESDIR}"/${P}-yasm.patch
+	eautoreconf
+}
+
 src_install() {
 	emake docdir="/usr/share/doc/${PF}/" DESTDIR="${D}" install || die "emake install failed"
 }