Patch sparse 0.4.3 to be build-friendlier; fix possible build issue when icc is installed (no revision bump though); fix build with gcc-4.6 (bug #362499); fix dependencies (in particular gtk+:2).

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

6 files changed, 112 insertions, 28 deletions

diff --git a/sys-devel/sparse/ChangeLog b/sys-devel/sparse/ChangeLog
index 300b374f5d6b..d1168b8c818f 100644
--- a/sys-devel/sparse/ChangeLog
+++ b/sys-devel/sparse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/sparse
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/ChangeLog,v 1.41 2011/04/07 04:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/ChangeLog,v 1.42 2011/04/08 01:31:23 flameeyes Exp $
+
+  08 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> sparse-0.4.3.ebuild,
+  +files/sparse-0.4.3-gentoo.patch, sparse-9999.ebuild, metadata.xml:
+  Patch sparse 0.4.3 to be build-friendlier; fix possible build issue when icc
+  is installed (no revision bump though); fix build with gcc-4.6 (bug #362499);
+  fix dependencies (in particular gtk+:2).
 
   07 Apr 2011; Mike Frysinger <vapier@gentoo.org> sparse-0.4.3.ebuild,
   sparse-9999.ebuild:
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index d1ce571d06e8..d9651988d018 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX sparse-0.4.3-gentoo.patch 1446 RMD160 50e1d8e6831ab4b41658056102804cc8e9c474a9 SHA1 4e50553a4fe3fd34a7b7e44702a4d479232b3591 SHA256 e353bee56776054bbd7c60b4b41424eb2eba565bf303b2eaf382c129880c27aa
 DIST sparse-0.4.2.tar.bz2 164542 RMD160 260546cea13f37bb39fcb3e3e2b3014bc917e598 SHA1 e0e18c9ddddd9be290f56dc863cad2de76099759 SHA256 eb1d1494e6a7d76ae4eb71918011caad1e5f2672761c90e6de54231f2e98ae5e
 DIST sparse-0.4.3.tar.bz2 172431 RMD160 1fcc8c9d6e0d42e915b80a05adf6dfd3feb66bed SHA1 6d0933b2633f8cebc00b1d4c0af8b821cdd6634b SHA256 9059bc649ca8c9309e542d0015091ccf72ac9e3300db0adb4eba838cdcc82f9c
 EBUILD sparse-0.4.2.ebuild 995 RMD160 60364e1db6e2426994c4b58a5e13c33ea8c181f8 SHA1 3fe391161e71ba3fe28755a0af6a9d135d354881 SHA256 b7764eeec7486f22fdbff8c59462d22ea8d4da6c27d2dad3a6bc704fbb12a90d
-EBUILD sparse-0.4.3.ebuild 1216 RMD160 d2049f057787c51a56909aee87576f0782765c13 SHA1 d1ce6b5b32a5afdf2912fb587abcee871aa5b661 SHA256 28219ec8bc85519ddba87216ba64f754c3050abee4d817a8475efc2e86057c7d
-EBUILD sparse-9999.ebuild 1215 RMD160 6ed1af64a5a8cd8a687a549461bef77e85fabbcd SHA1 c0a5fdd9905c35cf6c964d0d7697a083c3a53d9d SHA256 440e963300b82e601b8dac5718bf3c9c25540a5ce500cf9bc69a09c2b6c0531f
-MISC ChangeLog 5178 RMD160 355b06a123ea4403da56e3ecf3de94456b356c64 SHA1 d91fb509353df0941e11b99a1d49ecbe1ebfd0a0 SHA256 a2580a84008580f166e6d682dc3474dd6e50fbb876f419d6c7f1b0413c9f9068
-MISC metadata.xml 187 RMD160 6a4f3d1c3e4aaca2af8800dea988ae5dea274137 SHA1 53ea00198fe3d462045190c6bd779870762dcb81 SHA256 864c3ba42cf97b3407ecce670b15a46f2623bc66c4b78f0a25dc8d4eec54d44b
+EBUILD sparse-0.4.3.ebuild 1404 RMD160 52010997e9457193f259835d38fa4801f24d933b SHA1 c711b184fc8d7b1336f622a7105e23b03f28d230 SHA256 64fe8de2a5e4c2fefc2dcbb5f91a18e159df16d962214cb92026736972486b54
+EBUILD sparse-9999.ebuild 1258 RMD160 d947413c1709503e35c4d026579fe12aef58f693 SHA1 566f1479c7a8a646fed9e75ffb52225cbc0cbbf4 SHA256 8d9a2c7fb3aa01d54cde0a87ec091f429d4308d3a45cfd31f306b4adb4ed1d25
+MISC ChangeLog 5531 RMD160 475dfd2989ce05d1ae8118c0e6f688e3f25cc523 SHA1 972273e2ec25caefab28e5157136d11246bebc3b SHA256 2ce246bb41466cbcf73831b017a8b589b82068743f2bd36c11c4193b6edd56c9
+MISC metadata.xml 436 RMD160 5d2a27e7a8a9dbf50dab515ba5485239e1423fce SHA1 d56a122146434e29b3481d62bc2b1bd13cafaf3d SHA256 992641da4c9653f71d3e2ae63fb95393fa82a2ba73a2a492247d6de4bb699c2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2dPR0ACgkQaC/OocHi7JbZQgD9HHbaoMMpQDYluIQ6cRyV9kTd
-lN6iu6ym8InuKhW7urkA/3lZL9de7IVdGA2OPgCWo9g2S8ZQtW5BLdTGib2svo7h
-=3fsw
+iEYEARECAAYFAk2eZW8ACgkQAiZjviIA2XjYdQCfTpbU1qxQ3mchlhGWmcYiYCWf
+w2wAmwSMUdHe+QVmiDLPv7XBFKL0awY0
+=czV2
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch b/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch
new file mode 100644
index 000000000000..6f46687d78b3
--- /dev/null
+++ b/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch
@@ -0,0 +1,49 @@
+diff --git a/Makefile b/Makefile
+index 74905df..1f2b2b6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ OS = linux
+ 
+ 
+ CC = gcc
+-CFLAGS = -O2 -finline-functions -fno-strict-aliasing -g
++CFLAGS ?= -O2 -finline-functions -fno-strict-aliasing -g
+ CFLAGS += -Wall -Wwrite-strings
+ LDFLAGS += -g
+ AR = ar
+@@ -21,7 +21,8 @@ HAVE_GCC_DEP:=$(shell touch .gcc-test.c && 				\
+ 		echo 'yes'; rm -f .gcc-test.d .gcc-test.o .gcc-test.c)
+ HAVE_GTK2:=$(shell pkg-config --exists gtk+-2.0 2>/dev/null && echo 'yes')
+ 
+-CFLAGS += -DGCC_BASE=\"$(shell $(CC) --print-file-name=)\"
++GCC_BASE = $(shell $(CC) --print-file-name=)
++CFLAGS += -DGCC_BASE=\"$(GCC_BASE)\"
+ 
+ ifeq ($(HAVE_GCC_DEP),yes)
+ CFLAGS += -Wp,-MD,$(@D)/.$(@F).d
+@@ -113,7 +114,9 @@ SED_PC_CMD = 's|@version@|$(VERSION)|g;		\
+ 
+ all: $(PROGRAMS) sparse.pc
+ 
+-install: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc
++all-installable: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc
++
++install: all-installable
+ 	$(Q)install -d $(DESTDIR)$(BINDIR)
+ 	$(Q)install -d $(DESTDIR)$(LIBDIR)
+ 	$(Q)install -d $(DESTDIR)$(MAN1DIR)
+diff --git a/parse.h b/parse.h
+index 6b21e23..b26bd03 100644
+--- a/parse.h
++++ b/parse.h
+@@ -35,10 +35,6 @@ struct statement {
+ 		struct /* declaration */ {
+ 			struct symbol_list *declaration;
+ 		};
+-		struct /* label_arg */ {
+-			struct symbol *label;
+-			struct statement *label_statement;
+-		};
+ 		struct {
+ 			struct expression *expression;
+ 			struct expression *context;
diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml
index 1475f6daf67e..ca0df322a6dc 100644
--- a/sys-devel/sparse/metadata.xml
+++ b/sys-devel/sparse/metadata.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel-misc</herd>
-<herd>toolchain</herd>
+  <herd>kernel-misc</herd>
+  <herd>toolchain</herd>
+  <use>
+    <flag name='xml'>
+      Build the c2xml utility (requires <pkg>dev-libs/libxml2</pkg>).
+    </flag>
+
+    <flag name='gtk'>
+      Build the test-inspect utility (requires
+      <pkg>x11-libs/gtk+</pkg> version 2)
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-devel/sparse/sparse-0.4.3.ebuild b/sys-devel/sparse/sparse-0.4.3.ebuild
index 81c8ab5e283f..75a7af6b3159 100644
--- a/sys-devel/sparse/sparse-0.4.3.ebuild
+++ b/sys-devel/sparse/sparse-0.4.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-0.4.3.ebuild,v 1.3 2011/04/07 04:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-0.4.3.ebuild,v 1.4 2011/04/08 01:31:23 flameeyes Exp $
 
 EAPI="2"
 
-inherit multilib toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
 	inherit git
@@ -23,25 +23,42 @@ fi
 
 LICENSE="OSL-1.1"
 SLOT="0"
-IUSE="gtk xml"
+IUSE="gtk xml test"
 
-RDEPEND="gtk? ( x11-libs/gtk+ )
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
 	xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
+	gtk? ( dev-util/pkgconfig )
+	xml? ( dev-util/pkgconfig )"
 
 src_prepare() {
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions::}' \
-		Makefile || die
-	export MAKEOPTS+=" V=1 CC=$(tc-getCC) HAVE_GTK2=$(usex gtk) HAVE_LIBXML=$(usex xml)"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+mymake() {
+	usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
+
+	emake \
+		V=1 \
+		CC="$(tc-getCC)" \
+		GCC_BASE="$(gcc-config -L | cut -d : -f1)" \
+		HAVE_LIBXML=$(usex xml) \
+		HAVE_GTK2=$(usex gtk) \
+		PREFIX=/usr \
+		LIBDIR="/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		"$@" \
+		|| die
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	mymake \
+		$(use test && echo all) all-installable
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	mymake install
 	dodoc FAQ README
 }
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index e3dc49c80e5a..c51fe47517cf 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-9999.ebuild,v 1.7 2011/04/07 04:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-9999.ebuild,v 1.8 2011/04/08 01:31:23 flameeyes Exp $
 
 EAPI="2"
 
@@ -25,10 +25,11 @@ LICENSE="OSL-1.1"
 SLOT="0"
 IUSE="gtk xml"
 
-RDEPEND="gtk? ( x11-libs/gtk+ )
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
 	xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	gtk? ( dev-util/pkgconfig )
+	xml? ( dev-util/pkgconfig )"
 
 usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }