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

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

4 files changed, 42 insertions, 5 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/Manifest b/dev-libs/check/Manifest
index 1e521ebdf507..e37dacd77cef 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX check-0.9.5-AM_PATH_CHECK.patch 1092 RMD160 e485b955c894f4d8c24fdc0a3c8c5f4a43411c9e SHA1 1168d8d0a2637a4c40d318338954ec30fc193803 SHA256 4ff5b3db13f5b8da8a1d136a74c1d40f0d7b82e83ec345c25ef2df68ef056374
 AUX check-0.9.5-autotools.patch 309 RMD160 97628fe2a081107443bcf8c98fdf6d5497316f18 SHA1 9ee9ae805f2908a030756033068511b92efbc4c8 SHA256 e1cd957871be3bc9ac24aa918cfabf5a927852a7edb2442306c32c69756b417b
 AUX check-0.9.5-setup-stats.patch 3686 RMD160 afb4134c96a992e4712f5b4ab870027b6bf38d5e SHA1 d0f350d2cfb53a014b054c74ad1eb86adaa0a211 SHA256 82f0cd86e38ab8f4ae34100ded75e1cdc51fad3b0265015f920c89e2e5a0c8be
+AUX check-0.9.6-64bitsafe.patch 399 RMD160 8a4dfe88dbc906663720fe95388178ca4ee5d2f4 SHA1 1d5972e0e1b80d7e7d78d2e92eceed45560ff63c SHA256 51d292fd3d059230b12179abe5a13a15ed5b839580d3f16d53708c9d31d10a4b
 AUX check-0.9.6-AM_PATH_CHECK.patch 493 RMD160 1dcae7e753d587fd904ca97952f3738c327a14d8 SHA1 c5206d5a001bede985e3e5c6923df7f3a36c1363 SHA256 a7bdeaca39f0266b7b0618b956ff23e80cb40a46537121b910dbd149e6a39d81
 DIST check-0.9.5.tar.gz 520625 RMD160 1975578245444ffdc8cec43e53dedc3aac8553ea SHA1 84b9d1ace6d0bf0fc73c9de2e684a62f73d312f8 SHA256 961b3c66869018d02226bbbc394e79362cd898962ce810bce8417b3c497f7ad6
 DIST check-0.9.6.tar.gz 560006 RMD160 3a8b1f300d93c0d899202a1e21cebf458506a046 SHA1 09427552b4c9fef81fd5783800836a4fa89dac46 SHA256 09fa3f9eaf7267c4cfaaa54eed795666091ab7af6e6e4cd572c578cf627e569c
 EBUILD check-0.9.5-r1.ebuild 810 RMD160 f4923bb6926d6b925703e66bd6e1d3967255be55 SHA1 6ca473ff4c1ec3a042e268fd46f0d3cc78940ca5 SHA256 27ab1a8c63d037e47091e17e27cabde1475be3c19b026a1b444423cd5445f835
 EBUILD check-0.9.5.ebuild 718 RMD160 d93e6f90a4ce2522ea0cc0d363af69d04c8e160e SHA1 28235be856119dc841862615e98dc149ce55c0f4 SHA256 a41fd9c7f569e666ef2cf2a22775e304e562d06a5e39ccded2488fff00ad7b22
-EBUILD check-0.9.6.ebuild 727 RMD160 d05b37de98f00e9f851dd80d17610193daed252b SHA1 f0424e1075abe9eeab130bd778ab844081945e86 SHA256 578a8a4eefd3374e6c8ac4b387c5be9b0a8245c1e131b2bf24f20433f7700421
-MISC ChangeLog 5886 RMD160 557e2c57c2dda7e6413b6610a36759459c5c2ea5 SHA1 2dc73542040e6e2102856be97d22b5ec6275711a SHA256 614fae55786b27972a41ecb9f20719b12d98d0248c3b7672159b099898865f2d
+EBUILD check-0.9.6.ebuild 904 RMD160 51ca9a0ca8177c5113c18bd55c66c03e8bb4b8c9 SHA1 f7f04f52acde49e6c771b00378a8df8bb411361c SHA256 01faefeac94615d0ebf205245bd8efee52043196777805e818204f0666352be7
+MISC ChangeLog 6056 RMD160 4d8da489b5d975bb2f4fd2225f8509de38849823 SHA1 8146086bcea8d9654a242d0e3f29ee059f023b87 SHA256 5f80c666baa0447847a4b221eee8c323565644c0a0d949bb00ab187feee8209c
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkouP28ACgkQAiZjviIA2XgppACg5LitSg2YukUMl9pH0MEGfvoD
+67wAniJ23rMRrtR5o3mg4qq/EUgbFcZH
+=1ZFh
+-----END PGP SIGNATURE-----
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