- fix QA problems bug 176592

Package-Manager: portage-2.1.2_pre1

6 files changed, 173 insertions, 15 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/Manifest b/dev-libs/mpatrol/Manifest
index 9cd483888e79..8048927de942 100644
--- a/dev-libs/mpatrol/Manifest
+++ b/dev-libs/mpatrol/Manifest
@@ -1,29 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX mpatrol-1.4.8-soname.patch 1097 RMD160 d0d767d24c51b8804691b416ac47d59bee8d4c2f SHA1 8878f286ac66f6fd3e757ba9fe627bd34a6c3f3a SHA256 f7e63160f3df250151bb9d8de13e252394a02beb89b9c905a0034907061498b2
+MD5 8133505c2ee66c6969d097ff0011647a files/mpatrol-1.4.8-soname.patch 1097
+RMD160 d0d767d24c51b8804691b416ac47d59bee8d4c2f files/mpatrol-1.4.8-soname.patch 1097
+SHA256 f7e63160f3df250151bb9d8de13e252394a02beb89b9c905a0034907061498b2 files/mpatrol-1.4.8-soname.patch 1097
+AUX mpatrol-textrel-fix.patch 529 RMD160 e0ef6ab28b24c2261a88e682d1f59ed0c681a328 SHA1 e6b65eb79fc334cb1f82214ed3c0000890e1e876 SHA256 23566db6fe6e035870db35e7311f42c2a367a50ec1a24b044a465fa7fe81f30b
+MD5 a87323038075cf881517cca40f82493c files/mpatrol-textrel-fix.patch 529
+RMD160 e0ef6ab28b24c2261a88e682d1f59ed0c681a328 files/mpatrol-textrel-fix.patch 529
+SHA256 23566db6fe6e035870db35e7311f42c2a367a50ec1a24b044a465fa7fe81f30b files/mpatrol-textrel-fix.patch 529
 DIST mpatrol_1.4.8.tar.gz 4413896 RMD160 5caa6a31f1a53578f28ff597e62c010d68320bc0 SHA1 26b3ef60a718f80486f10f74468cb33b5fcf75dd SHA256 2a58512cb355bf46b08e85683a2ad872bdd4cad5f7a40c87117c7f5badd9f232
 EBUILD mpatrol-1.4.8-r1.ebuild 2474 RMD160 84d3ccf9a43617e61c539e20ef9bf4b4894c104a SHA1 9338ebed4ccc022e6be9a1f463beda34c2783b4f SHA256 9d3c026616eb987daebc0dfbbb1f44414d3ea8d310f0862b62176000dbf3856a
 MD5 29f351369dfa2fc346a3765436e243d3 mpatrol-1.4.8-r1.ebuild 2474
 RMD160 84d3ccf9a43617e61c539e20ef9bf4b4894c104a mpatrol-1.4.8-r1.ebuild 2474
 SHA256 9d3c026616eb987daebc0dfbbb1f44414d3ea8d310f0862b62176000dbf3856a mpatrol-1.4.8-r1.ebuild 2474
+EBUILD mpatrol-1.4.8-r2.ebuild 2741 RMD160 c8b57b88717bbe2ff41bd79bde86b8bf5a578f90 SHA1 2a575828602f683e6eff6f9ca922d4adcdfc6323 SHA256 180eea3b6016dc4da12c215c4baf64b0ab085b2ac9ea45095ee14d772be1873b
+MD5 4812dc6c778fc428725fa936e3342185 mpatrol-1.4.8-r2.ebuild 2741
+RMD160 c8b57b88717bbe2ff41bd79bde86b8bf5a578f90 mpatrol-1.4.8-r2.ebuild 2741
+SHA256 180eea3b6016dc4da12c215c4baf64b0ab085b2ac9ea45095ee14d772be1873b mpatrol-1.4.8-r2.ebuild 2741
 EBUILD mpatrol-1.4.8.ebuild 2237 RMD160 40bf9b2a781713a17c2079501392906d63fd5124 SHA1 c1fdda03971cd2a244a30d1ac688e1b843d10df7 SHA256 3de5cbf16b62a4e6c057ec3e974c1586bc086f60a4605769852bf7bbdb571e6a
 MD5 72c796f767e52ce23cfeb61598ffd443 mpatrol-1.4.8.ebuild 2237
 RMD160 40bf9b2a781713a17c2079501392906d63fd5124 mpatrol-1.4.8.ebuild 2237
 SHA256 3de5cbf16b62a4e6c057ec3e974c1586bc086f60a4605769852bf7bbdb571e6a mpatrol-1.4.8.ebuild 2237
-MISC ChangeLog 1099 RMD160 33b6c0aef750c73d74156c8126d20085712090f8 SHA1 9d2c3ac8b5ac0f4826c7c1591c0489a148516cf7 SHA256 c22bf62e28e267cfd3ae08ee609e36b1a8cd4ae338aba3a14a44ae33de72917f
-MD5 697bcdcd398c64908b33c7afda45b227 ChangeLog 1099
-RMD160 33b6c0aef750c73d74156c8126d20085712090f8 ChangeLog 1099
-SHA256 c22bf62e28e267cfd3ae08ee609e36b1a8cd4ae338aba3a14a44ae33de72917f ChangeLog 1099
+MISC ChangeLog 1294 RMD160 ffd882b019354a26d305e9733b8422755c2e7e4e SHA1 d438d468ac545cfd441005d4001bff9be909a073 SHA256 a0c9f520279046efee7b568004f6a64d47f6bf54d38df7edd2b1e06b9a1b4038
+MD5 e5fc8968ac50b39daccc1025c61996de ChangeLog 1294
+RMD160 ffd882b019354a26d305e9733b8422755c2e7e4e ChangeLog 1294
+SHA256 a0c9f520279046efee7b568004f6a64d47f6bf54d38df7edd2b1e06b9a1b4038 ChangeLog 1294
 MD5 23d74517bb043a4ff8df2e9b94ef7838 files/digest-mpatrol-1.4.8 244
 RMD160 9ac4c791cb7e691454dd03255aada486d4fa3961 files/digest-mpatrol-1.4.8 244
 SHA256 f6aa5edb069e20adc1089036b5cf0c0dcb3388b4becb6ab06a34fc27202c8208 files/digest-mpatrol-1.4.8 244
 MD5 23d74517bb043a4ff8df2e9b94ef7838 files/digest-mpatrol-1.4.8-r1 244
 RMD160 9ac4c791cb7e691454dd03255aada486d4fa3961 files/digest-mpatrol-1.4.8-r1 244
 SHA256 f6aa5edb069e20adc1089036b5cf0c0dcb3388b4becb6ab06a34fc27202c8208 files/digest-mpatrol-1.4.8-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF6gD26J2i8a8J4okRAqyPAJ9LDXH+Otsp4cadA6bszFTK46/y0gCeOT4i
-EAZaQiPyXn7J7XMthnYBMfc=
-=avoN
------END PGP SIGNATURE-----
+MD5 23d74517bb043a4ff8df2e9b94ef7838 files/digest-mpatrol-1.4.8-r2 244
+RMD160 9ac4c791cb7e691454dd03255aada486d4fa3961 files/digest-mpatrol-1.4.8-r2 244
+SHA256 f6aa5edb069e20adc1089036b5cf0c0dcb3388b4becb6ab06a34fc27202c8208 files/digest-mpatrol-1.4.8-r2 244
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"
+}