Add a patch to avoid 64-bit unsafe code build.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 29 insertions, 3 deletions

diff --git a/dev-libs/check/ChangeLog b/dev-libs/check/ChangeLog
index 17e3e121d47c..1b8bc85e63e7 100644
--- a/dev-libs/check/ChangeLog
+++ b/dev-libs/check/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/check
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.54 2009/06/09 03:15:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.55 2009/06/09 10:54:33 flameeyes Exp $
+
+  09 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> check-0.9.6.ebuild,
+  +files/check-0.9.6-64bitsafe.patch:
+  Add a patch to avoid 64-bit unsafe code build.
 
 *check-0.9.6 (09 Jun 2009)
 
diff --git a/dev-libs/check/check-0.9.6.ebuild b/dev-libs/check/check-0.9.6.ebuild
index 5c15f00452de..8dbccb2ce4f2 100644
--- a/dev-libs/check/check-0.9.6.ebuild
+++ b/dev-libs/check/check-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.6.ebuild,v 1.1 2009/06/09 03:15:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.6.ebuild,v 1.2 2009/06/09 10:54:33 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -19,10 +19,19 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-AM_PATH_CHECK.patch
+	epatch "${FILESDIR}"/${P}-64bitsafe.patch
+
+	sed -i -e '/^docdir =/d' Makefile.am doc/Makefile.am \
+		|| die "Unable to remove docdir references"
+
 	eautoreconf
 }
 
+src_compile() {
+	econf --docdir=/usr/share/doc/${PF}
+	emake || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }
diff --git a/dev-libs/check/files/check-0.9.6-64bitsafe.patch b/dev-libs/check/files/check-0.9.6-64bitsafe.patch
new file mode 100644
index 000000000000..ec73ed6a0ea5
--- /dev/null
+++ b/dev-libs/check/files/check-0.9.6-64bitsafe.patch
@@ -0,0 +1,13 @@
+Index: check-0.9.6/configure.ac
+===================================================================
+--- check-0.9.6.orig/configure.ac
++++ check-0.9.6/configure.ac
+@@ -17,6 +17,8 @@ AC_CONFIG_AUX_DIR([build-aux])
+ # really severe build strictness
+ AM_INIT_AUTOMAKE([-Wall -Werror gnits 1.9.6])
+ 
++AC_USE_SYSTEM_EXTENSIONS
++
+ # FIXME: find the other places this stuff is used
+ 
+ CHECK_MAJOR_VERSION=0