Apply patch from Dane Smith <smithdanea@gmail.com> to respect LDFLAGS and fix multiple QA issues. Keyworded for amd64. Bug #332731

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

4 files changed, 158 insertions, 3 deletions

diff --git a/dev-libs/mpatrol/ChangeLog b/dev-libs/mpatrol/ChangeLog
index d958e8c1c45f..28338d8ce807 100644
--- a/dev-libs/mpatrol/ChangeLog
+++ b/dev-libs/mpatrol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/mpatrol
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.21 2009/09/23 17:25:21 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.22 2010/08/15 19:52:09 hwoarang Exp $
+
+*mpatrol-1.4.8-r3 (15 Aug 2010)
+
+  15 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +mpatrol-1.4.8-r3.ebuild, +files/mpatrol-ldflags.diff:
+  Apply patch from Dane Smith <smithdanea@gmail.com> to respect LDFLAGS and
+  fix multiple QA issues. Keyworded for amd64. Bug #332731
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> mpatrol-1.4.8-r1.ebuild,
   mpatrol-1.4.8-r2.ebuild:
diff --git a/dev-libs/mpatrol/Manifest b/dev-libs/mpatrol/Manifest
index b25b5cc3f5bb..d4be3188315b 100644
--- a/dev-libs/mpatrol/Manifest
+++ b/dev-libs/mpatrol/Manifest
@@ -1,9 +1,11 @@
 AUX mpatrol-1.4.8-gcc44-glibc210.patch 2213 RMD160 394294d0674603dff0136348aa5edb2f135ff781 SHA1 f9d8b7d8ba4aec4c0cc6ce706f76845442e87852 SHA256 ea72642d04a4b07f4c3a3b5605ca3258f1ded8fd4ddcf72e61f7f6dc12bf7c6c
 AUX mpatrol-1.4.8-soname.patch 1097 RMD160 d0d767d24c51b8804691b416ac47d59bee8d4c2f SHA1 8878f286ac66f6fd3e757ba9fe627bd34a6c3f3a SHA256 f7e63160f3df250151bb9d8de13e252394a02beb89b9c905a0034907061498b2
+AUX mpatrol-ldflags.diff 1709 RMD160 22be09eaa0259bad6265a1ac52cffd1da88aefc3 SHA1 54a630e9b5e022f48231a66854aa9e237cfe49f1 SHA256 80b044e3b47892205f67b166f5dae8c31900f64932f41ac21d178b3fb64e3eb0
 AUX mpatrol-textrel-fix.patch 529 RMD160 e0ef6ab28b24c2261a88e682d1f59ed0c681a328 SHA1 e6b65eb79fc334cb1f82214ed3c0000890e1e876 SHA256 23566db6fe6e035870db35e7311f42c2a367a50ec1a24b044a465fa7fe81f30b
 DIST mpatrol_1.4.8.tar.gz 4413896 RMD160 5caa6a31f1a53578f28ff597e62c010d68320bc0 SHA1 26b3ef60a718f80486f10f74468cb33b5fcf75dd SHA256 2a58512cb355bf46b08e85683a2ad872bdd4cad5f7a40c87117c7f5badd9f232
 EBUILD mpatrol-1.4.8-r1.ebuild 2479 RMD160 6b614a12f414465088d6d48633547c4bf29afbe4 SHA1 00af8daea6d8e5b9c12440e287e080718a64f487 SHA256 9096bbf28dc9ad5d7e655b3cb8c15eafb58a3eeb820237bdfd79207b8f5a5d34
 EBUILD mpatrol-1.4.8-r2.ebuild 2734 RMD160 732dd39d16bb8b6bf6bba34d1edf872a2cd1f578 SHA1 5f061fe3dc2e7d5fdf711386471f03fd15e19344 SHA256 eb17049bd856ff9378cfdabbbc73c0a65863e969a100851b5e7a7806df312748
