Respect AR. Clean up patches.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 60 insertions, 40 deletions

diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog
index 5540534891d7..15a93b143d3c 100644
--- a/dev-libs/dmalloc/ChangeLog
+++ b/dev-libs/dmalloc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/dmalloc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.67 2013/02/07 21:50:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.68 2013/03/15 18:17:12 jer Exp $
+
+*dmalloc-5.5.2-r5 (15 Mar 2013)
+
+  15 Mar 2013; Jeroen Roovers <jer@gentoo.org> -dmalloc-5.5.2-r3.ebuild,
+  +dmalloc-5.5.2-r5.ebuild, files/dmalloc-5.5.2-Makefile.in.patch,
+  +files/dmalloc-5.5.2-ar.patch, files/dmalloc-5.5.2-cxx.patch,
+  files/dmalloc-5.5.2-threads.patch:
+  Respect AR. Clean up patches.
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> dmalloc-5.5.2-r3.ebuild,
   dmalloc-5.5.2-r4.ebuild:
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 69c0819d737e..04b57b994382 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX dmalloc-5.5.2-Makefile.in.patch 14022 SHA256 b4eb76731fd732da31945e9b04efe7c30e1f3bef15f19ddc9d88375fb8619b99 SHA512 fdb5fe6a618ceef3ab3cd8b57099aacb5f3ac38922b1a06f17e1225f9b6844935d26c0f7253f08ecf7513a106f9ca7c132f2be43fa11b4595acd595bd13f2dd2 WHIRLPOOL f9ffee8dd0414514ad8047adfd50381c3f4a1a6000cd8cff4ef06b14e35ad90fb250b6edc46f639758384077600a144ac995f9dcc33ec9e4babd7983e91a6e51
-AUX dmalloc-5.5.2-cxx.patch 715 SHA256 c488baec7cb90a57b0256459c7e38fd6e0cddef0682a60ae98bfedca9292897d SHA512 0898d41915c891b7b1bd3674ed47b1c887b4ac0eb1efef5474783ac4547bea8ad03b2071fd63770c1bd227debaed69a713dc8a5f353eaf47a1760cf94d297b13 WHIRLPOOL ee2dbae9212969164686d2188ade0c366508d36b444f69fd02d66ccf66bee7e68dbaf97c3ea447257628bd6674ede6d65589df491569b7f19218e7db15da1f49
-AUX dmalloc-5.5.2-threads.patch 270 SHA256 f80e3cf1293f5ebeee8d8f83e0bf5ecad606c27ddc9a2fd8908d5af649720433 SHA512 ab6ab0c6dbce43b5ad5494ceeb7633f0bf65eff8bdd9d9ce28399bffa5a72a506769b3a91156e25a68915ad12458ec8a55a1764fcc3689d7032955d8e7ee94e8 WHIRLPOOL 9c72710cd18620d789bf8f01e6641cc9cc94526ce9f2b057d0a2812371904fd514b4a3643cc469b57f025ab934917637a92bba5a1aba9ee4a2168f317f72bbe7
+AUX dmalloc-5.5.2-Makefile.in.patch 13855 SHA256 2f7c44a1f8e48b90c255a6d72748d629a30aebcdf7adfedc50f1067a65dfa7fc SHA512 6a8bc9fabafc22b390696df5573d94a71080215627a1c67e45b5b8805fb240165c0961bd9175d6f7b2e5914aecf9dd680de14f744b099a750699f1ca391d86d7 WHIRLPOOL e7f5ae37c2b55088aa1eb1affd660a55958e1fd260043f38750eca9a8045a5822b0eb3a83ead5ce554a478b885f8ac3bc1336926a6d72b34c341b9a3dcbfa63e
+AUX dmalloc-5.5.2-ar.patch 390 SHA256 151f5402ac69f688b93c921c09218f2da14e9e012092efc73addddcf69b0c3d7 SHA512 79c1a2b4a0ffa43da2e3e49bb10ce0defe58a33f881bcb356ac72c386ad870903bb12c37ddb0e3fcd30ee60d74e8ddae69eb4f5eec1d080008cba3a1a40f9626 WHIRLPOOL d97c6df359c345a33b0d01a51e3b4eade62d39a901a70f86226e9ffe663b607dbb37c79beb7ac618fcf75d6e55e1b2a1553f33e7c05d9bb0124875a56d5a5ba3
+AUX dmalloc-5.5.2-cxx.patch 546 SHA256 f9aaa8905f4961667f19dcd429993ae2712004e1bc8413cd284f5edc76c7a13a SHA512 370ff73c4af16d7b4cb5e15a88f3cafcc16494df7df50c4494b1e34ed687f1385b774431cc94a9ba75ef96f2828f75501ee2d0addc9d3e34d4f718ac94ae5f6d WHIRLPOOL c04ae4f9896554422419b27f07408378d531a135120b18376f6f69bb3798d2c88753681ce6190f30c91c8f7b875502e53ece056dcbb3b83de03472690b7ccb5d
+AUX dmalloc-5.5.2-threads.patch 165 SHA256 07db111964d4ad6ffd6d05764ebfd887023128098fa0946be61292a0070c2237 SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e WHIRLPOOL 5499a29d7b7b0cb6711418d14db843c8a085d5779041633d480bdc8694340e52c9b0377bfd588aa808dda6b13e99b4da6e461b635a4a8eb29664db24470a2d76
 DIST dmalloc-5.5.2.tgz 666608 SHA256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93 WHIRLPOOL 4427dfb595b82bf4b7a3edd6a0a61da54fd7b7abf84a238dee3cef6ab3e0b9a27a34c7219ae938155da9908762c217cca52e9ac6710543bb37ca8dcf72749a73
