- fix QA problems bug 176592

(Portage version: 2.1.2_pre1)

5 files changed, 154 insertions, 1 deletions

diff --git a/dev-libs/mpatrol/ChangeLog b/dev-libs/mpatrol/ChangeLog
index 0382504f7c09..6f61c3a525ad 100644
--- a/dev-libs/mpatrol/ChangeLog
+++ b/dev-libs/mpatrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/mpatrol
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.14 2007/03/03 23:08:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.15 2007/04/30 17:07:58 solar Exp $
+
+*mpatrol-1.4.8-r2 (30 Apr 2007)
+
+  30 Apr 2007; <solar@gentoo.org> +files/mpatrol-1.4.8-soname.patch,
+  +files/mpatrol-textrel-fix.patch, +mpatrol-1.4.8-r2.ebuild:
+  - fix QA problems bug 176592
 
   03 Mar 2007; Marius Mauch <genone@gentoo.org> mpatrol-1.4.8-r1.ebuild:
   Replacing einfo with elog
diff --git a/dev-libs/mpatrol/files/digest-mpatrol-1.4.8-r2 b/dev-libs/mpatrol/files/digest-mpatrol-1.4.8-r2
new file mode 100644
index 000000000000..d37b71db537c
--- /dev/null
+++ b/dev-libs/mpatrol/files/digest-mpatrol-1.4.8-r2
@@ -0,0 +1,3 @@
+MD5 ada423c49bc5bfa7c3e7a80a711c2a1a mpatrol_1.4.8.tar.gz 4413896
+RMD160 5caa6a31f1a53578f28ff597e62c010d68320bc0 mpatrol_1.4.8.tar.gz 4413896
+SHA256 2a58512cb355bf46b08e85683a2ad872bdd4cad5f7a40c87117c7f5badd9f232 mpatrol_1.4.8.tar.gz 4413896
diff --git a/dev-libs/mpatrol/files/mpatrol-1.4.8-soname.patch b/dev-libs/mpatrol/files/mpatrol-1.4.8-soname.patch
new file mode 100644
index 000000000000..a2f82103f2c0
--- /dev/null
+++ b/dev-libs/mpatrol/files/mpatrol-1.4.8-soname.patch
@@ -0,0 +1,29 @@
+--- build/unix/Makefile	2007-04-30 09:55:46.000000000 -0700
++++ build/unix/Makefile	2007-04-30 09:57:32.000000000 -0700
+@@ -124,7 +124,7 @@
+ 	$(AR) cr $@ $(ARCHIVE_MPTOBJS)
+ 
+ $(SHARED_MPATROL).$(VERSION).$(REVISION): $(SHARED_MPTOBJS)
+-	$(LD) $(LDFLAGS) -o $@ $(SHARED_MPTOBJS)
++	$(LD) $(LDFLAGS) -o $@ $(SHARED_MPTOBJS) -Wl,--soname=$(SHARED_MPATROL).$(VERSION)
+ 
+ $(SHARED_MPATROL): $(SHARED_MPATROL).$(VERSION).$(REVISION)
+ 	@ ln -f -s $< $@
+@@ -139,7 +139,7 @@
+ 	$(AR) cr $@ $(ARCHTS_MPTOBJS)
+ 
+ $(SHARTS_MPATROL).$(VERSION).$(REVISION): $(SHARTS_MPTOBJS)
+-	$(LD) $(LDFLAGS) -o $@ $(SHARTS_MPTOBJS)
++	$(LD) $(LDFLAGS) -o $@ $(SHARTS_MPTOBJS) -Wl,--soname=$(SHARTS_MPATROL).$(VERSION)
+ 
+ $(SHARTS_MPATROL): $(SHARTS_MPATROL).$(VERSION).$(REVISION)
+ 	@ ln -f -s $< $@
+@@ -154,7 +154,7 @@
+ 	$(AR) cr $@ $(ARCHIVE_MPAOBJS)
+ 
+ $(SHARED_MPALLOC).$(VERSION).$(REVISION): $(SHARED_MPAOBJS)
+-	$(LD) $(LDFLAGS) -o $@ $(SHARED_MPAOBJS)
++	$(LD) $(LDFLAGS) -o $@ $(SHARED_MPAOBJS) -Wl,--soname=$(SHARED_MPALLOC).$(VERSION)
+ 
+ $(SHARED_MPALLOC): $(SHARED_MPALLOC).$(VERSION).$(REVISION)
+ 	@ ln -f -s $< $@
diff --git a/dev-libs/mpatrol/files/mpatrol-textrel-fix.patch b/dev-libs/mpatrol/files/mpatrol-textrel-fix.patch
new file mode 100644
index 000000000000..ef37e3435848
--- /dev/null
+++ b/dev-libs/mpatrol/files/mpatrol-textrel-fix.patch
@@ -0,0 +1,12 @@
+diff -urp mpatrol-old/src/config.h mpatrol/src/config.h
+--- mpatrol-old/src/config.h	2002-01-08 21:13:59.000000000 +0100
++++ mpatrol/src/config.h	2005-12-22 17:14:25.000000000 +0100
+@@ -796,7 +796,7 @@
+ 
+ #ifndef MP_INIT_SUPPORT
+ #if SYSTEM == SYSTEM_DGUX || SYSTEM == SYSTEM_DRSNX || \
+-    SYSTEM == SYSTEM_DYNIX || SYSTEM == SYSTEM_LINUX || \
++    SYSTEM == SYSTEM_DYNIX || \
+     SYSTEM == SYSTEM_SOLARIS || SYSTEM == SYSTEM_UNIXWARE
+ #define MP_INIT_SUPPORT 1
+ #elif SYSTEM == SYSTEM_FREEBSD || SYSTEM == SYSTEM_NETBSD || \
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
new file mode 100644
index 000000000000..29718620addb
--- /dev/null
+++ b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/04/30 17:07:58 solar 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="~x86 ~sparc"
+S="${WORKDIR}/${PN}"
+
+# To use X, mpatrol requires Motif
+DEPEND="X? ( x11-libs/openmotif )
+		virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}"/${PN}-1.4.8-soname.patch || die "patching failed"
+
+	cd ${S}/src
+	# [Bug 176592] textrel fix for dev-libs/mpatrol
+	epatch "${FILESDIR}"/${PN}-textrel-fix.patch || die "patching failed"
+
+	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"
+
+
+	use X && sed -i \
+		    -e 's:^GUISUP.= false:GUISUP = true:' Makefile \
+			|| die "sed Makefile for GUISUP failed"
+
+}
+
+src_compile() {
+	cd ${S}/build/unix
+	STRIPPROG=true OPT_FLAGS="$CFLAGS -Wa,--noexecstack" emake 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
+	dolib.so lib*.so.*
+	dolib.a  lib*.a
+
+	# 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 *
+
+	insinto /usr/include/
+	cd ${S}/src
+	doins mpatrol.h mpalloc.h mpdebug.h
+
+	insinto /usr/include/mpatrol
+	doins ${S}/tools/*.h
+
+	doman ${S}/man/man?/*
+
+	cd ${S}
+	dodoc AUTHORS ChangeLog NEWS README THANKS VERSION pkg/lsm/*lsm
+
+	cd ${S}/doc
+	dodoc *.dvi *.ps *.pdf *.txt
+	doinfo mpatrol.info
+	dohtml mpatrol.html
+
+	docinto images
+	dodoc images/*.{eps,pdf}
+
+	insinto /usr/share/doc/${F}/html/images
+	doins images/*.jpg
+}
+
+pkg_postinst() {
+	elog " Please review the documentation in /usr/share/doc/$PF"
+}