Old.

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

7 files changed, 10 insertions, 695 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index 5fcf055990d6..0d4efa1cd503 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.82 2012/04/25 20:12:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.83 2012/04/25 20:19:01 jer Exp $
+
+  25 Apr 2012; Jeroen Roovers <jer@gentoo.org> -mp-5.1.1.ebuild,
+  -files/mp-5.1.1-asneeded.patch, -files/mp-5.1.1-prll.patch, -mp-5.1.3.ebuild,
+  -files/mp-5.1.3-asneeded.patch:
+  Old.
 
 *mp-5.2.2 (25 Apr 2012)
 
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index 41c1d01ab51c..375b61b499e0 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mp-5.1.1-asneeded.patch 7946 RMD160 41cbf06311efdfed99aec9dd6b94bd5fbe89eb85 SHA1 5ae8e4a4b28eb6f09adb4b199d6597db1aeb15a2 SHA256 7c045cf8ae121b819e0866c60dad304f5fed12eb28905b056aa5012fb1dc5140
-AUX mp-5.1.1-prll.patch 1510 RMD160 8f8763c104ca667b12819caf703e313a9c47c71d SHA1 597a59b89f67737e63ac686422390ab042f3b75b SHA256 59654faa1fa385321635b6b82113e4286e3f7f084127ed9323311f268b6e87f0
-AUX mp-5.1.3-asneeded.patch 6953 RMD160 6935d9a0e82b9b12195fc6a30071fd149edf26c9 SHA1 b4299b9e0a0bae33761fd53113e5878b647b3bd8 SHA256 fccb6533b7c23b5691063f245398ad50982a587f09f0c916908fda5baa865c6f
 AUX mp-5.2.1-prll.patch 1473 RMD160 9052040517e576b1ab40aabe3f620a191820c36c SHA1 e6c447a7e22f130fb9510a6f90ad6a9d176a025b SHA256 d00c60a9722a4ad9ee08129f21bc20a4ff960fed1f175eb64fa60de86c0e7a47
 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.1.tar.gz 566513 RMD160 933124bd4fd7d23ad899c10ea93e57732f003d87 SHA1 9139b714225938c319fba7d051faf80b696d9204 SHA256 e91ff7b94427a5c49815f091c67c20f47f63fd473318dbd9dce52a68a6a6f9d4
 DIST mp-5.2.2.tar.gz 583918 RMD160 e5ffab5cd2180805c0da75e6004352c154236dfa SHA1 1027adb27a11179c95e9fb7a4ab0d64e228ad792 SHA256 f4c04315e6a0a3b831f218f73904afd3c227aa18b67ab21b39dffbb54edfea1f
 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
 EBUILD mp-5.2.1.ebuild 1997 RMD160 de2b68302dd32ea744afc54adf36f5df4cffb220 SHA1 f5ad20779459db8d9033bb242af92ba9704cac3a SHA256 ef3e80a28865b56223a2d3b7bc443ea87f217a98c687a8938f11fb747172c70d
 EBUILD mp-5.2.2.ebuild 2346 RMD160 37a400b010f926b0664f8161dfa16edf2a7e6399 SHA1 f7fac98578e7907d67d0db454afd5d15b2096357 SHA256 f218bdf0f62c76404fcb302d70e9294e1b0f787f1ac1b105d926a9dbf9897872
-MISC ChangeLog 10372 RMD160 9186d7df8bce0c00027868f781dcd95e1238b103 SHA1 74b025a711901571c7ff07796cc21f89a0b3ac29 SHA256 59322f68f577f6970d34b7935ea29705683a302284712f61876c1b2e8b28e52d
+MISC ChangeLog 10559 RMD160 12eb171c77131f533ff70742718aa9472827e15b SHA1 df29b4802d36af34fdd8f1c0f8765af631f7bdb4 SHA256 d138dbc23a94d739432ed46df1117ba8c91fc9abd6e4e0022c66d49f13aa7064
 MISC metadata.xml 292 RMD160 354d84d97415a69afafccaae6cd627760a95475f SHA1 6266efbae4646d6658dacb480b8f3a78e5c4735f SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+YWrIACgkQVWmRsqeSphO4MQCfWo5g+LEcGdjL19V7y5MnK6MC
