Stable for amd64, bug 510330. Remove intermediate version.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 20 insertions, 62 deletions

diff --git a/app-editors/mg/ChangeLog b/app-editors/mg/ChangeLog
index d1ba60c946e0..b23e366028da 100644
--- a/app-editors/mg/ChangeLog
+++ b/app-editors/mg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/mg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.79 2014/05/25 18:47:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.80 2014/06/13 17:08:58 ulm Exp $
+
+  13 Jun 2014; Ulrich Müller <ulm@gentoo.org> -mg-20140306.ebuild,
+  mg-20140414.ebuild:
+  Stable for amd64, bug 510330. Remove intermediate version.
 
   25 May 2014; Markus Meier <maekke@gentoo.org> mg-20140414.ebuild:
   arm stable, bug #510330
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 76526770876a..0f75d8d20bb1 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -2,17 +2,22 @@
 Hash: SHA256
 
 DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
-DIST mg-20140306.tar.gz 142518 SHA256 26516bc5f3abd2b887bde0213fcdae02195c68ff776799addca1d072c37586fe SHA512 4bf62396857b2d43a99731a716cf72a2c15010ef99999cb7577f57bf1226160cc97c30ae1e787bd490521d33c08fe7a4fa9db8d999048db21d61f9a741574a17 WHIRLPOOL a7e9935e90c8854e59a9bd1e8a12909d5e3778aa14d6c0281a076ecda848a7d5cf309e94bd1137e0050c3086885b3de12a970e7d01e14d663d6551fab2761498
 DIST mg-20140414.tar.gz 142570 SHA256 89ce25ee13cedc14c3c5c7b76d7a9e0ea38a060ad61e90ac43258d8dadf0d065 SHA512 b080b24c6015225ee1670eb6f062a21f40d34b02c699687d92842983506497c93e15cceb79d05b6cbbebfa8466f7261cb7dde8bcc4888489236cf64104215161 WHIRLPOOL 3630ff9a4228c00e2ec85d93c00bcda1355d0902805a54a158fbb86f48e1e4d9823db2ea16520ff71242ea64f659028330b1ed55c42d7ad6528e4060018a3c9a
 EBUILD mg-20110905-r1.ebuild 1219 SHA256 242469a115a7a3e9b8cad1aeeb430246f8a6fedfbe3b48f6502b3d61c6ee330e SHA512 93b4b738b468bc163f1ae5a617b4d8e76e55b83af697834cee539fdb864317b75627feb2fda55be0092d457dfb2e7e64cc630667086abef61b593dff04d69cb9 WHIRLPOOL b3ed099897c61d3b412a1f3d5105ce6b0e57ccf199d08b675e7256e72f79aa0fe3563e816e10d90afd1d0c88d0fea0bd644da3167e78a6e41fc7b543b17a9b71