-EBUILD dmalloc-5.5.2-r3.ebuild 1749 SHA256 afcfbf1d2c3d7ebb3233ba19006aa0e06384f794a106f3cbfe059d7b2ee8212c SHA512 88fb87b6871bb0a7057fc2bf3393185cdd5772ae242c2aa21b4f7fff6e0b6763519c4c328f4911625abe38e1e2eaae4153fb051958dda34f57b3f88e8f34d12c WHIRLPOOL f79757481e00ac7c6b5696e4bd583bb5ec67b8d8cc0bdb77d79c3bc134a1329c1eb92abfdee44d16a73ba328e849fddd3520520f02b8941db0258699d09c973f
 EBUILD dmalloc-5.5.2-r4.ebuild 1885 SHA256 3737a93d4d719ede9aa23ee723e57691add9ad8d535b24b01046444a5c01e125 SHA512 291e1a340c1612e142a9316d0d2630876f0fd14d3f791858c6d55192e2dd6439be66b05d95848863281952ee5a5f27a58942e60f9eb36684741a9d8208134f33 WHIRLPOOL 3a2e7070b58c2f87eaf10e1b888ebe06f5bdf1b5866bc61dc061fdaf6b7ef3a7629f3bd234af25f85f6dc07dea1ca3faa213d044b6d8355c247a9523de50872f
-MISC ChangeLog 9083 SHA256 2fa3d6e12065e0ffebe19f7e1745788c8057f738e4e5e2ad21d20f6b683dd4c7 SHA512 123e3bbe67dd315f040ccecd7ca3b634cb3d6cb594f968e80e8dd83e4c83eccd7209452ef1d0242ff32c418e8e7203a2592929643a2583116196240589470f14 WHIRLPOOL 7d1b4bf1b09d2358c7c7b2fb6baa53c6011be194521833332d23a0707ac35685678328c59bf0fd4a639377da6c40b2acf4ffc407cdf867a45f2856c838df81d4
+EBUILD dmalloc-5.5.2-r5.ebuild 1988 SHA256 c844b21622dfebb39676ec8edcf6755b83fdf663e05cdf6285e517f40cab82b5 SHA512 17e3a1d3a58f77eb78fd3894af2c9c01f51ee14dc2cb4e2956342892cd0e86a8f01e8468635b5fd3f789e2369227353eba062ebf0a4e605b94d508d306e5d5ee WHIRLPOOL 0083d1a2e65d977bbd70764c8242099c4c6c73673ebcc5b886d4687cf8670e36963c096347449f69a87b854815a59dd2c303d966d7b90bd0c3f8a2de4a072cf5
+MISC ChangeLog 9390 SHA256 4a89dda68919180f1da30de24ef57e5f1a9b871dfce18d6a954761ed12ed05f4 SHA512 79e0d64c8d3d327bac6f2c9ebc3878ef9346d8881ed0cc32d9a91e09e1a56a615895951894705921e24e5bc8352b36f699f022bf2e6995cfa82c2f83107eff45 WHIRLPOOL 920413e96e888a0092172cbbff751fa87adb96c554228a1804689b28cfc4f02feddef13a2f5185950ff290f86d60ff0b9568694fea9f282e3952dd99cb7de66d
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFCKrAAoJEDxpGckxwJCBkRMP/A+G7rPkLWmEQecKBy5WBxgf
-MGHjIzGLWfR4Oc+K28INxq8ZWF9hqXJErLaQCerDByiqqYNaMKee3tBDtBRiJrjU
-ZG/GZGoP6bTRSlOxxxn5fChuuhbt3stH0lD9oe/5DIqCZnFTElx9w8kghfk2ZcAE
-13sFN1PN3x/3MYggjwcy6C1cgjcZnC1NXIh3vOK1KekAXMUPTfW56aXuMxCJr6x4
-2doyickguze1aSOTI/N/eQElB4O+8Dgh0x8h1sWv8T/YSoBaecKqrfSinPUZDkLh
-hrELhF+P9YFlL7qDuTvGSD9Afp6FS7EHrGJK43PfPoSjUcNCjLCh102An5v7wzlX
-VJdlsB5JpYJG0bVz/FRkmro0///kiQ6XuTRz4I0sP0p00DdJ0wf+lX3NAAMYGsC9
-Jid3HMTzu7J+O6PDs9DJd8KQfh1vu/APhXLowVBAPZ/jXLxK6P8TIDQj5WEL3aZT
-xL9bZkMkg0XnrS2ZCZwgL8CmIa+nlTPN1dmSVKZSbjv263+BcoBGHxECKe0AEd6e
-awXUJeZPjG348PB0U33b2R4Bkb9HYFbuTtBsGiQwgUeReFJcpKsZMLFC5Pic34ug
-KNP987nqq2mmqbG1vpB8Wpw3kzlGAd2BagTHxI0/XjXpU+e4QK2ZV/bXjxbgcdF8
-vWBfl6O6cunUUCsrqIxF
-=e6x3
+iEYEAREIAAYFAlFDZaoACgkQVWmRsqeSphOeoACfZ0kYc9cVlX1RGUsZcocC/Vrz
+v+AAn3tlIZo68MdILI3kFYTdbBui90Pj
+=3kTE
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild
index d679c1c779cc..a66b5c4d3186 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild,v 1.9 2013/02/07 21:50:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild,v 1.1 2013/03/15 18:17:12 jer Exp $
 
