Version bump. Drop "correct" patch, add to config.{c,ld}flags /after/ config.sh has run.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

3 files changed, 98 insertions, 15 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index 2533975485ec..a98a7dab06c5 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/mp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.78 2011/03/27 10:20:03 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.79 2011/06/16 18:28:14 jer Exp $
+
+*mp-5.2.0 (16 Jun 2011)
+
+  16 Jun 2011; Jeroen Roovers <jer@gentoo.org> +mp-5.2.0.ebuild:
+  Version bump. Drop "correct" patch, add to config.{c,ld}flags /after/
+  config.sh has run.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> mp-3.3.18b.ebuild,
   mp-5.1.1.ebuild, mp-5.1.3.ebuild:
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index 6b50f1e34592..59d97a009015 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -7,25 +7,17 @@ AUX mp-5.1.3-asneeded.patch 6953 RMD160 6935d9a0e82b9b12195fc6a30071fd149edf26c9
 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
 DIST mp-5.1.3.tar.gz 486068 RMD160 f78bfa5986ce3c0e7d5070783ee60a2d03ddea88 SHA1 f05b760b09126fe624703b5d9d4c280803a0c313 SHA256 b9c2773408638eeddfa0eef912cc289b0b92df34ce621dc46eca47a2dc518986
+DIST mp-5.2.0.tar.gz 510970 RMD160 ddc2b42382b36c5c74db364d094fcb19ea551cf6 SHA1 7f03be23129866afb7e1fa77ac23d11c0db304c5 SHA256 69cdc69969f70881c6eb1329d2f55a7a6ec63352c65f1a0a60a8bf24006c3ae6
 EBUILD mp-3.3.18b.ebuild 1576 RMD160 b76cc44938e581ecfd38d446452f3a75edeae962 SHA1 999b3f13970927b9be14a12b36ae645d00334aad SHA256 578f68d400e9e5ed5383b08e80944f125b476128252bce9ceb6ea589c0a82bd5
 EBUILD mp-5.1.1.ebuild 1893 RMD160 d72459c01b095c7ca0a9f5aafdc7fd03705f357b SHA1 32b36dbb39a0de4fcc22e9c9a8db5e6cbcd795c3 SHA256 bbabc728d46e9dd303e08771f939fd1d564d950a28c6cb776dae2bf95d31249f
 EBUILD mp-5.1.3.ebuild 2073 RMD160 be38fe5656ba934ad3da1fd54898e9c59f0af119 SHA1 eb973b1a94ef4dfc994f15c220a99bc7359a5204 SHA256 8093d5f590c2119ac7d9975c6f202c8ff7ae654350396ea08ea633a831c0378c
