app-editors/mp: Add fix for deprecation in gtk+, #426192; fix handling of empty linuguas_** request; remove deprecated code; move to EAPI=4

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 60 insertions, 29 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index 1f1ce0d84bc8..4084aa3788d1 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/mp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.90 2012/07/08 15:09:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.91 2012/07/20 08:24:58 jlec Exp $
+
+  20 Jul 2012; Justin Lecher <jlec@gentoo.org> mp-5.2.1.ebuild,
+  mp-5.2.2.ebuild, +files/mp-5.2.2-gtk+.patch:
+  Add fix for deprecation in gtk+, #426192; fix handling of empty linuguas_**
+  request; remove deprecated code; move to EAPI=4
 
   08 Jul 2012; Jeroen Roovers <jer@gentoo.org> -mp-3.3.18b.ebuild:
   Old.
diff --git a/app-editors/mp/files/mp-5.2.2-gtk+.patch b/app-editors/mp/files/mp-5.2.2-gtk+.patch
new file mode 100644
index 000000000000..fc203e28a725
--- /dev/null
+++ b/app-editors/mp/files/mp-5.2.2-gtk+.patch
@@ -0,0 +1,40 @@
+ mpv_gtk.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mpv_gtk.c b/mpv_gtk.c
+index 3abba24..ea99144 100644
+--- a/mpv_gtk.c
++++ b/mpv_gtk.c
+@@ -2499,12 +2499,12 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+ #endif
+     gtk_notebook_set_scrollable(GTK_NOTEBOOK(file_tabs), 1);
+ 
+-    vbox = gtk_vbox_new(FALSE, 2);
++    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+     gtk_container_add(GTK_CONTAINER(window), vbox);
+ 
+     build_menu();
+ 
+-    hbox = gtk_hbox_new(FALSE, 0);
++    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+     gtk_box_pack_start(GTK_BOX(hbox), menu_bar, FALSE, FALSE, 0);
+     gtk_box_pack_start(GTK_BOX(hbox), file_tabs, TRUE, TRUE, 0);
+@@ -2512,7 +2512,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+     gtk_notebook_popup_enable(GTK_NOTEBOOK(file_tabs));
+ 
+     /* horizontal box holding the text and the scrollbar */
+-    hbox = gtk_hbox_new(FALSE, 2);
++    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+ 
+     /* the Minimum Profit area */
+@@ -2578,7 +2578,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+                      G_CALLBACK(switch_page), NULL);
+ 
+     /* the scrollbar */
+-    scrollbar = gtk_vscrollbar_new(NULL);
++    scrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL);
+     gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0);
+ 
+     g_signal_connect(G_OBJECT
diff --git a/app-editors/mp/mp-5.2.1.ebuild b/app-editors/mp/mp-5.2.1.ebuild
index f96501cb536f..101a49bbb51b 100644
--- a/app-editors/mp/mp-5.2.1.ebuild
+++ b/app-editors/mp/mp-5.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.1.ebuild,v 1.7 2012/07/08 15:03:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.1.ebuild,v 1.8 2012/07/20 08:24:58 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
@@ -65,16 +65,5 @@ src_configure() {
 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
+	emake DESTDIR="${D}" install
 }
diff --git a/app-editors/mp/mp-5.2.2.ebuild b/app-editors/mp/mp-5.2.2.ebuild
index 6ac9b0f9ec35..5fb72f2bc28f 100644
--- a/app-editors/mp/mp-5.2.2.ebuild
+++ b/app-editors/mp/mp-5.2.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.2 2012/05/03 18:33:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.3 2012/07/20 08:24:58 jlec Exp $
 
 EAPI=4
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Minimum Profit: A text editor for programmers"
@@ -44,13 +45,20 @@ DEPEND="
 "
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.2.1-prll.patch
+	epatch \
+		"${FILESDIR}"/${P}-gtk+.patch \
+		"${FILESDIR}"/${PN}-5.2.1-prll.patch
 	local mp_lingua
 	for mp_lingua in ${MP_LINGUAS}; do
 		if ! use linguas_${mp_lingua}; then
 			rm po/${mp_lingua/linguas_/}.[mp]o || die
 		fi
 	done
+	[[ $(ls po 2> /dev/null) ]] || \
+		sed \
+			-e '/^all/s:$(BUILDMO)::g' \
+			-e '/^install/s:$(INSTALLMO)::g' \
+			-i makefile.in || die
 }
 
 src_configure() {
@@ -86,16 +94,5 @@ src_configure() {
 src_install() {
 	dodir /usr/bin
 	sh config.sh --prefix="${EPREFIX}/usr"
-	emake -j1 DESTDIR="${D}" install
-#	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
+	emake DESTDIR="${D}" install
 }