From: Zaheer Abbas Merali <zaheerm@gentoo.org>
Date: Mon, 11 Dec 2006 10:48:02 +0000 (+0000)
Subject: fix sse2 check and use flag-o-matic
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65af533e41a8279aeb15570c596ee49602cf7544;p=gentoo.git

fix sse2 check and use flag-o-matic
Package-Manager: portage-2.1.1_pre3-r5
---

diff --git a/dev-libs/liboil/ChangeLog b/dev-libs/liboil/ChangeLog
index b9d2c53dd24a..04f87c35ea07 100644
--- a/dev-libs/liboil/ChangeLog
+++ b/dev-libs/liboil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/liboil
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.34 2006/12/05 14:03:04 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.35 2006/12/11 10:48:02 zaheerm Exp $
+
+*liboil-0.3.10-r1 (11 Dec 2006)
+
+  11 Dec 2006; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/liboil-0.3.10-sse2revert.diff, +liboil-0.3.10-r1.ebuild:
+  fix sse2 check and use flag-o-matic
 
 *liboil-0.3.10 (05 Dec 2006)
 
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index 702ff97cc7dc..241224fe0caa 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX liboil-0.3.10-sse2revert.diff 849 RMD160 8c17a7870eb561252e79a96017a2ab047654e426 SHA1 f02c1a710b41e34e623c701d6e3c65b4137dd6cb SHA256 f3d9a0ff83d15050e661870fe4e982a622e207d036055134868ebac63059c71d
+MD5 9ecac430669401b9cde229efb9f41c89 files/liboil-0.3.10-sse2revert.diff 849
+RMD160 8c17a7870eb561252e79a96017a2ab047654e426 files/liboil-0.3.10-sse2revert.diff 849
+SHA256 f3d9a0ff83d15050e661870fe4e982a622e207d036055134868ebac63059c71d files/liboil-0.3.10-sse2revert.diff 849
 AUX liboil-0.3.7-convfix.diff 833 RMD160 5daa3dc9d05bc9a9c732d39c3b9a5c47efc7f0ff SHA1 65c04a24970dba4266842f432d1f34ff981a174a SHA256 679af2e14138648eda92e0ba12dce53cfb34d1ac8ac8fa4bb657fe0948861fcb
 MD5 ca07b49f490363c22f3cb390e6276769 files/liboil-0.3.7-convfix.diff 833
 RMD160 5daa3dc9d05bc9a9c732d39c3b9a5c47efc7f0ff files/liboil-0.3.7-convfix.diff 833
@@ -9,6 +10,10 @@ DIST liboil-0.3.10.tar.gz 860303 RMD160 585413d5955b08b24cec18f588927ac071a44098
 DIST liboil-0.3.6.tar.gz 714947 RMD160 f86830c0c9101e8fbe22879f930fb61d23b0139a SHA1 43cfdfeace05006bfeaacc30f1feeece657595a2 SHA256 52cb40905064ef836527b01c86650bebf662e1224da43c6fb0f3e1f443de232c
 DIST liboil-0.3.7.tar.gz 822820 RMD160 9e4138116e331f24de1e27ba933ed7b541f7592e SHA1 ff0e5e876878979b80f9da6d818264fdc3420ab9 SHA256 626e860df789c89285b7a891e0ac8d9da16786ff2453a59db5f60383c78c5e17
 DIST liboil-0.3.8.tar.gz 834167 RMD160 c8fe0c1d28429f69818b1ca689082b1849aa595d SHA1 ed6002cf02fbe9d248c3129578cbf6d24ebe3072 SHA256 40fa52503e30c21fd1ae1affcc038ff05af5caf0c77c27630526069ffad804ff
