[gentoo-commits] repo/gentoo:master commit in: profiles/, app-editors/mp/files/, app-editors/mp/

[Michał Górny]

commit:     87d05b9a88400fabe94f3c59d519ad0c81ae7846
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 08:02:00 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 08:02:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d05b9a

app-editors/mp: Remove last-rited pkg, #600768

 app-editors/mp/Manifest                  |   1 -
 app-editors/mp/files/mp-5.2.1-prll.patch |  46 --------------
 app-editors/mp/files/mp-5.2.2-gtk+.patch |  40 ------------
 app-editors/mp/metadata.xml              |   5 --
 app-editors/mp/mp-5.2.2.ebuild           | 101 -------------------------------
 profiles/package.mask                    |   4 --
 6 files changed, 197 deletions(-)

diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
deleted file mode 100644
index 08b737b1524..00000000000
--- a/app-editors/mp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mp-5.2.2.tar.gz 583918 SHA256 f4c04315e6a0a3b831f218f73904afd3c227aa18b67ab21b39dffbb54edfea1f SHA512 44c9b7ded38c294ffc90240ac73848a799294584f20bb981d95f8dde4f281ea9242b6ff8aefdb490e9e02effaab6cbc5bdf94ea489af838a89038113c43da131 WHIRLPOOL 0feba9d14b0f0a5addf153e0ce4d4186b90392c78d2154200cea665880861cef07fdcbfc7d841ef736a3852d8523290d2f5fdbad87f1ab20894e2a32e9df78d7

diff --git a/app-editors/mp/files/mp-5.2.1-prll.patch b/app-editors/mp/files/mp-5.2.1-prll.patch
deleted file mode 100644
index a0fef7fd63a..00000000000
--- a/app-editors/mp/files/mp-5.2.1-prll.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- mp-5.2.1/makefile.in
-+++ mp-5.2.1/makefile.in
-@@ -4,7 +4,7 @@ all: $(APPNAME) docs build-mo
- 
- PROJ=mp
- 
--ADD_DOCS=AUTHORS README COPYING RELEASE_NOTES \
-+ADD_DOCS=AUTHORS README RELEASE_NOTES \
- 	mp_templates.sample doc/mp_function_reference.html
- GRUTATXT_DOCS=doc/mp_index.html doc/mp_cookbook.html doc/mp_internals.html \
- 	doc/mp_configuration.html doc/mp_data_model.html \
-@@ -26,10 +26,10 @@ version:
- 	$(CC) $(CFLAGS) -I. `cat config.cflags` -c $<
- 
- $(MPDM)/libmpdm.a:
--	( cd $(MPDM); $(MAKE) )
-+	$(MAKE) -C $(MPDM)
- 
- $(MPSL)/libmpsl.a: $(MPDM)/libmpdm.a
--	( cd $(MPSL); $(MAKE) )
-+	$(MAKE) -C $(MPSL)
- 
- dep:
- 	gcc -MM *.c `cat config.cflags` > makefile.depend
-@@ -88,8 +88,8 @@ $(APPNAME).1: doc/mp_man.txt
- 	grutatxt -m man -t "Minimum Profit" < doc/mp_man.txt > $(APPNAME).1
- 
- docs: $(DOCS)
--	(cd $(MPDM); $(MAKE) docs)
--	(cd $(MPSL); $(MAKE) docs)
-+	$(MAKE) -C $(MPDM) docs
-+	$(MAKE) -C $(MPSL) docs
- 
- distcopy: distclean docs
- 	mkdir -p $(DIST_TARGET) ; \
-@@ -134,8 +134,8 @@ install: $(INSTALL_MSG) installdoc install-mo
- 
- installdoc:
- 	./mkinstalldirs $(PREFIX)/share/doc/$(APPNAME)
--	( cd $(MPDM); $(MAKE) installdoc )
--	( cd $(MPSL); $(MAKE) installdoc )
-+	$(MAKE) -C $(MPDM) installdoc
-+	$(MAKE) -C $(MPSL) installdoc
- 	install -m 644 doc/* $(PREFIX)/share/doc/$(APPNAME)
- 	install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/$(APPNAME)
- 	[ -f doc/mp_index.html ] && install -m 644 doc/mp_index.html $(PREFIX)/share/doc/$(APPNAME)/index.html || true

diff --git a/app-editors/mp/files/mp-5.2.2-gtk+.patch b/app-editors/mp/files/mp-5.2.2-gtk+.patch
deleted file mode 100644
index fc203e28a72..00000000000
--- a/app-editors/mp/files/mp-5.2.2-gtk+.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- 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/metadata.xml b/app-editors/mp/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/app-editors/mp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-editors/mp/mp-5.2.2.ebuild b/app-editors/mp/mp-5.2.2.ebuild
deleted file mode 100644
index 39a1f85b0c9..00000000000
--- a/app-editors/mp/mp-5.2.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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 ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk iconv kde ncurses nls pcre qt4"
-
-MP_LINGUAS="de es it nl ru sv"
-for mp_lingua in ${MP_LINGUAS}; do
-	IUSE+=" linguas_${mp_lingua}"
-done
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses )
-	gtk? (
-		|| ( x11-libs/gtk+:3 x11-libs/gtk+:2 )
-		>=x11-libs/pango-1.8.0
-		dev-libs/atk
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/cairo
-	)
-	!gtk? ( sys-libs/ncurses )
-	app-text/grutatxt
-	iconv? ( virtual/libiconv )
-	nls? ( sys-devel/gettext )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="
-	${RDEPEND}
-	app-text/grutatxt
-	virtual/pkgconfig
-	dev-lang/perl
-"
-
-src_prepare() {
-	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() {
-	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 AR 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() {
-	emake CPP="$(tc-getCXX)" CCLINK="$(tc-getCXX)"
-}
-
-src_install() {
-	dodir /usr/bin
-	sh config.sh --prefix="${EPREFIX}/usr"
-	emake DESTDIR="${D}" install
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 24c537f4ad6..5482fd372ac 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -334,10 +334,6 @@ dev-libs/libRocket
 games-fps/warsow
 
 # Pacho Ramos <pacho@g.o> (14 Jul 2017)
-# Fails to build, no reverse deps (#600768). Removal in a month.
-app-editors/mp
-
-# Pacho Ramos <pacho@g.o> (14 Jul 2017)
 # Dead for ages, relies on dead libs (#622010), you can move to moserial, cutecom or
 # minicom. Removal in 2 months.
 net-dialup/gtkterm