Bump to EAPI=3, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 39 insertions, 27 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/Manifest b/app-editors/mp/Manifest
index 9a2edefe73a8..10e79efac3de 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST mp-3.3.18b.tar.gz 295661 RMD160 37b52db182035243504cd49acd4ee5dc2668e744 SHA1 5233b6481e654c8a096412ba9dacc7ae7de5900f SHA256 dabe00cbe8f0cb18a42c46242659265507b73c6862030dd63a22ed26738f9649
 DIST mp-5.1.1.tar.gz 426154 RMD160 7a50eddd997f51baeaafb79d65fc1b0137d274e1 SHA1 75fa481518be29f63ef35b152ab18acb3bd445d2 SHA256 1357a22e11cb2b1a44081cdd43c402489169b6d98aec4f736f2e7fc7be1615ee
-EBUILD mp-3.3.18b.ebuild 1552 RMD160 1e03071119584ec0dcee24941683cd93906314c0 SHA1 e7947cb29f248c5b893e2038840fe4dd5256021f SHA256 4d705dcbcfe9247b3be6bf90717ced3610089c0c7f60f066d02ab0358ff7d05a
-EBUILD mp-5.1.1.ebuild 1702 RMD160 e4604a4c5533b16aa450e2854824fa44ae5c9b6e SHA1 b510520accce8c54a6279a7875602511993a0e01 SHA256 b3b276772967a565fbc35afae6969d31c89ffd84b240d18929cb49752342045a
-MISC ChangeLog 8365 RMD160 af202d01b8a8da090c40fdc2936871c1c8a4b2b7 SHA1 299ef3eaab70037f4e78c934ef5930b656261027 SHA256 201f3c5604f5ccf346ccbb916247a8fb7429b24523bdd84b9ffa7fe76ab2f309
+EBUILD mp-3.3.18b.ebuild 1584 RMD160 184a3db5711d32963f6d784a49d6e03a7dbba41b SHA1 f9e7cff223652e55d05363583639a6a694f6f645 SHA256 7b0ca078ff62b0fdebf32d85424ccfb4a49c5804f26c327931a483075ff64ad2
+EBUILD mp-5.1.1.ebuild 1692 RMD160 9f040fced7418fe8ccffdbfae246f2882056994b SHA1 18eeac37c266b9829fdbe9a4a2b08290a1aa3c75 SHA256 45009e7024f723c9d4106056c459c6ab612116a7c334c125a9064b5a40aab78d
+MISC ChangeLog 8488 RMD160 65c3ef7e3dc1d5945212da6ae120c9ff6466f180 SHA1 aeeb0fc66e7c3528dde3d7677fea90e20fe7aa64 SHA256 8f6f8a7a8520a6fbface22b883301ce008e66cd857339476fe283ef5d7b7e9c2
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku5ZD4ACgkQOypDUo0oQOqipACdFDXz66TgV1d7kzZwwD9YQp1i
+/uAAn1YxOMxI6vCk0MiPkHZaF25RBjw4
+=X1Y7
+-----END PGP SIGNATURE-----
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() {