+EBUILD liboil-0.3.10-r1.ebuild 976 RMD160 32180489d757130c81f5cd0882cb15158ade5391 SHA1 c08b69e869cf0b781ba3b015fbbc06aab9531a04 SHA256 8b038ce24fed422298150346a0be70b12ffce7d4cbe598c2af13d8787798c235
+MD5 7977257a92bfb88fdafd444ab3dface1 liboil-0.3.10-r1.ebuild 976
+RMD160 32180489d757130c81f5cd0882cb15158ade5391 liboil-0.3.10-r1.ebuild 976
+SHA256 8b038ce24fed422298150346a0be70b12ffce7d4cbe598c2af13d8787798c235 liboil-0.3.10-r1.ebuild 976
 EBUILD liboil-0.3.10.ebuild 760 RMD160 563668b2eede1ff55a85fb23525c2353ee6fb22c SHA1 b5d7e21402d5ca98c8e83caa4998ce50872f16d4 SHA256 8e2d1de8da40f37d10e1d7bd916a337a8a14ad3cf11d5755188bdeac6b6bf827
 MD5 ae9d97285d068771fb97e2109593cbca liboil-0.3.10.ebuild 760
 RMD160 563668b2eede1ff55a85fb23525c2353ee6fb22c liboil-0.3.10.ebuild 760
@@ -25,10 +30,10 @@ EBUILD liboil-0.3.8-r1.ebuild 775 RMD160 0be441e51702dc2706a550da719b21745b87ee8
 MD5 890679c6c378d87400c0a728aa687a0e liboil-0.3.8-r1.ebuild 775
 RMD160 0be441e51702dc2706a550da719b21745b87ee8b liboil-0.3.8-r1.ebuild 775
 SHA256 8c8f6e6a4dca805762268040b0791a84f6a7b958e32706d5da00794915b3dd42 liboil-0.3.8-r1.ebuild 775
-MISC ChangeLog 4561 RMD160 c9916e2bee69aea7d6644b601490be59238c1c7d SHA1 46723dd803ad8d9001cc0729240711aa82954b18 SHA256 2e6927a6c456c65f3d029179bc3dfe8c5e998b1c93bbf460606811eeb1c0e65f
-MD5 66cac37cbba1f1fc867d676614f531d5 ChangeLog 4561
-RMD160 c9916e2bee69aea7d6644b601490be59238c1c7d ChangeLog 4561
-SHA256 2e6927a6c456c65f3d029179bc3dfe8c5e998b1c93bbf460606811eeb1c0e65f ChangeLog 4561
+MISC ChangeLog 4757 RMD160 2104c98804c35d638050a765354b5f0ec71d5a9a SHA1 5d54adc82bdd37132c4ad042580de3651b0caaa5 SHA256 9652eddf671c39f89e1b57a2ee7ef111c31e4739218157b361c90834cb7d657f
+MD5 e6f8cd929aee5235ea67e92f6a7b3d54 ChangeLog 4757
+RMD160 2104c98804c35d638050a765354b5f0ec71d5a9a ChangeLog 4757
+SHA256 9652eddf671c39f89e1b57a2ee7ef111c31e4739218157b361c90834cb7d657f ChangeLog 4757
 MISC metadata.xml 227 RMD160 dbceeac4d1cf10216fdce2b2c00e09aeb11e2f21 SHA1 d7b19f237d56d40a8d32832fb820522243581a4e SHA256 eab0bc4908cd44a7660393848ead1a4866b1cd852557cd6963333d0f96a0b4af
 MD5 8ba6cdb61efe475b67332297443a7999 metadata.xml 227
 RMD160 dbceeac4d1cf10216fdce2b2c00e09aeb11e2f21 metadata.xml 227
@@ -36,6 +41,9 @@ SHA256 eab0bc4908cd44a7660393848ead1a4866b1cd852557cd6963333d0f96a0b4af metadata
 MD5 c13e364881dd3497a62c7cc9b3ee7327 files/digest-liboil-0.3.10 241
 RMD160 b1ecd3fb7693c0bafbb7725b4a67811b6f3d2455 files/digest-liboil-0.3.10 241
 SHA256 6905dd7cc4ea8443b39fa78b8bdc572a6aa70a68b2ef7cdf9f92eee3fc786693 files/digest-liboil-0.3.10 241
+MD5 c13e364881dd3497a62c7cc9b3ee7327 files/digest-liboil-0.3.10-r1 241
+RMD160 b1ecd3fb7693c0bafbb7725b4a67811b6f3d2455 files/digest-liboil-0.3.10-r1 241
+SHA256 6905dd7cc4ea8443b39fa78b8bdc572a6aa70a68b2ef7cdf9f92eee3fc786693 files/digest-liboil-0.3.10-r1 241
 MD5 523c5da83b88e3a9185ddfdd504701ad files/digest-liboil-0.3.6-r1 238
 RMD160 64a5f107db2083f5c91eb3827bd2d62eac23218b files/digest-liboil-0.3.6-r1 238
 SHA256 d333b93664e19dc81831350592b68c89a46d10e3556a2192501aa4b7a93cb9e2 files/digest-liboil-0.3.6-r1 238
