Bump to EAPI=3, add prefix keywords

(Portage version: -svn/cvs/Linux i686)

3 files changed, 26 insertions, 24 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index c2c802f9a8b8..9b43e6a3de66 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/mp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.68 2009/09/23 15:23:22 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.69 2010/04/05 04:16:56 abcd Exp $
+
+  05 Apr 2010; Jonathan Callen <abcd@gentoo.org> mp-3.3.18b.ebuild,
+  mp-5.1.1.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> mp-3.3.18b.ebuild,
   mp-5.1.1.ebuild:
diff --git a/app-editors/mp/mp-3.3.18b.ebuild b/app-editors/mp/mp-3.3.18b.ebuild
index a86c5b95f9f8..714ee67d1ce9 100644
--- a/app-editors/mp/mp-3.3.18b.ebuild
+++ b/app-editors/mp/mp-3.3.18b.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.3.18b.ebuild,v 1.8 2009/09/23 15:23:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.3.18b.ebuild,v 1.9 2010/04/05 04:16:56 abcd Exp $
+
+EAPI="3"
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +12,7 @@ SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="gtk ncurses nls pcre"
 
 RDEPEND="!dev-util/rej
@@ -23,8 +25,8 @@ RDEPEND="!dev-util/rej
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
-	local myconf="--prefix=/usr --without-win32 --without-gtk1"
+src_configure() {
+	local myconf="--prefix=${EPREFIX}/usr --without-win32 --without-gtk1"
 	tc-export CC
 
 	if use gtk ; then
@@ -40,14 +42,12 @@ src_compile() {
 
 	echo ${CFLAGS} >> config.cflags
 	echo ${LDFLAGS} >> config.ldflags
-
-	emake || die "Compile Failed"
 }
 
 src_install() {
 	dobin mp || die "Install Failed"
 
-	use gtk && dosym mp ${DESTTREE}/bin/gmp
+	use gtk && dosym mp /usr/bin/gmp
 
 	dodoc AUTHORS README Changelog mprc.sample
 	doman mp.1
diff --git a/app-editors/mp/mp-5.1.1.ebuild b/app-editors/mp/mp-5.1.1.ebuild
index 750786c75c74..6b3b532ef667 100644
--- a/app-editors/mp/mp-5.1.1.ebuild
+++ b/app-editors/mp/mp-5.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.2 2009/09/23 15:23:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.3 2010/04/05 04:16:56 abcd Exp $
+
+EAPI="3"
 
 inherit eutils
 
@@ -10,7 +12,7 @@ SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="gtk ncurses nls pcre iconv"
 
 RDEPEND="ncurses? ( sys-libs/ncurses )
@@ -25,8 +27,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/perl"
 
-src_compile() {
-	local myconf="--prefix=/usr --without-win32"
+src_configure() {
+	local myconf="--prefix=${EPREFIX}/usr --without-win32"
 
 	if use gtk; then
 		! use ncurses && myconf="${myconf} --without-curses"
@@ -36,11 +38,8 @@ src_compile() {
 
 	use nls || myconfig="${myconf} --without-gettext"
 
-	if use pcre; then
-		myconf="${myconf} --with-pcre"
-	else
-		myconf="${myconf} --without-pcre --with-included-regex"
-	fi
+	myconf="${myconf} $(use_with pcre)"
+	use pcre || myconf="${myconf} --with-included-regex"
 
 	use iconv || myconf="${myconf} --without-iconv"
 
@@ -48,14 +47,13 @@ src_compile() {
 
 	echo ${CFLAGS} >> config.cflags
 	echo ${LDFLAGS} >> config.ldflags
-	emake || die "Compile Failed"
 }
 
 src_install() {
-	mkdir -p "${D}/${DESTTREE}/bin"
-	sh config.sh --prefix="${DESTTREE}"
+	dodir /usr/bin
+	sh config.sh --prefix="${EPREFIX}/usr"
 	make DESTDIR="${D}" install || die "Install Failed"
-	use gtk && dosym mp-5 ${DESTTREE}/bin/gmp
+	use gtk && dosym mp-5 /usr/bin/gmp
 }
 
 pkg_postinst() {