Version bump, thanks to Rafał Mużyło (bug 390211)

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 63 insertions, 25 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index 6e3cfadc3dcf..8cd3d29901b9 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.80 2011/06/16 18:47:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.81 2011/11/12 00:47:44 xmw Exp $
+
+*mp-5.2.1 (12 Nov 2011)
+
+  12 Nov 2011; Michael Weber <xmw@gentoo.org> -mp-5.2.0.ebuild,
+  -files/mp-5.2.0-make.patch, +mp-5.2.1.ebuild, +files/mp-5.2.1-prll.patch:
+  Version bump, thanks to Rafał Mużyło (bug 390211)
 
   16 Jun 2011; Jeroen Roovers <jer@gentoo.org> mp-5.2.0.ebuild,
   +files/mp-5.2.0-make.patch:
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index 1d5609076bff..9485e7876ff7 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -4,23 +4,21 @@ Hash: SHA256
 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.0-make.patch 184 RMD160 13d8ad86ac0c2ab166caa426816f3fea9f7c7435 SHA1 247044f6f76e5931c49a3238bbcb179737f112e7 SHA256 e636efb044a546424157a942f5be0c88b4f34a8b24dac48fe66abfff352d31e3
+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.0.tar.gz 510970 RMD160 ddc2b42382b36c5c74db364d094fcb19ea551cf6 SHA1 7f03be23129866afb7e1fa77ac23d11c0db304c5 SHA256 69cdc69969f70881c6eb1329d2f55a7a6ec63352c65f1a0a60a8bf24006c3ae6
+DIST mp-5.2.1.tar.gz 566513 RMD160 933124bd4fd7d23ad899c10ea93e57732f003d87 SHA1 9139b714225938c319fba7d051faf80b696d9204 SHA256 e91ff7b94427a5c49815f091c67c20f47f63fd473318dbd9dce52a68a6a6f9d4
 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.0.ebuild 2038 RMD160 9a60750fd811dcfe7034af880e0a34caf0d74c67 SHA1 e631ec67602ece91d83fb9000c3fe82fe47f9dd3 SHA256 4657199520eb637fac82a3b43cb2c96d19c37d89fb43c864a27db0c2e1d2cb82
-MISC ChangeLog 9970 RMD160 1715e295d9396f69316aae149b20f9351cb0a394 SHA1 61e82f317b388a516018c22c3e92d38edf0f647e SHA256 3c789fc91bf4e86805c3cd8c9962601f4ffecaf71e605977dd0725e12deb4af0
+EBUILD mp-5.2.1.ebuild 1997 RMD160 de2b68302dd32ea744afc54adf36f5df4cffb220 SHA1 f5ad20779459db8d9033bb242af92ba9704cac3a SHA256 ef3e80a28865b56223a2d3b7bc443ea87f217a98c687a8938f11fb747172c70d
+MISC ChangeLog 10191 RMD160 80a7b2829175cc5f8dad70d4aa992ee37d39f713 SHA1 383776412602a895e615b6a77d612768a6c140f5 SHA256 8965968c1b556b8e2487686f2cdfb8121c8070c672623611689b78eb8e37afec
 MISC metadata.xml 292 RMD160 354d84d97415a69afafccaae6cd627760a95475f SHA1 6266efbae4646d6658dacb480b8f3a78e5c4735f SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk58/GAACgkQfXuS5UK5QB1+HQP+K8MVlQvs68LI7qT5TsM8VxQ1
-9r8xD2eCpSc9Rolfl0s6HJAhMlXjwumE/PvZDqXkibsTwmCJ+pPmUx3rAgmqCfJs
-/VTRIQKij4JN2KjP8HQZ8zg0WzCcZnB7LOoukwm5kfH+EvqYHUc9ExKkomzEy73Y
-u8oF7rsgGdILtwSdBAg=
-=HFOr
+iF4EAREIAAYFAk69wjYACgkQknrdDGLu8JDT5AEAkkIVsUmayE0I+h+XeNW3de4s
+Vtefd7aHp8mvFHPiN5AA/jGUDbvFFRBgP0QFabk3cskCEOahAqkH3pbB5fP2NFJ1
+=4Oyh
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mp/files/mp-5.2.0-make.patch b/app-editors/mp/files/mp-5.2.0-make.patch
deleted file mode 100644
index af51bc303384..000000000000
--- a/app-editors/mp/files/mp-5.2.0-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/makefile.in
-+++ b/makefile.in
-@@ -29,7 +29,7 @@
- $(MPDM)/libmpdm.a:
- 	$(MAKE) -C $(MPDM)
- 
--$(MPSL)/libmpsl.a:
-+$(MPSL)/libmpsl.a: $(MPDM)/libmpdm.a
- 	$(MAKE) -C $(MPSL)
- 
- dep:
diff --git a/app-editors/mp/files/mp-5.2.1-prll.patch b/app-editors/mp/files/mp-5.2.1-prll.patch
new file mode 100644
index 000000000000..a0fef7fd63a3
--- /dev/null
+++ b/app-editors/mp/files/mp-5.2.1-prll.patch
@@ -0,0 +1,46 @@
+--- 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/mp-5.2.0.ebuild b/app-editors/mp/mp-5.2.1.ebuild
index 4d2fa8744854..1beadbfec48e 100644
--- a/app-editors/mp/mp-5.2.0.ebuild
+++ b/app-editors/mp/mp-5.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2011/06/16 18:47:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.1.ebuild,v 1.1 2011/11/12 00:47:44 xmw Exp $
 
 EAPI="3"
 
@@ -29,8 +29,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-prll.patch \
-		"${FILESDIR}"/${PN}-5.2.0-make.patch
+	epatch "${FILESDIR}"/${PN}-5.2.1-prll.patch
 }
 
 src_configure() {