@@ -45,10 +53,3 @@ SHA256 ccd7a6f5ab3b1f85e11744436d82bb912c54fbf13260ef70b63d2f6aaf5caa58 files/di
 MD5 b2101ecb415b2ef9eefc246ca0fd746d files/digest-liboil-0.3.8-r1 238
 RMD160 881f64f503c0b215fe6adfda940f0d4497d97633 files/digest-liboil-0.3.8-r1 238
 SHA256 228afa57663975706dd7dc9b83dff888a12b3fa1953d9834e55598e5a45b77ed files/digest-liboil-0.3.8-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFdXvSr2QksT29OyARAiAcAJ9i8Oevsda3jGMd3my4ZtG8CSVCeQCfYcyf
-SJvObzbGMvJ4KGjFjDq0WCM=
-=jKnU
------END PGP SIGNATURE-----
diff --git a/dev-libs/liboil/files/digest-liboil-0.3.10-r1 b/dev-libs/liboil/files/digest-liboil-0.3.10-r1
new file mode 100644
index 000000000000..2f7b3a112a45
--- /dev/null
+++ b/dev-libs/liboil/files/digest-liboil-0.3.10-r1
@@ -0,0 +1,3 @@
+MD5 770f656bca8166dab33b322d5886a4bf liboil-0.3.10.tar.gz 860303
+RMD160 585413d5955b08b24cec18f588927ac071a44098 liboil-0.3.10.tar.gz 860303
+SHA256 4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c liboil-0.3.10.tar.gz 860303
diff --git a/dev-libs/liboil/files/liboil-0.3.10-sse2revert.diff b/dev-libs/liboil/files/liboil-0.3.10-sse2revert.diff
new file mode 100644
index 000000000000..be4c95f3520e
--- /dev/null
+++ b/dev-libs/liboil/files/liboil-0.3.10-sse2revert.diff
@@ -0,0 +1,21 @@
+--- m4/as-intrinsics.m4-3.10	2006-05-19 22:13:26.000000000 +0200
++++ m4/as-intrinsics.m4	2006-02-15 22:02:15.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ dnl David Schleef <ds@schleef.org>
+ 
+-dnl $Id: liboil-0.3.10-sse2revert.diff,v 1.1 2006/12/11 10:48:02 zaheerm Exp $
++dnl $Id: liboil-0.3.10-sse2revert.diff,v 1.1 2006/12/11 10:48:02 zaheerm Exp $
+ 
+ dnl AS_MMX_INTRINSICS(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
+ dnl Tries to compile with the given CFLAGS.
+@@ -69,7 +69,7 @@
+ 
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -msse2"
+-  AC_TRY_COMPILE([#include <emmintrin.h>], [__m128i a; a = _mm_setzero_si128(); a = _mm_srli_epi16(a,8)], [flag_ok=yes], [flag_ok=no])
++  AC_TRY_COMPILE([#include <emmintrin.h>], [__m128d a; a = _mm_setzero_pd(); a = _mm_srli_epi16(a,8)], [flag_ok=yes], [flag_ok=no])
+   CFLAGS="$save_CFLAGS"
+ 
+   $1="-msse2"
+
diff --git a/dev-libs/liboil/liboil-0.3.10-r1.ebuild b/dev-libs/liboil/liboil-0.3.10-r1.ebuild
new file mode 100644
index 000000000000..1c3c21e6e835
--- /dev/null
+++ b/dev-libs/liboil/liboil-0.3.10-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.10-r1.ebuild,v 1.1 2006/12/11 10:48:02 zaheerm Exp $
+
+inherit flag-o-matic
+inherit autotools
+
+DESCRIPTION="library of simple functions that are optimized for various CPUs"
+HOMEPAGE="http://www.schleef.org/liboil/"
+SRC_URI="http://www.schleef.org/${PN}/download/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0.3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh -sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="=dev-libs/glib-2*"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/liboil-0.3.10-sse2revert.diff
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	strip-flags
+	filter-flags -O?
+	append-flags -O2
+	econf $(use_enable doc gtk-doc) || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}