-EAPI="3"
-
-inherit autotools eutils multilib
+EAPI=5
+inherit autotools eutils multilib toolchain-funcs
 
 DESCRIPTION="A Debug Malloc Library"
 HOMEPAGE="http://dmalloc.com"
@@ -12,12 +11,14 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="threads"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
 RDEPEND=""
 
+DOCS=( NEWS README docs/NOTES docs/TODO )
+
 src_prepare() {
 	# - Build objects twice, once -fPIC for shared.
 	# - Use DESTDIR.
@@ -25,35 +26,38 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.in.patch
 	# - Broken test, always returns false.
 	epatch "${FILESDIR}"/${P}-cxx.patch
+	epatch "${FILESDIR}"/${P}-ar.patch
 	# - Add threads support.
 	use threads && epatch "${FILESDIR}"/${P}-threads.patch
 	# Respect CFLAGS/LDFLAGS. #337429
 	sed -i Makefile.in \
 		-e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \
+		-e 's|ar cr|$(AR) cr|g' \
 		|| die "sed Makefile.in"
 	# - Run autoconf for -cxx.patch.
 	eautoconf
 }
 
 src_configure() {
-	econf --enable-cxx --enable-shlib \
-		$(use_enable threads) || die "econf failed!"
+	tc-export AR
+	econf --enable-cxx --enable-shlib $(use_enable threads)
 }
 
 src_compile() {
-	emake || die "emake failed!"
-	cd docs && makeinfo dmalloc.texi
+	default
+
+	cd docs
+	makeinfo dmalloc.texi || die
 }
 
 src_test() {
-	emake heavy || die "emake check failed!"
+	emake heavy
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed!"
+	default
 
 	newdoc ChangeLog.1 ChangeLog
-	dodoc NEWS README docs/NOTES docs/TODO
 	insinto /usr/share/doc/${PF}
 	doins docs/dmalloc.pdf
 	dohtml RELEASE.html docs/dmalloc.html
@@ -61,7 +65,15 @@ src_install() {
 
 	# add missing symlinks, lazy
 	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*}
+
 	for lib in cxx th thcxx; do
 		dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so
+		dosym lib${PN}${lib}.so.${PV} \
+			/usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*}
 	done
+
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN}*.a || die
+	fi
 }
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch
index 70e6e11062cd..92b232eb58e9 100644
--- a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch
@@ -1,6 +1,5 @@
-diff -ur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in
---- dmalloc-5.5.2.orig/Makefile.in	2007-05-14 20:26:14.000000000 +0300
-+++ dmalloc-5.5.2/Makefile.in	2007-12-27 19:23:54.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -41,7 +41,7 @@
  
  # thread version of the library
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch
new file mode 100644
index 000000000000..56be2fa3ef4e
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -131,7 +132,7 @@
+ AC_MSG_CHECKING([shared library link args])
+ AC_COMPILE_IFELSE([ int foo(int val) { return val + 1; } ],[
+ 	# so now we try to create an archive from the compiled .o file
+-	(ar cr conftest.a conftest.o) 2>&5
++	($AR cr conftest.a conftest.o) 2>&5
+ 	# see which shared-library ld commands work
+ 	#
+ 	# Darwin/Mac OS X - Terry Teague
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch
index c4d0b22f9c0a..0fa01e105c53 100644
--- a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch
@@ -1,6 +1,5 @@
-diff -ur dmalloc-5.5.2.orig/configure.ac dmalloc-5.5.2/configure.ac
---- dmalloc-5.5.2.orig/configure.ac	2007-05-14 20:26:14.000000000 +0300
-+++ dmalloc-5.5.2/configure.ac	2007-12-27 18:13:18.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -55,11 +55,12 @@
  AC_PROG_CC
  AC_PROG_CXX
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch
index 4016be0a21c0..c3cbd90aa9f5 100644
--- a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch
@@ -1,5 +1,5 @@
---- ./dmalloc-5.5.2/settings.dist.orig	2008-09-23 09:24:56.000000000 +0200
-+++ ./dmalloc-5.5.2/settings.dist	2008-09-23 09:25:27.000000000 +0200
+--- a/settings.dist
++++ b/settings.dist
 @@ -409,7 +409,7 @@
   */