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

(Portage version: 2.1.9.14/cvs/Linux x86_64)

1 files changed, 21 insertions, 18 deletions

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