+EBUILD mpatrol-1.4.8-r3.ebuild 2897 RMD160 c321accba0884dad88c43799ce2322bc7b6d21cf SHA1 5815b66248d349d5ed7c289b07376a0ac3927e1b SHA256 e07817acee44cea9995b87bf9fa466448d8e843ae18d18ce1f8e1ebe06018052
 EBUILD mpatrol-1.4.8.ebuild 2252 RMD160 c13853d4297b5afa478d9f36f98bd78894548e7f SHA1 c651eb855b4cde40039b8db16cae2c99ad48b423 SHA256 791193ae77cb97df6df1890d6e2f58ba6a5d75d5eed66051620714543f95eeb0
-MISC ChangeLog 2257 RMD160 a8d27e04f941b769ba17ab7ef633dfd2b9e2d5e8 SHA1 1e8ce6169d8afccddb4cad237e57efdcec6d821f SHA256 044f8c46de85bb3852a6893c4421b9b1872a7a6ac510b4c90a024434b22c4c0d
+MISC ChangeLog 2537 RMD160 fa8477057235bff7b8a7c3422ceab07aac4c63ea SHA1 eab4016e813826bdea22c9da5af7b49b659e408f SHA256 bd063e5ce40846b761fac371a82ddeb153780be7a8162add6f5a65da8eb8a7c1
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
diff --git a/dev-libs/mpatrol/files/mpatrol-ldflags.diff b/dev-libs/mpatrol/files/mpatrol-ldflags.diff
new file mode 100644
index 000000000000..21f5a8c603a0
--- /dev/null
+++ b/dev-libs/mpatrol/files/mpatrol-ldflags.diff
@@ -0,0 +1,38 @@
+--- Makefile	2010-08-15 01:18:10.000000000 -0400
++++ Makefile.ne	2010-08-15 01:18:22.000000000 -0400
+@@ -46,7 +46,8 @@
+ OFLAGS = ${OPT_FLAGS} -fno-inline-functions
+ SFLAGS	= -fPIC
+ TFLAGS	= -DMP_THREADS_SUPPORT
+-LDFLAGS	= -shared
++LDFLAGS	= -shared $(LDOPTS)
++LDOPTS =
+ 
+ MPATROL	 = mpatrol
+ MPALLOC	 = mpalloc
+@@ -192,20 +193,20 @@
+ 	-@ rm -f machine.s 2>&1 >/dev/null
+ 
+ mpatrol: mpatrol.o getopt.o version.o
+-	$(CC) $(CFLAGS) $(OFLAGS) -o $@ mpatrol.o getopt.o version.o
++	$(CC) $(LDOPTS) $(OFLAGS) -o $@ mpatrol.o getopt.o version.o
+ 
+ mprof: mprof.o graph.o getopt.o list.o tree.o version.o
+-	$(CC) $(CFLAGS) $(OFLAGS) -o $@ mprof.o graph.o getopt.o list.o tree.o version.o
++	$(CC) $(LDOPTS) $(OFLAGS) -o $@ mprof.o graph.o getopt.o list.o tree.o version.o
+ 
+ mptrace: mptrace.o getopt.o tree.o slots.o utils.o version.o
+ ifeq ($(GUISUP),true)
+-	$(CC) $(CFLAGS) $(OFLAGS) -o $@ mptrace.o getopt.o tree.o slots.o utils.o version.o -L/usr/X11R6/lib -L/usr/X11R5/lib -L/usr/X11/lib -L/usr/X/lib -lXm -lXt -lXp -lXext -lX11
++	$(CC) $(LDOPTS) $(OFLAGS) -o $@ mptrace.o getopt.o tree.o slots.o utils.o version.o -L/usr/X11R6/lib -L/usr/X11R5/lib -L/usr/X11/lib -L/usr/X/lib -lXm -lXt -lXp -lXext -lX11
+ else
+-	$(CC) $(CFLAGS) $(OFLAGS) -o $@ mptrace.o getopt.o tree.o slots.o utils.o version.o
++	$(CC) $(LDOPTS) $(OFLAGS) -o $@ mptrace.o getopt.o tree.o slots.o utils.o version.o
+ endif
+ 
+ mleak: mleak.o getopt.o tree.o version.o
+-	$(CC) $(CFLAGS) $(OFLAGS) -o $@ mleak.o getopt.o tree.o version.o
++	$(CC) $(LDOPTS) $(OFLAGS) -o $@ mleak.o getopt.o tree.o version.o
+ 
+ all: $(ARCHIVE_MPATROL) $(SHARED_MPATROL) $(ARCHTS_MPATROL) $(SHARTS_MPATROL) \
+ 	$(ARCHIVE_MPALLOC) $(SHARED_MPALLOC) $(ARCHIVE_MPTOOLS) \
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild
new file mode 100644
index 000000000000..3e17136c8fd5
--- /dev/null
+++ b/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild,v 1.1 2010/08/15 19:52:09 hwoarang Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="X"
+
+DESCRIPTION="A link library for controlling and tracing dynamic memory allocation. Attempts to diagnose run-time errors that are caused by misuse of dynamically allocated memory. Simple integration via a single header."
+SRC_URI="http://www.cbmamiga.demon.co.uk/mpatrol/files/${PN}_${PV}.tar.gz"
+HOMEPAGE="http://www.cbmamiga.demon.co.uk/mpatrol/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~sparc"
+S="${WORKDIR}/${PN}"
+
+# To use X, mpatrol requires Motif
+DEPEND="!dev-lang/mercury
+	X? ( x11-libs/openmotif )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}/${P}-soname.patch"
+
+	#bug 272505
+	epatch "${FILESDIR}/${P}-gcc44-glibc210.patch"
+
+	cd ${S}/src
+	# [Bug 176592] textrel fix for dev-libs/mpatrol
+	epatch "${FILESDIR}/${PN}-textrel-fix.patch"
+
+	sed -i \
+		-e 's:#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd), MP_LIBNAME(iberty):#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd):' config.h \
+			|| die "sed config.h failed"
+
+	cd ${S}/build/unix
+	sed -i \
+		-e 's:^OFLAGS.= -O3:OFLAGS = ${OPT_FLAGS}:' Makefile \
+			|| die "sed Makefile for CFLAGS failed"
+
+	sed -i \
+		-e 's:$(LD) $(LDFLAGS) -o $@ $(SHARED_MPTOBJS):$(LD) $(LDFLAGS) -liberty -o $@ $(SHARED_MPTOBJS):' Makefile \
+			|| die "sed Makefile for fixing -libiberty failed"
+	
+	epatch "${FILESDIR}"/${PN}-ldflags.diff
+
+	if use X; then
+		sed -i \
+			-e 's:^GUISUP.= false:GUISUP = true:' Makefile \
+			|| die "sed Makefile for GUISUP failed"
+	fi
+}
+
+src_compile() {
+	cd ${S}/build/unix
+	emake STRIPPROG=true OPT_FLAGS="${CFLAGS} -Wa,--noexecstack" LDOPTS="${LDFLAGS}" all || die "emake failed"
+}
+
+# **
+# ** The install is straightforward, but a bit on the odd side. The author
+# ** gives a list of things that need to be done, rather than attempt to
+# ** make an install target. --nj
+# **
+src_install () {
+	cd ${S}/build/unix
+	dobin mleak mpatrol mprof mptrace || die
+	dolib.so lib*.so.* || die
+	dolib.a  lib*.a || die
+
+	# Each lib needs a symlink from the .so level
+	#for L in lib*.so.*; do
+	#	dosym $L /usr/lib/`echo $L | sed 's:^\([^\.]*\.so\).*:\1:'`
+	#done
+
+	insinto /usr
+	cd ${S}/bin
+	dobin * || die
+
+	insinto /usr/include/
+	cd ${S}/src
+	doins mpatrol.h mpalloc.h mpdebug.h || die
+
+	insinto /usr/include/mpatrol
+	doins ${S}/tools/*.h || die
+
+	doman ${S}/man/man?/* || die
+
+	cd ${S}
+	dodoc AUTHORS ChangeLog NEWS README THANKS VERSION pkg/lsm/*lsm || die
+
+	cd ${S}/doc
+	dodoc *.dvi *.ps *.pdf *.txt || die
+	doinfo mpatrol.info || die
+	dohtml mpatrol.html || die
+
+	docinto images
+	dodoc images/*.{eps,pdf} || die
+
+	insinto /usr/share/doc/${PF}/html/images
+	doins images/*.jpg || die
+}
+
+pkg_postinst() {
+	elog " Please review the documentation in /usr/share/doc/$PF"
+}