-DAcAn2Lie1qJVeBz3LM8dFVM9C6bXaSW
-=NA+w
+iEYEARECAAYFAk+YXDoACgkQVWmRsqeSphN8vgCfdIWuOSn8B+HmNeHUsfpVIfYb
+b6sAn3ESdOm7LEMe/bKKyfe80IEAH3Xv
+=/Tgt
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mp/files/mp-5.1.1-asneeded.patch b/app-editors/mp/files/mp-5.1.1-asneeded.patch
deleted file mode 100644
index 6135ddd0bbbf..000000000000
--- a/app-editors/mp/files/mp-5.1.1-asneeded.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-Index: mp-5.1.1/config.sh
-===================================================================
---- mp-5.1.1.orig/config.sh
-+++ mp-5.1.1/config.sh
-@@ -75,7 +75,7 @@ echo "Configuring..."
- 
- echo "/* automatically created by config.sh - do not modify */" > config.h
- echo "# automatically created by config.sh - do not modify" > makefile.opts
--> config.ldflags
-+> config.libs
- > config.cflags
- > .config.log
- 
-@@ -129,7 +129,7 @@ done
- 
- if [ "$MPDM" != "NOTFOUND" ] ; then
- 	echo "-I$MPDM" >> config.cflags
--	echo "-L$MPDM -lmpdm" >> config.ldflags
-+	echo "-L$MPDM -lmpdm" >> config.libs
- 	echo "OK ($MPDM)"
- else
- 	echo "No"
-@@ -141,7 +141,7 @@ if [ ! -f $MPDM/Makefile ] ; then
- 	( echo ; cd $MPDM ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
- fi
- 
--cat $MPDM/config.ldflags >> config.ldflags
-+cat $MPDM/config.libs >> config.libs
- echo "MPDM=$MPDM" >> makefile.opts
- 
- # MPSL
-@@ -155,7 +155,7 @@ done
- 
- if [ "$MPSL" != "NOTFOUND" ] ; then
- 	echo "-I$MPSL" >> config.cflags
--	echo "-L$MPSL -lmpsl" >> config.ldflags
-+	echo "-L$MPSL -lmpsl" >> config.libs
- 	echo "OK ($MPSL)"
- else
- 	echo "No"
-@@ -167,7 +167,7 @@ if [ ! -f $MPSL/Makefile ] ; then
- 	( echo ; cd $MPSL ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
- fi
- 
--cat $MPSL/config.ldflags >> config.ldflags
-+cat $MPSL/config.libs >> config.libs
- echo "MPSL=$MPSL" >> makefile.opts
- 
- # Win32
-@@ -179,7 +179,7 @@ else
- 	grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null
- 
- 	if [ $? = 0 ] ; then
--		echo "-mwindows -lcomctl32" >> config.ldflags
-+		echo "-mwindows -lcomctl32" >> config.libs
- 		echo "#define CONFOPT_WIN32 1" >> config.h
- 		echo "OK"
- 		DRIVERS="win32 $DRIVERS"
-@@ -210,7 +210,7 @@ else
- 	if [ $? = 0 ] ; then
- 		echo "#define CONFOPT_CURSES 1" >> config.h
- 		echo $TMP_CFLAGS >> config.cflags
--		echo $TMP_LDFLAGS >> config.ldflags
-+		echo $TMP_LDFLAGS >> config.libs
- 		echo "OK (ncursesw)"
- 		DRIVERS="ncursesw $DRIVERS"
- 		DRV_OBJS="mpv_curses.o $DRV_OBJS"
-@@ -263,7 +263,7 @@ else
- 		TMP_CFLAGS="$TMP_CFLAGS -I`kde4-config --install include`KDE"
- 
- 		TMP_LDFLAGS=$(pkg-config --libs QtCore)
--		TMP_LDFLAGS="$TMP_LDFLAGS -L`kde4-config --install lib` -lkfile -lkdeui -lkdecore"
-+		TMP_LDFLAGS="$TMP_LDFLAGS -L`kde4-config --install lib` -lkfile -lkdeui -lkdecore -lkio"
- 
- 		echo "#include <KApplication>" > .tmp.cpp
- 		echo "int main(void) { new KApplication() ; return 0; } " >> .tmp.cpp
-@@ -273,7 +273,7 @@ else
- 
- 		if [ $? = 0 ] ; then
- 			echo $TMP_CFLAGS >> config.cflags
--			echo $TMP_LDFLAGS >> config.ldflags
-+			echo $TMP_LDFLAGS >> config.libs
- 
- 			echo "#define CONFOPT_KDE4 1" >> config.h
- 			echo "OK"
-@@ -311,7 +311,7 @@ else
- 	if [ $? = 0 ] ; then
- 		echo "#define CONFOPT_GTK 2" >> config.h
- 		echo "$TMP_CFLAGS " >> config.cflags
--		echo "$TMP_LDFLAGS " >> config.ldflags
-+		echo "$TMP_LDFLAGS " >> config.libs
- 		echo "OK (2.0)"
- 		DRIVERS="gtk $DRIVERS"
- 		DRV_OBJS="mpv_gtk.o $DRV_OBJS"
-Index: mp-5.1.1/makefile.in
-===================================================================
---- mp-5.1.1.orig/makefile.in
-+++ mp-5.1.1/makefile.in
-@@ -35,7 +35,7 @@ dep:
- 	gcc -MM *.c `cat config.cflags` > makefile.depend
- 
- $(APPNAME): $(OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
--	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` -o $@
-+	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` `cat config.libs` -o $@
- 
- mpv_kde4.o: mpv_kde4.cpp mpv_kde4.moc
- 	$(CPP) $(CFLAGS) -I. `cat config.cflags` -c $<
-@@ -47,7 +47,7 @@ mp_res.o: mp_res.rc
- 	$(WINDRES) mp_res.rc mp_res.o
- 
- wmp.exe: $(OBJS) mp_res.o $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
--	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` -o $@
-+	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` `cat config.libs` -o $@
- 
- clean:
- 	rm -f $(APPNAME) $(LIB) $(OBJS) *.o *.moc tags *.tar.gz *.exe *.zip .installer.c *.1
-@@ -55,7 +55,7 @@ clean:
- 	(cd $(MPSL) ; make clean)
- 
- distclean: clean
--	rm -f config.h config.cflags config.ldflags \
-+	rm -f config.h config.cflags config.ldflags config.libs \
- 		makefile.opts Makefile po/minimum-profit.pot
- 
- docsclean:
-Index: mp-5.1.1/mpdm/config.sh
-===================================================================
---- mp-5.1.1.orig/mpdm/config.sh
-+++ mp-5.1.1/mpdm/config.sh
-@@ -70,7 +70,7 @@ echo "Configuring MPDM..."
- 
- echo "/* automatically created by config.sh - do not modify */" > config.h
- echo "# automatically created by config.sh - do not modify" > makefile.opts
--> config.ldflags
-+> config.libs
- > config.cflags
- > .config.log
- 
-@@ -169,7 +169,7 @@ if [ "$WITH_PCRE" = 1 ] ; then
- 		echo "OK (using pcre library)"
- 		echo "#define CONFOPT_PCRE 1" >> config.h
- 		echo "$TMP_CFLAGS " >> config.cflags
--		echo "$TMP_LDFLAGS " >> config.ldflags
-+		echo "$TMP_LDFLAGS " >> config.libs
- 		REGEX_YET=1
- 	fi
- fi
-@@ -316,7 +316,7 @@ else
- 		if [ $? = 0 ] ; then
- 			echo "OK (libintl needed)"
- 			echo "#define CONFOPT_GETTEXT 1" >> config.h
--			echo "$TMP_LDFLAGS" >> config.ldflags
-+			echo "$TMP_LDFLAGS" >> config.libs
- 		else
- 			echo "No"
- 		fi
-@@ -349,7 +349,7 @@ else
- 		if [ $? = 0 ] ; then
- 			echo "OK (libiconv needed)"
- 			echo "#define CONFOPT_ICONV 1" >> config.h
--			echo "$TMP_LDFLAGS" >> config.ldflags
-+			echo "$TMP_LDFLAGS" >> config.libs
- 		else
- 			echo "No"
- 		fi
-Index: mp-5.1.1/mpdm/makefile.in
-===================================================================
---- mp-5.1.1.orig/mpdm/makefile.in
-+++ mp-5.1.1/mpdm/makefile.in
-@@ -32,7 +32,7 @@ $(LIB): $(OBJS)
- 	$(AR) rv $(LIB) $(OBJS)
- 
- stress: stress.c $(LIB)
--	$(CC) $(CFLAGS) `cat config.ldflags` stress.c -L. -lmpdm -o $@
-+	$(CC) $(CFLAGS) `cat config.ldflags` `cat config.libs` stress.c -L. -lmpdm -o $@
- 
- .SUFFIXES: .txt .html
- 
-@@ -54,7 +54,7 @@ clean:
- 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
- 
- distclean: clean
--	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
-+	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
- 
- realclean: distclean docsclean
- 
-Index: mp-5.1.1/mpsl/config.sh
-===================================================================
---- mp-5.1.1.orig/mpsl/config.sh
-+++ mp-5.1.1/mpsl/config.sh
-@@ -69,7 +69,7 @@ echo "Configuring MPSL..."
- 
- echo "/* automatically created by config.sh - do not modify */" > config.h
- echo "# automatically created by config.sh - do not modify" > makefile.opts
--> config.ldflags
-+> config.libs
- > config.cflags
- > .config.log
- 
-@@ -131,7 +131,7 @@ done
- 
- if [ "$MPDM" != "NOTFOUND" ] ; then
- 	echo "-I$MPDM" >> config.cflags
--	echo "-L$MPDM -lmpdm" >> config.ldflags
-+	echo "-L$MPDM -lmpdm" >> config.libs
- 	echo "OK ($MPDM)"
- else
- 	echo "No"
-@@ -143,7 +143,7 @@ if [ ! -f $MPDM/Makefile ] ; then
- 	( echo ; cd $MPDM ; ./config.sh $CONF_ARGS ; echo )
- fi
- 
--cat $MPDM/config.ldflags >> config.ldflags
-+cat $MPDM/config.libs >> config.libs
- 
- # if win32, the interpreter is called mpsl.exe
- grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null && TARGET=mpsl.exe
-Index: mp-5.1.1/mpsl/makefile.in
-===================================================================
---- mp-5.1.1.orig/mpsl/makefile.in
-+++ mp-5.1.1/mpsl/makefile.in
-@@ -49,11 +49,11 @@ $(LIB): $(OBJS)
- 	$(AR) rv $(LIB) $(OBJS)
- 
- $(TARGET): $(LIB) $(MPDM)/libmpdm.a
--	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` -o $@
-+	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
- 
- stress: stress.c $(LIB) $(MPDM)/libmpdm.a
- 	$(CC) $(CFLAGS) `cat config.cflags` stress.c \
--		-L. -lmpsl `cat config.ldflags` -o $@
-+		-L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
- 
- clean:
- 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
-@@ -62,7 +62,7 @@ realclean: clean
- 	rm -f y.tab.c y.tab.h lex.yy.c
- 
- distclean: clean y.tab.c y.tab.h lex.yy.c
--	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
-+	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
- 
- realclean: distclean docsclean
- 
diff --git a/app-editors/mp/files/mp-5.1.1-prll.patch b/app-editors/mp/files/mp-5.1.1-prll.patch
deleted file mode 100644
index 0aac81332fe3..000000000000
--- a/app-editors/mp/files/mp-5.1.1-prll.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/makefile.in b/makefile.in
-index b1cef14..f8d2bca 100644
---- a/makefile.in
-+++ b/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:
--	( 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.1.3-asneeded.patch b/app-editors/mp/files/mp-5.1.3-asneeded.patch
deleted file mode 100644
index 7f60c2719023..000000000000
--- a/app-editors/mp/files/mp-5.1.3-asneeded.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff --git a/config.sh b/config.sh
-index 17ade83..643b07e 100755
---- a/config.sh
-+++ b/config.sh
-@@ -80,7 +80,7 @@ echo "Configuring..."
- 
- echo "/* automatically created by config.sh - do not modify */" > config.h
- echo "# automatically created by config.sh - do not modify" > makefile.opts
--> config.ldflags
-+> config.libs
- > config.cflags
- > .config.log
- 
-@@ -134,7 +134,7 @@ done
- 
- if [ "$MPDM" != "NOTFOUND" ] ; then
- 	echo "-I$MPDM" >> config.cflags
--	echo "-L$MPDM -lmpdm" >> config.ldflags
-+	echo "-L$MPDM -lmpdm" >> config.libs
- 	echo "OK ($MPDM)"
- else
- 	echo "No"
-@@ -146,7 +146,7 @@ if [ ! -f $MPDM/Makefile ] ; then
- 	( echo ; cd $MPDM ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
- fi
- 
--cat $MPDM/config.ldflags >> config.ldflags
-+cat $MPDM/config.libs >> config.libs
- echo "MPDM=$MPDM" >> makefile.opts
- 
- # MPSL
-@@ -160,7 +160,7 @@ done
- 
- if [ "$MPSL" != "NOTFOUND" ] ; then
- 	echo "-I$MPSL" >> config.cflags
--	echo "-L$MPSL -lmpsl" >> config.ldflags
-+	echo "-L$MPSL -lmpsl" >> config.libs
- 	echo "OK ($MPSL)"
- else
- 	echo "No"
-@@ -172,7 +172,7 @@ if [ ! -f $MPSL/Makefile ] ; then
- 	( echo ; cd $MPSL ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
- fi
- 
--cat $MPSL/config.ldflags >> config.ldflags
-+cat $MPSL/config.libs >> config.libs
- echo "MPSL=$MPSL" >> makefile.opts
- 
- # Win32
-@@ -184,7 +184,7 @@ else
- 	grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null
- 
- 	if [ $? = 0 ] ; then
--		echo "-mwindows -lcomctl32" >> config.ldflags
-+		echo "-mwindows -lcomctl32" >> config.libs
- 		echo "#define CONFOPT_WIN32 1" >> config.h
- 		echo "OK"
- 		DRIVERS="win32 $DRIVERS"
-@@ -279,7 +279,7 @@ else
- 
- 		if [ $? = 0 ] ; then
- 			echo $TMP_CFLAGS >> config.cflags
--			echo $TMP_LDFLAGS >> config.ldflags
-+			echo $TMP_LDFLAGS >> config.libs
- 
- 			echo "#define CONFOPT_KDE4 1" >> config.h
- 			echo "OK"
-@@ -357,7 +357,7 @@ else
- 	if [ $? = 0 ] ; then
- 		echo "#define CONFOPT_GTK 2" >> config.h
- 		echo "$TMP_CFLAGS " >> config.cflags
--		echo "$TMP_LDFLAGS " >> config.ldflags
-+		echo "$TMP_LDFLAGS " >> config.libs
- 		echo "OK (2.0)"
- 		DRIVERS="gtk $DRIVERS"
- 		DRV_OBJS="mpv_gtk.o $DRV_OBJS"
-diff --git a/makefile.in b/makefile.in
-index 704eb57..5714f62 100644
---- a/makefile.in
-+++ b/makefile.in
-@@ -36,7 +36,7 @@ dep:
- 	gcc -MM *.c `cat config.cflags` > makefile.depend
- 
- $(APPNAME): $(OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
--	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` -o $@
-+	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` `cat config.libs` -o $@
- 
- mpv_kde4.o: mpv_kde4.cpp mpv_kde4.moc
- 	$(CPP) $(CFLAGS) -I. `cat config.cflags` -c $<
-@@ -54,7 +54,7 @@ mp_res.o: mp_res.rc
- 	$(WINDRES) mp_res.rc mp_res.o
- 
- mp-5.exe: $(OBJS) mp_res.o $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
--	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` -o $@
-+	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` `cat config.libs` -o $@
- 
- clean:
- 	rm -f $(APPNAME) $(LIB) $(OBJS) *.o *.moc tags *.tar.gz *.exe *.zip .installer.c *.1
-@@ -62,7 +62,7 @@ clean:
- 	(cd $(MPSL) ; make clean)
- 
- distclean: clean
--	rm -f config.h config.cflags config.ldflags \
-+	rm -f config.h config.cflags config.ldflags config.libs \
- 		makefile.opts Makefile po/minimum-profit.pot
- 
- docsclean:
-diff --git a/mpdm/config.sh b/mpdm/config.sh
-index 9e4f2f8..16033d3 100755
---- a/mpdm/config.sh
-+++ b/mpdm/config.sh
-@@ -70,7 +70,7 @@ echo "Configuring MPDM..."
- 
- echo "/* automatically created by config.sh - do not modify */" > config.h
- echo "# automatically created by config.sh - do not modify" > makefile.opts
--> config.ldflags
-+> config.libs
- > config.cflags
- > .config.log
- 
-@@ -169,7 +169,7 @@ if [ "$WITH_PCRE" = 1 ] ; then
- 		echo "OK (using pcre library)"
- 		echo "#define CONFOPT_PCRE 1" >> config.h
- 		echo "$TMP_CFLAGS " >> config.cflags
--		echo "$TMP_LDFLAGS " >> config.ldflags
-+		echo "$TMP_LDFLAGS " >> config.libs
- 		REGEX_YET=1
- 	fi
- fi
-@@ -316,7 +316,7 @@ else
- 		if [ $? = 0 ] ; then
- 			echo "OK (libintl needed)"
- 			echo "#define CONFOPT_GETTEXT 1" >> config.h
--			echo "$TMP_LDFLAGS" >> config.ldflags
-+			echo "$TMP_LDFLAGS" >> config.libs
- 		else
- 			echo "No"
- 		fi
-@@ -349,7 +349,7 @@ else
- 		if [ $? = 0 ] ; then
- 			echo "OK (libiconv needed)"
- 			echo "#define CONFOPT_ICONV 1" >> config.h
--			echo "$TMP_LDFLAGS" >> config.ldflags
-+			echo "$TMP_LDFLAGS" >> config.libs
- 		else
- 			echo "No"
- 		fi
-diff --git a/mpdm/makefile.in b/mpdm/makefile.in
-index 17ee1a0..10c102d 100644
---- a/mpdm/makefile.in
-+++ b/mpdm/makefile.in
-@@ -32,7 +32,7 @@ $(LIB): $(OBJS)
- 	$(AR) rv $(LIB) $(OBJS)
- 
- stress: stress.c $(LIB)
--	$(CC) $(CFLAGS) `cat config.ldflags` stress.c -L. -lmpdm -o $@
-+	$(CC) $(CFLAGS) `cat config.ldflags` `cat config.libs` stress.c -L. -lmpdm -o $@
- 
- .SUFFIXES: .txt .html
- 
-@@ -54,7 +54,7 @@ clean:
- 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
- 
- distclean: clean
--	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
-+	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
- 
- realclean: distclean docsclean
- 
-diff --git a/mpsl/config.sh b/mpsl/config.sh
-index d325412..4f36b06 100755
---- a/mpsl/config.sh
-+++ b/mpsl/config.sh
-@@ -69,7 +69,7 @@ echo "Configuring MPSL..."
- 
- echo "/* automatically created by config.sh - do not modify */" > config.h
- echo "# automatically created by config.sh - do not modify" > makefile.opts
--> config.ldflags
-+> config.libs
- > config.cflags
- > .config.log
- 
-@@ -131,7 +131,7 @@ done
- 
- if [ "$MPDM" != "NOTFOUND" ] ; then
- 	echo "-I$MPDM" >> config.cflags
--	echo "-L$MPDM -lmpdm" >> config.ldflags
-+	echo "-L$MPDM -lmpdm" >> config.libs
- 	echo "OK ($MPDM)"
- else
- 	echo "No"
-@@ -143,7 +143,7 @@ if [ ! -f $MPDM/Makefile ] ; then
- 	( echo ; cd $MPDM ; ./config.sh $CONF_ARGS ; echo )
- fi
- 
--cat $MPDM/config.ldflags >> config.ldflags
-+cat $MPDM/config.libs >> config.libs
- 
- # if win32, the interpreter is called mpsl.exe
- grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null && TARGET=mpsl.exe
-diff --git a/mpsl/makefile.in b/mpsl/makefile.in
-index 14ed62d..253e278 100644
---- a/mpsl/makefile.in
-+++ b/mpsl/makefile.in
-@@ -49,11 +49,11 @@ $(LIB): $(OBJS)
- 	$(AR) rv $(LIB) $(OBJS)
- 
- $(TARGET): $(LIB) $(MPDM)/libmpdm.a
--	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` -o $@
-+	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
- 
- stress: stress.c $(LIB) $(MPDM)/libmpdm.a
- 	$(CC) $(CFLAGS) `cat config.cflags` stress.c \
--		-L. -lmpsl `cat config.ldflags` -o $@
-+		-L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
- 
- clean:
- 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
-@@ -62,7 +62,7 @@ realclean: clean
- 	rm -f y.tab.c y.tab.h lex.yy.c
- 
- distclean: clean y.tab.c y.tab.h lex.yy.c
--	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
-+	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
- 
- realclean: distclean docsclean
- 
diff --git a/app-editors/mp/mp-5.1.1.ebuild b/app-editors/mp/mp-5.1.1.ebuild
deleted file mode 100644
index 2b79d0339716..000000000000
--- a/app-editors/mp/mp-5.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.1.1.ebuild,v 1.9 2011/03/27 10:20:03 nirbheek 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 ncurses nls pcre iconv"
-
-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}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-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 nls || myconfig="${myconf} --without-gettext"
-
-	myconf="${myconf} $(use_with pcre)"
-	use pcre || myconf="${myconf} --with-included-regex"
-
-	use iconv || myconf="${myconf} --without-iconv"
-
-	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
-		echo ${CFLAGS} >> $i/config.cflags
-		echo ${LDFLAGS} >> $i/config.ldflags
-	done
-
-	tc-export CC
-	sh config.sh ${myconf} || die "Configure failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	sh config.sh --prefix="${EPREFIX}/usr"
-	emake 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
-}
diff --git a/app-editors/mp/mp-5.1.3.ebuild b/app-editors/mp/mp-5.1.3.ebuild
deleted file mode 100644
index bc6fc4aa58ac..000000000000
--- a/app-editors/mp/mp-5.1.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.1.3.ebuild,v 1.5 2011/03/27 10:20:03 nirbheek 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}"/${P}-asneeded.patch \
-		"${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"
-
-	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
-		echo ${CFLAGS} >> $i/config.cflags
-		echo ${LDFLAGS} >> $i/config.ldflags
-	done
-
-	tc-export CC
-	sh config.sh ${myconf} || die "Configure failed"
-}
-
-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
-}