-EBUILD mg-20140306.ebuild 1261 SHA256 b78a9dacb7ca9fc3547dcc0aa38cf04edd52cb23791b30f1e4f4f6a875bd3c7b SHA512 fc201d24a9963ab9e14309e48466a0a794b80e054a34413458dd31f5bd8755afd4128300ff71c48d86f9532b91484cce5b202dc4f2de7814dbb94fde2b8dfc6b WHIRLPOOL 6ca3ce316337f05a78d8fb518ff0dd51c91436e1bb03374e47bbe0a55f6a59733f3f32793cb7d98f612e8dfca167989a50db68f817b6bf7a120bee33e3ace450
-EBUILD mg-20140414.ebuild 1261 SHA256 fb059e4706c92ad4146ba609125549a5ef7643d95262162927202ef4367cdfc2 SHA512 72c0cc5460395bf12b43b5884abac49e1c56cea266855b6c0b6dac660a601d69cba278146e7444c4441e21aa12449d70dd4c99056d687081b4e9d251e960df9f WHIRLPOOL 65d79efbcd29765a0535e25134019f62e5cab02c902611e7f59612194fdc08477655ae68db1e265bb8807383c93269dedddea80ec2175706316abd6d47b90565
-MISC ChangeLog 9568 SHA256 bbe8d58ce4fbf4a233a692e5cd7d39ad6a28e9b693cdd08036eeb0629a35ea05 SHA512 aca64d0187dc24a1d6493153287a1175f6b92cdc3a93918d4a73fae18160fba5191e5e5b181242584cf6cba3d1c6c59f8b54bd4dab060de9cab36cfca1cbd055 WHIRLPOOL fe6a3cbe742c8a880235cb45c218c1651383dea6103eca38b0de415034bdfddf5d454b50b7ee42f4273b2b1a7f6f3986adb88b7333fdcd34087c6ea23fb491f0
+EBUILD mg-20140414.ebuild 1257 SHA256 b621345eda0e41ec13056a86ea8a6093498137554fba63e58095f02a7b1ae280 SHA512 4677acc80f1c05259030a05ddf7861770c332c487a9626bf8c0e747077bc692bcd9e37edede2801f7b689527f621a701f311fc4bd7bced5b52ca84b08f0eee40 WHIRLPOOL 5529cebccc0c5b9d5937cdfacc1f7c87241a0366fb7a9a8ab4f57070081e7b358867906d2e59d032b151783b7436595389111a66a797e91e0c16605bfd7e0bcf
+MISC ChangeLog 9717 SHA256 0dd0059f2591174c8be1e37af1ad1a874d041ef4c579cb538d653c82ef1c1fec SHA512 b490a092c8a9b9dfd93bda1b7eaa66ab83119ce65457d8d1639cd64e10ab493fa552b7c49c21d86329dd76871f59670c494b73ad23defcd217cf3ce20395b39c WHIRLPOOL 524e33e63d0ba7d8195e2b574f5272e7d706fc156f14782789fd116f0091eda0029136d134a865ef09f975dddc5965780e25c68bab5e8a4388bfb47108eae697
 MISC metadata.xml 291 SHA256 65d24d4c0b435503345283db1c00cc7161174eddecc4d737cbf50d924145ca6c SHA512 2ba87a6af0cc36ed2e49ded86f81a6e30b2b9ca9e73949860db9f30bac95ad7374fe1e0c5e712f3c427a8a562ceb57c9693aea967f7c134d5858aca4ec704ba2 WHIRLPOOL 604f60f36640570753ef76af4f260e3103dc8cdfbb8dc00d585d864a6ce8fc3f573a95340720d00c9ebfccc817c13065419090aad6c281a96106b423bd88bd38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOCPJkACgkQkKaRLQcq0GJONACfdCzNvlw+q3Sput2aOy0wk4ks
-sHAAoKf4LTk3SSQGdsId7EbJYhzr7J4h
-=tYI4
+iQGcBAEBCAAGBQJTmzCCAAoJEJQzkH1pP7W4nHgL/j/p5DB8G2jn7IQ5Dan6+Tps
+0T1bqUTNMcJJesTDW3FJW41dRquH4bQpCfl7/JiayQuuMk+XYJVYvN+ZVtZBfdqy
+yGSwg1CnIv0zqD1l+I3Bi3Ihh9n6D3lGlzauPOs5gBTPMx0WF3k0LdKlRvFbzKBP
+CLqlfAm57XAnZ84Alwo4v1/ZHxoDpBTeD+zH8oLqVhfiLMysuP7d5a6xBVyY5wmA
+db2CTPYxRvV9vCo2KByyXcNm6VFCvb9U2ayM6VtdAE6gkQ3W0yXH7c64CbprUa2i
+0tKvTf6tDeJGphA91wlSms7BvgYn+a7hx9Rj3s2r+WsGk1YaVRKwBPYR2iyRdEmo
+YU1LCec7H1L/7uNTYQig8vLcl4ciIeXdss3gbmkSJSsHIGrKdH7xfb+hJoLGgP1w
+Lm7PdrlRhGdvV7QOl7+iaVEdY+PKVDG/3ZF/zHFGUQgP/1ZVyyhY8MG610wg6Jrm
+wsj8yuySnh9NFAo/2PTu4/IlLyC9nNYCjFl6O3MQHQ==
+=JhXv
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mg/mg-20140306.ebuild b/app-editors/mg/mg-20140306.ebuild
deleted file mode 100644
index d1c2ca581fa3..000000000000
--- a/app-editors/mg/mg-20140306.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20140306.ebuild,v 1.4 2014/03/22 23:05:38 nimiux Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses
-	!elibc_FreeBSD? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch_user
-
-	# remove OpenBSD specific easter egg
-	sed -i -e 's/theo\.o//' GNUmakefile || die
-	sed -i -e '/theo_init/d' main.c || die
-
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install()  {
-	einstall
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20140414.ebuild b/app-editors/mg/mg-20140414.ebuild
index 14b307cc073f..90cfd217b65d 100644
--- a/app-editors/mg/mg-20140414.ebuild
+++ b/app-editors/mg/mg-20140414.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20140414.ebuild,v 1.3 2014/05/25 18:47:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20140414.ebuild,v 1.4 2014/06/13 17:08:58 ulm Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses