Fix openmotif dependency. Change EAPI to 1. Other minor changes.

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

6 files changed, 48 insertions, 227 deletions

diff --git a/dev-libs/mpatrol/ChangeLog b/dev-libs/mpatrol/ChangeLog
index 28338d8ce807..4bf55315ea37 100644
--- a/dev-libs/mpatrol/ChangeLog
+++ b/dev-libs/mpatrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/mpatrol
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.23 2010/10/10 17:51:32 ulm Exp $
+
+  10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> mpatrol-1.4.8.ebuild,
+  -mpatrol-1.4.8-r1.ebuild, -mpatrol-1.4.8-r2.ebuild,
+  mpatrol-1.4.8-r3.ebuild:
+  Fix openmotif dependency. Change EAPI to 1 to allow for slot dependency.
+  Assign RDEPEND explicitly; quote some vars. Remove intermediate versions.
 
 *mpatrol-1.4.8-r3 (15 Aug 2010)
 
diff --git a/dev-libs/mpatrol/Manifest b/dev-libs/mpatrol/Manifest
index 6db11f264380..6dad2402e090 100644
--- a/dev-libs/mpatrol/Manifest
+++ b/dev-libs/mpatrol/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 47b586d9b3aec727324305f4f6a179e42dd7cbd2 SHA1 e7d24affa76c535589beec6d580f4b48cd8fefb0 SHA256 c8edda55592065a4ca0fb8846a532b79435880156a8c4b2f25a414f0c4a46943
-EBUILD mpatrol-1.4.8.ebuild 2252 RMD160 c13853d4297b5afa478d9f36f98bd78894548e7f SHA1 c651eb855b4cde40039b8db16cae2c99ad48b423 SHA256 791193ae77cb97df6df1890d6e2f58ba6a5d75d5eed66051620714543f95eeb0
-MISC ChangeLog 2537 RMD160 fa8477057235bff7b8a7c3422ceab07aac4c63ea SHA1 eab4016e813826bdea22c9da5af7b49b659e408f SHA256 bd063e5ce40846b761fac371a82ddeb153780be7a8162add6f5a65da8eb8a7c1
+EBUILD mpatrol-1.4.8-r3.ebuild 2949 RMD160 cbc182b9502ed9b669a6e8f8f9d3c5d7521d0aaf SHA1 a4915abe61c13894bd4dd95307b2610eedf5a183 SHA256 716d9a1f8599b64ad724fd26c93299fc7ee17c14d61be9aab688420a22776ec7
+EBUILD mpatrol-1.4.8.ebuild 2287 RMD160 765245c495d686b83319ea1528922cd91109f2d1 SHA1 58c14826c24b68d47a87470b07d95a3410ac1a8f SHA256 5889274fe482d7c13e386e5c503d1d9b54d2b11f5b4b31a7c7077137ef89b3e1
+MISC ChangeLog 2834 RMD160 a8a4377616a3c73d3345e26795e4f6a7cb1aeb0f SHA1 be81d4890d09a15add8c4acc9e47544296060171 SHA256 d86b5184e0e32b7fdcf7008eae689b70841f4595e1a3e295d8ae6077d38d4a5b
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyx/ZgACgkQOeoy/oIi7uwJFwCg2OKtaMddE7eyFSLID5Y2SfvX
+/AsAn2SvjllMFPOPa1fLGvhFxiX9nkIn
+=uNzA
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild
deleted file mode 100644
index 7849ed270c7d..000000000000
--- a/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.5 2009/09/23 17:25:21 patrick Exp $
-
-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="!dev-lang/mercury
-	X? ( x11-libs/openmotif )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	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
-	OPT_FLAGS="$CFLAGS" 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"
-}
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
deleted file mode 100644
index 096d9ec78565..000000000000
--- a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2009 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.6 2009/09/23 17:25:21 patrick 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="!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"
-
-	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
-	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/${PF}/html/images
-	doins images/*.jpg
-}
-
-pkg_postinst() {
-	elog " Please review the documentation in /usr/share/doc/$PF"
-}
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild
index 207b253ee41c..5f4148bb03ff 100644
--- a/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild
+++ b/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild
@@ -1,34 +1,37 @@
 # 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.2 2010/08/15 23:34:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r3.ebuild,v 1.3 2010/10/10 17:51:32 ulm Exp $
 
-inherit eutils flag-o-matic
+EAPI=1
 
-IUSE="X"
+inherit eutils flag-o-matic
 
 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/"
+SRC_URI="http://www.cbmamiga.demon.co.uk/mpatrol/files/${PN}_${PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~sparc"
+IUSE="X"
+
 S="${WORKDIR}/${PN}"
 
 # To use X, mpatrol requires Motif
-DEPEND="!dev-lang/mercury
-	X? ( x11-libs/openmotif )"
+DEPEND="X? ( >=x11-libs/openmotif-2.3:0 )"
+RDEPEND="${DEPEND}
+	!dev-lang/mercury"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}/${P}-soname.patch"
 
 	#bug 272505
 	epatch "${FILESDIR}/${P}-gcc44-glibc210.patch"
 
-	cd ${S}/src
+	cd "${S}/src"
 	# [Bug 176592] textrel fix for dev-libs/mpatrol
 	epatch "${FILESDIR}/${PN}-textrel-fix.patch"
 
@@ -36,7 +39,7 @@ src_unpack() {
 		-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
+	cd "${S}/build/unix"
 	sed -i \
 		-e 's:^OFLAGS.= -O3:OFLAGS = ${OPT_FLAGS}:' Makefile \
 			|| die "sed Makefile for CFLAGS failed"
@@ -55,7 +58,7 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}/build/unix
+	cd "${S}/build/unix"
 	emake STRIPPROG=true OPT_FLAGS="${CFLAGS} -Wa,--noexecstack" LDOPTS="${LDFLAGS}" all || die "emake failed"
 }
 
@@ -65,7 +68,7 @@ src_compile() {
 # ** make an install target. --nj
 # **
 src_install () {
-	cd ${S}/build/unix
+	cd "${S}/build/unix"
 	dobin mleak mpatrol mprof mptrace || die
 	dolib.so lib*.so.* || die
 	dolib.a  lib*.a || die
@@ -76,22 +79,22 @@ src_install () {
 	#done
 
 	insinto /usr
-	cd ${S}/bin
+	cd "${S}/bin"
 	dobin * || die
 
 	insinto /usr/include/
-	cd ${S}/src
+	cd "${S}/src"
 	doins mpatrol.h mpalloc.h mpdebug.h || die
 
 	insinto /usr/include/mpatrol
-	doins ${S}/tools/*.h || die
+	doins "${S}"/tools/*.h || die
 
-	doman ${S}/man/man?/* || die
+	doman "${S}"/man/man?/* || die
 
-	cd ${S}
+	cd "${S}"
 	dodoc AUTHORS ChangeLog NEWS README THANKS VERSION pkg/lsm/*lsm || die
 
-	cd ${S}/doc
+	cd "${S}/doc"
 	dodoc *.dvi *.ps *.pdf *.txt || die
 	doinfo mpatrol.info || die
 	dohtml mpatrol.html || die
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8.ebuild
index 7cba9061d6ca..87d4f79b9ccc 100644
--- a/dev-libs/mpatrol/mpatrol-1.4.8.ebuild
+++ b/dev-libs/mpatrol/mpatrol-1.4.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.ebuild,v 1.16 2008/11/21 22:44:12 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8.ebuild,v 1.17 2010/10/10 17:51:32 ulm Exp $
+
+EAPI=1
 
 IUSE="X"
 
@@ -14,8 +16,9 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 
 # To use X, mpatrol requires Motif
-DEPEND="!dev-lang/mercury
-	X? ( x11-libs/openmotif )"
+DEPEND="X? ( >=x11-libs/openmotif-2.3:0 )"
+RDEPEND="${DEPEND}
+	!dev-lang/mercury"
 
 src_compile() {
 	cd $S/build/unix