Ignore __restrict__ field w/patch from ChromiumOS.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 93 insertions, 16 deletions

diff --git a/sys-devel/smatch/ChangeLog b/sys-devel/smatch/ChangeLog
index 32a3ff188a41..208bc9292473 100644
--- a/sys-devel/smatch/ChangeLog
+++ b/sys-devel/smatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/smatch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/smatch/ChangeLog,v 1.3 2012/12/20 02:46:28 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/smatch/ChangeLog,v 1.4 2013/01/03 20:50:43 vapier Exp $
+
+*smatch-1.57-r1 (03 Jan 2013)
+
+  03 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/smatch-1.57-restrict.patch, +smatch-1.57-r1.ebuild:
+  Ignore __restrict__ field w/patch from ChromiumOS.
 
 *smatch-1.57 (20 Dec 2012)
 
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 189d5a92845b..4b54c1b01feb 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX smatch-1.57-restrict.patch 406 SHA256 f06b2bafdd32eac4896e0b265af31b00fb09673fde17c053d8a5a8e46666a01d SHA512 fa4816a24a2f0ff4aaf057ac83fc0ba4d9787f0e2daa7e6999700448068460adddce6fcac3efdb7aa69e4d60b9eb34f4ff17056e8037419ac4f5d21b5be5514d WHIRLPOOL 0942edefc918682bd126049340e6dd3d2995e0e6a87b4e081aecef9f2824862dd44a030bf6630a4f5f57ed1b40a475a4ff2f1e30c0479a85ba21fefd9cc0104e
 DIST smatch-1.57.tar.gz 491677 SHA256 3ca08158f066887aa821da45962e4999ca60b459f3f13eb5ffc4d68c4b94cadb SHA512 031f417c97d58b617b2e375a28f509f71eb2735212a98aee0e21880a28842078ad3c24b5375a03f73d75fec582a9d187ed6a00a0512c4792e5ffce82dfd79b99 WHIRLPOOL 6eb43af471ba08c106fe05dc786422b16b20cb94bf9af2afdde3e9ccea6985bc5c3b39922e135d55b7a1b341187a77a9565b2ef27ff47f7214b6472b10b6d7c0
+EBUILD smatch-1.57-r1.ebuild 1371 SHA256 a6aa818ce2fc1b9f0773c9337787ea30fc7d1b3437af99f3ada5f04fd14a2283 SHA512 ba91a9cb58b1956d88f658cde949eb57da4a683f8337ffca41f7b3c5be99e5129585c3ded33dc8fad5a66b21dc41ed0a492d6cb12f10157a8f305611bdcd8a6e WHIRLPOOL bd1966f4510a81e1bcc271848be7fe05e973ad22287e3b658c047ee7e2bde672f4dc60c28ede3a45f771d512464a1956b0d96e670401b3d9e41e0feba9255c68
 EBUILD smatch-1.57.ebuild 1319 SHA256 1231d6c804eab633880443697501b05808347678c31d8c3d4d6d7373f25ffcbb SHA512 e9cbc5c85d92fc19720fdb2dd3654d3611c1e6ff6438380a61f82c827ba9bec0623c11bc520e119d28a4d8a9d58bebfdff1e7b0f9cf5cc8aa2bcf655182316a5 WHIRLPOOL 33f2fd66b7e20c0366c6c63e240882e5812854a404de83f9ef440b365dc4c6916a423c72ebce2db03c696322b4ec98c69ccc61de3cde619fcff5fa671f913226
 EBUILD smatch-9999.ebuild 1319 SHA256 48a37cdfa2580d2f1ecaa892dec36dcad64c20addb8dfa0cfadb8dbb2b79a213 SHA512 daa414b2e4655ce0eb8580ecf344ff87f04140b3c45edf194372d3d3e6fb2de1d008e94a2339aed4cde9d6aabe04faa6077023305f07c6cd5f9ff490e07b7009 WHIRLPOOL 078e19fc2212097b6718bf2d4bb995f0818fa2acc585d1b13cb8382de482ef6df73af1be9d7ba8869f42d08b11475b7f3ba6f6dd898ef8fc4d9b0ff39964af75
