Remove -Werror, thanks patrick and dirtyepic, bug 468246.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 216 insertions, 3 deletions

diff --git a/dev-util/exmap/ChangeLog b/dev-util/exmap/ChangeLog
index 648f95d6586f..819e33f927a3 100644
--- a/dev-util/exmap/ChangeLog
+++ b/dev-util/exmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/exmap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/exmap/ChangeLog,v 1.5 2012/09/19 08:58:36 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/exmap/ChangeLog,v 1.6 2013/05/04 04:27:52 xmw Exp $
+
+*exmap-0.10-r1 (04 May 2013)
+
+  04 May 2013; Michael Weber <xmw@gentoo.org> +exmap-0.10-r1.ebuild,
+  +files/exmap-0.10-r1-makefiles.patch:
+  Remove -Werror, thanks patrick and dirtyepic, bug 468246.
 
   19 Sep 2012; Michael Weber <xmw@gentoo.org>
   +files/exmap-0.10-kernel-3.5.patch, exmap-0.10.ebuild:
diff --git a/dev-util/exmap/Manifest b/dev-util/exmap/Manifest
index 144f0ea5fab5..7e3c4ba2cc31 100644
--- a/dev-util/exmap/Manifest
+++ b/dev-util/exmap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX exmap-0.10-as-needed.patch 499 SHA256 65bd41db5828ed9859fabf40db7c8e6e01e1b7bfe9d7c1aea8f2757b5b4ff7e0 SHA512 d2497ab77f48a8495328de17f3b4681793c97c7cb2a76200cebe620ba4e53429964eb3b3a6ea5db5456fa2afe95f58a54768a3ea15939a4333c7ede3e7c67b26 WHIRLPOOL e0085b57295d3be0dd09b2d4f6839faf653b1a1f8e6b74fa7d643c96007f38d22bf6b8e56c06b75e6ddcaab09be61f693aa0405feb38a476ab950763b92e0547
 AUX exmap-0.10-fix64bit.patch 855 SHA256 89aae22c8450137dd3ebb88b2d3acbea7a04c08a1a075dbab7d265e7dd3277a0 SHA512 a7d899e351ea503b886dbf2ef3f7c90e2d45d79729288d040905b697f178b7a4622f557e7030b00c059c46c86abdfcae6ca6b803ca02cd537c803cda697a2804 WHIRLPOOL f4717e3a172dcb626746b29f8e989de05db0f9c967419ed9762a8c4c0f51c15461e9fa5210acadf38f2f464e966b15291b5a9c5170ada7418c70075fffd47443
 AUX exmap-0.10-gcc.patch 1827 SHA256 6a204d45dada0507b73214179cec6cbe62188f584e34ae6751769e2b32d89d89 SHA512 ac435edc3e286effaf3021b385f9b11bd5424be69592e61144b398d01135d83f6ad81d7bec59d6aff2e036dc9a644bf415f6ead8203362374f0910d2ac4ca2b9 WHIRLPOOL b29ec54fd41b12480eaa384ddd6e16127e67b1aaa43a6ac1ea3130f2a943ed1e687f7835878e643f798aa334ce94160c10bd20beec221d5cfac1f6deda3784b2