-MISC ChangeLog 9661 RMD160 0af78ee60276c2c1e13346b3756043120ea8b23b SHA1 51c1dd2f1181a6e0fd917263129ad9be61b2a95c SHA256 5fc405ec85e9b1250bbed0e451690cc735de69177963c6baea6099264dbca77d
+EBUILD mp-5.2.0.ebuild 2064 RMD160 d89d2c532e9ea6552784f16d6c5eebf5669d4031 SHA1 a47069aa5ddddfad0ee0a1999d6346377b443669 SHA256 f7d40c637423ef0da6a58558f93b46c51c38c31b5af4f2164e797099f1f12f9c
+MISC ChangeLog 9840 RMD160 9f78b5490497b99c9cd580857dc71f947071b28a SHA1 60e4f66b022f9e9915b11eb918fa3cabc61eb972 SHA256 9b8823adaa599a43ef1adc749d86311d36881f4c5966787617466a2a85d5491f
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjw9aAAoJEO/kOhxWD91k6+kP+gOOZA+yt39WxAThsibH1MRx
-79VYAtQr3h4F+dXy5UIyVEi6q13TKivpiip0LoW9JNMP8LS/MFHFJRu/kagvxXiB
-xYQRtvgDDn8UEdkNBtPz+6o8Zd+kpum5uPd8R4OKbMkH4zvbiG/yFJHSfnE65xpN
-IXxGO0HhJ/YOXvUa7mFBH+pjcQhngJzmEyJrmnKHWiIBa1C9mpsc2DpmD9ER9ILw
-H32zmll0n3bPHkorEHcxGkkCFrvTuVUmtTpply6RmnP3ocY5Dojd51bmY7FxUE+/
-ZpK6SPuOah5/fZ6dMwVYcPBKbQcHsziC3zGKuWfuZ9VZxlrBxBR4r4BW1FGuKXwv
-z99GlkAKqHWZIRRFmYFlKlocXLLp6sg8X0+Cd1ogTSRep6hc2Ez8odtopZ5eRKrk
-jm/WDyYDFXEIV9dqHMHzgrLUEaFud1fFiMZD6Sy9ukmY6JbA10e5D9V6uyFf1zHb
-5jeTOcc2esYfhv1PkQCArBWRHZyLFCNIGiuhV5craDouniySZNVdVY4FO+d1OGSb
-mZ4sP62PsCNbA6Rv4y/skwVKu9WCDe1mO0eZiaCVMT2BzwIOOWA1xmzcFM1kFgCT
-PKibCtaAqYViGjrofTPfTuu6jCX+ZRYqVy1TgQmP7PnBNmV37U+aXYByKtmo5t3y
-9MKcTQ7fGudKgyytEO5t
-=sLMo
+iEYEARECAAYFAk36S0QACgkQVWmRsqeSphNT3gCffx/yGiphrMQsoAlq9SBnDNOw
+L08An1AZmXIneJguJrvnFLU5zsGZiEaJ
+=PlpK
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mp/mp-5.2.0.ebuild b/app-editors/mp/mp-5.2.0.ebuild
new file mode 100644
index 000000000000..e940740008b7
--- /dev/null
+++ b/app-editors/mp/mp-5.2.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.0.ebuild,v 1.1 2011/06/16 18:28:14 jer Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Minimum Profit: A text editor for programmers"
+HOMEPAGE="http://www.triptico.com/software/mp.html"
+SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="gtk iconv kde ncurses nls pcre qt4"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses )
+	gtk? ( x11-libs/gtk+:2 >=x11-libs/pango-1.8.0 )
+	!gtk? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )
+	iconv? ( virtual/libiconv )
+	app-text/grutatxt"
+DEPEND="${RDEPEND}
+	app-text/grutatxt
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.1.1-prll.patch
+}
+
+src_configure() {
+	local myconf="--prefix=${EPREFIX}/usr --without-win32"
+
+	if use gtk; then
+		! use ncurses && myconf="${myconf} --without-curses"
+	else
+		myconf="${myconf} --without-gtk2"
+	fi
+
+	use iconv || myconf="${myconf} --without-iconv"
+
+	use kde || myconf="${myconf} --without-kde4"
+
+	use nls || myconfig="${myconf} --without-gettext"
+
+	myconf="${myconf} $(use_with pcre)"
+	use pcre || myconf="${myconf} --with-included-regex"
+
+	use qt4 || myconf="${myconf} --without-qt4"
+
+	tc-export CC
+	sh config.sh ${myconf} || die "Configure failed"
+
+	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
+		echo ${CFLAGS} >> $i/config.cflags
+		echo ${CFLAGS} >> $i/config.ldflags
+		echo ${LDFLAGS} >> $i/config.ldflags
+	done
+}
+
+src_compile() {
+	# bug #326987
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	sh config.sh --prefix="${EPREFIX}/usr"
+	emake -j1 DESTDIR="${D}" install || die "Install Failed"
+#	use gtk && dosym mp-5 /usr/bin/gmp
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		einfo
+		einfo "mp-5 is symlinked to gmp! Use"
+		einfo "$ DISPLAY=\"\" mp-5"
+		einfo "to use text mode!"
+		einfo
+	fi
+}