-MISC ChangeLog 568 SHA256 6de5f340d1d8bc3cde140515a69c89a1939a1f4001d13438a63e7668d26797fd SHA512 ba0832cd88d078617397d8689ea4461f121cf406a922c11de8e190b00563ad5c48ef474dbe34bae2d81119005577753fc13ac8d73ae1e5b835e99b2deb4fe177 WHIRLPOOL 0e851d570e700327ffcb1168dea727ccd05d649ac7097a3828a643281b01da3bee14de2c0e44e115397516db0b2ccd748acc466e07277701a85326a0fc3e6b59
+MISC ChangeLog 764 SHA256 14d7ea7f3acbb491f593f5a8869358e31c158cb8af5a4ef764161d69345ac8fa SHA512 3615056312fe3d24b7074c05e491e40f0b64f5f7fac6bfb5e44062681edf0c94e27fce52c0a00227cf479f03ec7226d91fcb7afd905393e83bfd3fc7cc921d0f WHIRLPOOL dd4b6d26f8557e9c006bbcd2e9cac254bc6c90bedc29399757aede22568e52f14fb87cfd426b11f5c58e44ddbd5e584293a55cd7c17551ac9ae7eb6da56f883f
 MISC metadata.xml 189 SHA256 f6c4bd31d739964490c3345b792de749704bfa69602dad420a448393f140e820 SHA512 df124082a0630c0c97a145a171bcaba5b0b2232bab65b31cfc53768f8b3c685117b59718f8ca9300ff634d042e52acdc17b62b66646751602976ed0262319c22 WHIRLPOOL 85eb7bae9953aaffcf2dc7d114474bc4bce8c0d1375f6c92266ddecfeaa86dda9f51b21046f6e7d9d89e356bed15f0c053e9366fb071d7788fd8325671de5c10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ0nwGAAoJELEHsLL7fEFWFxcP/1kZch0SNzd/mkCLPpoa+GZ+