@@ -5,7 +8,16 @@ AUX exmap-0.10-gcc45.patch 318 SHA256 3e8d02989339543b797ffe306f3d4c997869a5fa5e
 AUX exmap-0.10-kernel-3.5.patch 228 SHA256 e45434138580c16b3ec79ad51dd592b1cc303f78d274fe8cebb63406479e549d SHA512 668e0ce9f2077bdc210502fac4b73b9bb7a8bfe3856d419c67cbc2da238551082b8457ff5a3d8f0c3be240eeec043b8d497b89ea53a117d0134528451125ce50 WHIRLPOOL 9b947b1ddf2c2c6ca32fd7822e16c746b42d558f040f162ce6b478fb34ea15fcad034a0f102369ac5809d8ca7b0d7c4cfbd095da8453c33c05abd0be8d7b8f9a
 AUX exmap-0.10-kernel.patch 1694 SHA256 d41e2296b063e7c982929deae8d23d2ee2099f249df7965f84c0ece9de81be92 SHA512 2f828f47111f829b5ca288bb72068408d3721cdb82973841034ec371ba1b5dd3b6dc64e55828df03a08982669e2c7b0621d07c2c44632c9874b43077c93b172a WHIRLPOOL a0c58d1c9ac8f4401e706d6caac43014ec0e2f0645db584cbe71659c96dce37e0ce85c57ad2773d6b42b304cdcd5663719f7aaf2909fc1f6adff1288bd84c734
 AUX exmap-0.10-makefiles.patch 3400 SHA256 37203da662b807f98cf11dc1e32a2a0723c5dcfb212871b7b2b073e14be1d4b2 SHA512 a9a001fa88108db609fb4ae8c7b1394023b46f1ae1d3e7e6e3822570a5f65e3284df710ee930d38d7c090b36108cb45d35552a364c1fc6d0cb2939ac91a218cf WHIRLPOOL a215811885887b503a351d88d7cdb097fa79cbbafe4864d11ec5385056f2524da12b6f6ea99ad8bd07b2b8f093b9cb48a9cd8d862ed1bd45d592f8366fa40686
+AUX exmap-0.10-r1-makefiles.patch 3384 SHA256 38a80e6707000037f0eda16fa17c0d9df2ed620704f7ad1df74c25fde36bb85e SHA512 0e0a62be056bcedb301e33fddd88eb9759ad724b55f2b137305113d7917738ca15fb7192df23ad61ad731856f9d78a623acd896a738dcbccbbddca58d3b03a0b WHIRLPOOL b70509990518ccc2faef57084aa1487e034527a92f025305efbb933c737856b4894f5b3fbfe9cab1e7bb8b7b2e25d0981277a389d8a1ee9fd187cc0cd84cf9ed
 DIST exmap-0.10.tgz 124620 SHA256 f6d5feffa53afa3e1321df91b127cdf403f7239076539eeef9aab665286c007c SHA512 ce9cd231ab8d726ea29f9ad1cccd505b00661290acfa6dadfe0bee756d706011cc7003ade011b106778eaa11d00b8b7b2eb094fb3666062faa063761f4622503 WHIRLPOOL 3cc45d74be4eee8d61993799d1f89ad7529b33c0dd979520b0f1160da75cd8477519fd3f4c904f6295f08d5d908a5ae61b6638f38a7624ab7e26496837fba34d
+EBUILD exmap-0.10-r1.ebuild 2146 SHA256 9e595c20718e9098cf575d7e34eb379c639989d9ce7c566343f9e8ed91c9297e SHA512 f0fc519d1f37dbedfd2b802eb3eefc45cebf8ad71d30fd9ff4fcff2b49164c4e598c75b004319283fa6d0a50de8908ca747d8d70268823175435cd3b37adf58d WHIRLPOOL 16117be5da857f8753d36acef7f695279405bc1a91fbb1c697c81df0092c74ed2dfb856ce879056705d60a2cca9803c03f54e04d0ba657d41603274e00dc983a
 EBUILD exmap-0.10.ebuild 2112 SHA256 18ec896492c051511a211bbb973d329fa184757a3ce8b3fe6408a1584f6f87df SHA512 1f21a243a58b457c3cb46165f6e012b9c18160458d3cd7a24deb3940474ce131ba379fc681773bcd0db8586909b89cbffc4b4732a9eaada42d62cc0b22608f32 WHIRLPOOL bb91d4c4028b208d81a14afc182c3e969a07d54b0c95320a9fa67a87ad489d162fb773ea25a24f2ab157c543fe42a676d8e6725b8d88a43c2f603537f4e8e496