-UUNdjV/7i1LaenQkp6kMvXnb6YRgMfDV5gtI16TGOMl3ZcmPeYFIKT6T5KC5rYNZ
-e0ABukZLCASqiSE5u/+5KuoxMNNyNYAmXKzb2GivnK5f/67KOebrJm9zgxoSQIkO
-P13/9cMyMMGYs3ET4Wr0SIjO6QoI9btwFvvp1iKtib7sZWSCAPNFOyIFUeKAEmR5
-upo8saAe7+A9ZzmpHv+1t7vkUbDP48svotRSghN75wy70kTwn1E4D7hszWfMsjdg
-/PIkVBcuLBz75VGYj06i9Fwcg8S3v7S3sUhuKDSWLwawuOxE61qRlnmKvdkelx0j
-3Wom1+n89MgaghmWOzQ2XCKx6xwaTuXpfhwLjwBCsh+EygIMulXL+YWMHriIn6xS
-yoRq2jaBPKnnyRYj9hD2JtqqCRCudevfjnI9OysUTJsANf6RTF/dJrClnxIagNY8
-3psyGfXTBsLktn/a2We8+Vf4SAS1KvAzkqMSRJhGNbgvy8ymuRTnew+qgIK5luyW
-mUYmoahvn92jvg65MMS1f+zdQwLzrE4OlXlG2hSG2xhbbGF1u7gKWXUEfqGfhAnw
-cd/k7E7HEqC3D/QK+aYhARetpqZGjls1oJ0NOhYEeFplwGZ2/NX1Yll6p4lG9+XN
-KzYVSnFIs6MyalZDolIt
-=gyxA
+iQIcBAEBCAAGBQJQ5e+SAAoJELEHsLL7fEFW3AEP/jb8n6UbLlrgnh2c5cDqiMAJ
+hw6mexmPCUCMwlZvaq1YjgBxIYv2u/pElimd4+jPNlKqMHiuuBQzQPRHhkodPjFz
+rGN+8yDV2teqYwbC5sLawUuMvJIEE1Sjjwo77ypwfxvbiKz1g4ZQDF9yVcsw1PN7
+zF24/UFli5MWeuEDnOKp3nmPPP4vZv2FiE57YRL0osqwAMTQbIpkkKm4v0NPO3Z/
+lfhTXdYtWe40BE2EgXGmtSXfJTvjj0KvFn4Z/r7GCAv+tWC4i0mlGzuHrschIVAt
+l5o+6i4RlQS6VfgkUvraqdZxkCLokggEEYImbBGIEjhv8+tnaK+6zEMdxbgkER/3
+KiW5SknkZHrSQHQqurIQVtgui2L8Ni+m4GCho2K7tXh2GXjTf4Edq+bBUvTtYvdb
+YhRWoZoCxW2dSDBgj7V5C2w4a9P+D68qTeV4zJa64tfxtNbtJ1QqPhK28IykHmjJ
+tiof595QLPV/CpANMjhk60c46PZPmYJN+I6b8ZDJMaqcfFCqVnKGOU0ahEhuRvaY
+D16xl2KEvk3pn4l6/y/VMqx9P8BXukFfj98nvoxEMliVag4W60aiA1hN2ftczlxl
+7hHoKoUN6Riu7QZV+B5pT0fgs+7tXSpJNgbFXzBz15tH9X9Gi1naTuaH6JZuJULG
+7tt82ne+aoXl/pJH5tar
+=yjUq
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/smatch/files/smatch-1.57-restrict.patch b/sys-devel/smatch/files/smatch-1.57-restrict.patch
new file mode 100644
index 000000000000..2f0dc98d496a
--- /dev/null
+++ b/sys-devel/smatch/files/smatch-1.57-restrict.patch
@@ -0,0 +1,14 @@
+send upstream already
+
+diff --git a/parse.c b/parse.c
+index 5dd9a06..bf5894d 100644
+--- a/parse.c
++++ b/parse.c
+@@ -419,6 +419,7 @@ static struct init_keyword {
+ 	/* Ignored for now.. */
+ 	{ "restrict",	NS_TYPEDEF, .op = &restrict_op},
+ 	{ "__restrict",	NS_TYPEDEF, .op = &restrict_op},
++	{ "__restrict__",	NS_TYPEDEF, .op = &restrict_op},
+ 
+ 	/* Storage class */
+ 	{ "auto",	NS_TYPEDEF, .op = &auto_op },
diff --git a/sys-devel/smatch/smatch-1.57-r1.ebuild b/sys-devel/smatch/smatch-1.57-r1.ebuild
new file mode 100644
index 000000000000..380532973af2
--- /dev/null
+++ b/sys-devel/smatch/smatch-1.57-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/smatch/smatch-1.57-r1.ebuild,v 1.1 2013/01/03 20:50:43 vapier Exp $
+
+EAPI="4"
+
+inherit multilib toolchain-funcs eutils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
+		http://repo.or.cz/r/${PN}.git"
+	inherit git-2
+fi
+
+DESCRIPTION="static analysis tool for C"
+HOMEPAGE="http://smatch.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	# The repo.or.cz site does not produce stable tarballs,
+	# so we have to cache our own copy of the snapshot.
+	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="mirror://gentoo/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="OSL-1.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-db/sqlite"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-restrict.patch
+	sed -i \
+		-e '/^PREFIX=/s:=.*:=/usr:' \
+		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
+		Makefile || die
+}
+
+src_compile() {
+	emake PREFIX=/usr V=1 CC="$(tc-getCC)" smatch
+}
+
+src_install() {
+	# default install target installs a lot of sparse cruft
+	dobin smatch
+	insinto /usr/share/smatch/smatch_data
+	doins smatch_data/*
+	dodoc FAQ README
+}