-MISC ChangeLog 1119 SHA256 1f858d05c06482402fc48cd8893a293fbdfadb5396b59f771118938ec9500c6d SHA512 81119d3441fad3aea20e4dda8d44822a6994bcb3c7c0e51bbabb492631b32d070a9ec2c8b47d3e9788821ca44472e06ea76737db5021fedf09f2c2c4bd32820e WHIRLPOOL 0a930256ca4a3fa2e1d15b3e62872fbb0c538ac3aab3ecc725f2b241486ad26db2020e1c64ea5dd438a99cdb2846605698ea07d70017bd0dafe90e1f2fa46789
+MISC ChangeLog 1319 SHA256 17262a4a1839ba7ea1a54ba5dfb82fc1b76cff3364e8c8f9370bd173ea98fbee SHA512 90bba2d5e807c07f22920d6cca1e1270332081a799642c28bc8fbaf6a0565d96a1f3828938751e896d6626b0766f85ec148723e754b64d172aa8af3a93efcd63 WHIRLPOOL b5d85416d00c582aa14f9f7f11fd652cbab6d5ebdd4c9f3e0a0e68ee35c9b5072adc6a78b2c9d5a5dc29a67e841c4c178bc8a3d022c835fcc32f0e7ff2e13e05
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGEjy8ACgkQknrdDGLu8JAhoQD+OMM4vdNAAikrGMQ2O1PHVMgN
+62WZ3y30+jf401RY15ABAIs0MXSa5WDWrT6LhpNza6Nz1ruFK/HsN8Idi8xoCkFB
+=VPCW
+-----END PGP SIGNATURE-----
diff --git a/dev-util/exmap/exmap-0.10-r1.ebuild b/dev-util/exmap/exmap-0.10-r1.ebuild
new file mode 100644
index 000000000000..76039facc422
--- /dev/null
+++ b/dev-util/exmap/exmap-0.10-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/exmap/exmap-0.10-r1.ebuild,v 1.1 2013/05/04 04:27:52 xmw Exp $
+
+EAPI=2
+
+inherit eutils linux-mod
+
+DESCRIPTION="A memory analysis kernel module with userland tool"
+HOMEPAGE="http://www.berthels.co.uk/exmap/"
+SRC_URI="http://www.berthels.co.uk/${PN}/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="dev-libs/libpcre
+	gtk? ( dev-cpp/gtkmm:2.4
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+MODULE_NAMES="exmap(misc:${S}/kernel)"
+BUILD_TARGETS="clean kernel_modules"
+
+src_prepare() {
+	# patch find_task_by_pid to pid_task and &proc_root to NULL
+	epatch "${FILESDIR}/${P}-kernel.patch"
+
+	# use $(MAKE), remove -g on CXXFLAGS, clean up CXX/LD invocations
+	# remove -Werror, bug 468246
+	epatch "${FILESDIR}/${PF}-makefiles.patch"
+
+	# somthing strange between linux-mod supplied ARCH and old kernels
+	# which leads to arch/x86/Makefile: file/dir x86 not found
+	if kernel_is lt 2 6 25 ; then
+		sed -i -e 's:\$(MAKE):unset ARCH ; \$(MAKE):' kernel/Makefile || die
+	fi
+
+	# new gcc include behavior
+	epatch "${FILESDIR}/${P}-gcc.patch"
+
+	# gcc4.5 fails on return false as std::string
+	epatch "${FILESDIR}/${P}-gcc45.patch"
+
+	# fix for 64bit from http://www.kdedevelopers.org/node/4166
+	epatch "${FILESDIR}/${P}-fix64bit.patch"
+
+	# fix underlinking with -Wl,--as-needed
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# no longer call make clean in kernel source dir
+	epatch "${FILESDIR}/${P}-kernel-3.5.patch"
+
+	rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die
+}
+
+src_compile() {
+	export KERNEL_DIR
+	linux-mod_src_compile
+
+	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C jutil || die
+	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C src $(use gtk || echo exmtool) || die
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dobin src/exmtool || die
+	use gtk && { dobin src/gexmap || die ; }
+	dodoc TODO README || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	elog "Please load the exmap kernel module before running exmtool or gexmap."
+}
diff --git a/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch b/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch
new file mode 100644
index 000000000000..4c971454bc74
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch
@@ -0,0 +1,115 @@
+diff -ru exmap-0.10.orig/work/exmap-0.10/jutil/Makefile exmap-0.10/work/exmap-0.10/jutil/Makefile
+--- jutil/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ jutil/Makefile	2010-02-17 17:31:56.000000000 +0100
+@@ -12,21 +12,20 @@
+ OBJ += $(ETOBJ)
+ EXES += egtest
+ 
+-CXX=g++
+-CXXFLAGS=-Wall -Werror -g -I.
+-LD=g++
+-LDFLAGS=-lpcre
++CXX = g++
++CXXFLAGS += -Wall -I.
++LD = ld
+ 
+ build: $(LIBS) $(EXES)
+ 
+ trun: $(TROBJ) $(JLIB)
+-	$(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L.
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(TROBJ) -o trun -ljutil -lpcre -L.
+ 
+ $(JLIB): $(JOBJ)
+ 	ar rs $(JLIB) $(JOBJ)
+ 
+ egtest: $(ETOBJ)
+-	$(LD) $(ETOBJ) -o egtest $(LDFLAGS)
++	$(CXX) $(CXXFLAGS) $(ETOBJ) -o egtest $(LDFLAGS)
+ 
+ clean:
+ 	rm -f $(OBJ) $(EXES) $(JLIB) *~
+diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/Makefile exmap-0.10/work/exmap-0.10/kernel/Makefile
+--- kernel/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ kernel/Makefile	2010-02-17 17:30:06.000000000 +0100
+@@ -7,7 +7,7 @@
+ build: kernel_modules
+ 
+ kernel_modules:
+-	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) modules
++	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules
+ 
+ clean:
+-	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean
++	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
+Only in exmap-0.10/work/exmap-0.10/kernel/.tmp_versions: exmap.mod
+diff -ru exmap-0.10.orig/work/exmap-0.10/src/Makefile exmap-0.10/work/exmap-0.10/src/Makefile
+--- src/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ src/Makefile	2010-02-17 17:33:38.000000000 +0100
+@@ -1,5 +1,5 @@
+ CXX=g++
+-LD=g++
++LD=ld
+ JUTILDIR=../jutil
+ 
+ #CXXFLAGS += -pg
+@@ -11,11 +11,12 @@
+ 
+ EXMAP_OBJ=Exmap.o Range.o Elf.o
+ 
+-CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR)
+-LDFLAGS += -lpcre -ljutil -L$(JUTILDIR)
++CXXFLAGS += -Wall -I$(JUTILDIR)
++LDFLAGS += -L$(JUTILDIR)
++LIBS += -lpcre -ljutil
+ 
+ GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4`
+-GTKLDFLAGS = `pkg-config --libs gtkmm-2.4`
++GTKLIBS = `pkg-config --libs gtkmm-2.4`
+ 
+ # ------------------------------------------------------------
+ 
+@@ -76,34 +77,34 @@
+ 	$(JUTILDIR)/trun $(TESTS)
+ 
+ gexmap: $(GEM_OBJ)
+-	$(LD) -o gexmap $(GEM_OBJ) $(LDFLAGS) $(GTKLDFLAGS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o gexmap $(GEM_OBJ) $(LIBS) $(GTKLIBS)
+ 
+ gexmap.o: gexmap.cpp
+-	$(CC) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
+ 
+ exmtool: $(CL_OBJ)
+-	$(LD) -o exmtool $(CL_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o exmtool $(CL_OBJ) $(LIBS)
+ 
+ elftool: $(ET_OBJ)
+-	$(LD) -o elftool $(ET_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o elftool $(ET_OBJ) $(LIBS)
+ 
+ showproc: $(SP_OBJ)
+-	$(LD) -o showproc $(SP_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o showproc $(SP_OBJ) $(LIBS)
+ 
+ t_range: $(TR_OBJ)
+-	$(LD) -o t_range $(TR_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_range $(TR_OBJ) $(LIBS)
+ 
+ t_elf: $(TE_OBJ)
+-	$(LD) -o t_elf $(TE_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_elf $(TE_OBJ) $(LIBS)
+ 
+ t_pcre: $(TP_OBJ)
+-	$(LD) -o t_pcre $(TP_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_pcre $(TP_OBJ) $(LIBS)
+ 
+ t_exmap: $(TX_OBJ)
+-	$(LD) -o t_exmap $(TX_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_exmap $(TX_OBJ) $(LIBS)
+ 
+ t_artsd: $(TA_OBJ)
+-	$(LD) -o t_artsd $(TA_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_artsd $(TA_OBJ) $(LIBS) 
+ 
+ clean: cleantags cleandoc
+ 	rm -f $(OBJS) $(EXES) $(SHLIBS) $(EXTRA_DEL_FILES)