Remove intermediate versions.

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

5 files changed, 16 insertions, 162 deletions

diff --git a/app-editors/mg/ChangeLog b/app-editors/mg/ChangeLog
index 36a176c2cd4b..de8f00e2e01d 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.71 2014/03/07 13:44:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.72 2014/03/13 06:28:53 ulm Exp $
+
+  13 Mar 2014; Ulrich Müller <ulm@gentoo.org> -mg-20131118.ebuild,
+  -mg-20140220.ebuild, -files/mg-20140220-freebsd.patch:
+  Remove intermediate versions.
 
 *mg-20140306 (07 Mar 2014)
 
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 0b34d4bbd3e9..7f7b7c7db612 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,28 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mg-20140220-freebsd.patch 556 SHA256 c540970a78e353cf4d953fef03839a4cd1f10813419587aae3e7bb29465152a1 SHA512 692279e2fd0fb5cdb7463eeaa3d3ea25e426edb8319b75050b22963bab5ada532a9685282e0efe629335d4db10d84dd4c84f4c276cf2815646e168e8d9d5097b WHIRLPOOL 3cad0bb8afc4696dfa40ce34d2c27ef72d26f6ffc9bd88c6e22a5c6ea4ee55debb621a36a1fbff8ee647fb432479ee624fd569bd7384754d92ffe729c88add1e
 DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
-DIST mg-20131118.tar.gz 144002 SHA256 b99fe10cb8473e035ff43bf3fbf94a24035e4ebb89484d48e5b33075d22d79f3 SHA512 36451ee813ac1d01df7648f4c7aff6bef5d62c2d9c57033ccecaccf1904fa1f4071cefbe9b5c55bbebcb104ee8497cc6163d3bb4f552ce223bd441bf6613d149 WHIRLPOOL f91468b062db3372969f6d5da048d8636251509650b289cd5bb2225173f08d315c5170e4634660fcc5276f5a9eafdee835a2b5f30341523ea11902d66c0ff266
-DIST mg-20140220.tar.gz 142401 SHA256 8d8f3c250c40af318a888e6825bb234e7e605bf0576ca4a6885bb25d41241117 SHA512 a9bc66aec20784ab0e00be4078a6d099fd1e47b32a601e4b7b33f3e79beaa609090acd56f912036db9a3033d86b8e2aed4d0023939f1a378a0e302b6ed47a7f5 WHIRLPOOL fd2a629d8e7e97064d5f65e2dd4ead32cd39b9cef36bf36c0f936ed43648c42aea8c6a4442d70d9606ccfdc5e5ffce3ebd3bcba1d081b88b44970e2d7ffe691b
 DIST mg-20140306.tar.gz 142518 SHA256 26516bc5f3abd2b887bde0213fcdae02195c68ff776799addca1d072c37586fe SHA512 4bf62396857b2d43a99731a716cf72a2c15010ef99999cb7577f57bf1226160cc97c30ae1e787bd490521d33c08fe7a4fa9db8d999048db21d61f9a741574a17 WHIRLPOOL a7e9935e90c8854e59a9bd1e8a12909d5e3778aa14d6c0281a076ecda848a7d5cf309e94bd1137e0050c3086885b3de12a970e7d01e14d663d6551fab2761498
 EBUILD mg-20110905-r1.ebuild 1219 SHA256 242469a115a7a3e9b8cad1aeeb430246f8a6fedfbe3b48f6502b3d61c6ee330e SHA512 93b4b738b468bc163f1ae5a617b4d8e76e55b83af697834cee539fdb864317b75627feb2fda55be0092d457dfb2e7e64cc630667086abef61b593dff04d69cb9 WHIRLPOOL b3ed099897c61d3b412a1f3d5105ce6b0e57ccf199d08b675e7256e72f79aa0fe3563e816e10d90afd1d0c88d0fea0bd644da3167e78a6e41fc7b543b17a9b71
-EBUILD mg-20131118.ebuild 1297 SHA256 b5a523fa0dd6246aadc5862619d0dd7f20a135f5a2d4b390145f21d1683bef95 SHA512 5ecf269d05b17180be3436a19932ed6f3e1acaf7973377d3b82a766fe360d7e8726daeb2b78c717540ccbeeda0d434624727fc9e1c7ea443dea86d95d832b818 WHIRLPOOL a261b88ef55d2ba3512b8b46b83f8e74817fd4169b430ab23beb01f2b6a0f5a45156b60839330404a04be903ddeb57490f01f33c138f0893b63cf6c3f28aadc8
-EBUILD mg-20140220.ebuild 1674 SHA256 b3b3ac415bab9ad0bb387e92c211d004697068a121c16f5b0554813af7f3e8d4 SHA512 afd70c75ce60f640d85f56fa2be23f92794e367aa09e5f2d980e6d81b3ba2f40d95076882b420d813eb6c9d71607b4a8f1dd0ac5ba0384e876b7dfb0d1fc0ce0 WHIRLPOOL 388ee6e77486808e7c4bb986088ff927d86b9780c7b96b38da19ad818e6905952e39545e95674e9e494ced9be8dbb97200a509c0e780cf1de721c6e62f2a9228
 EBUILD mg-20140306.ebuild 1255 SHA256 6a51893728f3d5f47a7f8f8932d5049124006bc10bd503632646d062943d1532 SHA512 c5083b033325f1e3c314254ab459c63a4fc8f817e80cc4c7cb3bc0e680e4a8349ddee719a4688d8fa097c978df9a120d0ba1f7243a1e4f723a597402d1b11683 WHIRLPOOL c20b326c8140400b2df186b5028c96378b6f3cec1073c944c20a62fb71d64570b525626fe9e205773045ab9590065e261f098b68984878ef4748c73674b9a43f
-MISC ChangeLog 8664 SHA256 144772817068f679e3441c1ff1a8714cda611d2e0f6a58bb8c6b932fe104c1c6 SHA512 7576e24e42d76ce7d8eb6c8327858e2c41f9d65e522967858ac108ace81dfbbd59f1fce640bc0519d869271ada46445a634a6d446e93429cd4dacd1b829d158e WHIRLPOOL db00667eedd04e86a8a0816f4bd59e813b3059b05cb3994795e3f63e93a09a7ef599e29435877dc423bf0b8f8d290f672e6b43bbe2daff81f1203a3ed7cc4581
+MISC ChangeLog 8822 SHA256 dcc05142d19cffc238428a8705a49cccfdd7870e870f6bdc636ed0598c21bdff SHA512 c7e340acb28abab7726ee79ba80f519416a8f5f7e789e036d8e18610fb1e4a83d339d8a6f80ac8affcb0a6a32765c1dcb1d88ac0e88a4feb0734ac444238a444 WHIRLPOOL 7013f3cf83ff3936665788e0ae3ea0fa3277db4c160981ddb967c27526fbd66be8fda3148fff08c011aac472c92a13ff02fe246a7f7196eb77778aa4eafc3483
 MISC metadata.xml 291 SHA256 65d24d4c0b435503345283db1c00cc7161174eddecc4d737cbf50d924145ca6c SHA512 2ba87a6af0cc36ed2e49ded86f81a6e30b2b9ca9e73949860db9f30bac95ad7374fe1e0c5e712f3c427a8a562ceb57c9693aea967f7c134d5858aca4ec704ba2 WHIRLPOOL 604f60f36640570753ef76af4f260e3103dc8cdfbb8dc00d585d864a6ce8fc3f573a95340720d00c9ebfccc817c13065419090aad6c281a96106b423bd88bd38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTGc6kAAoJEJQzkH1pP7W44ksL/1PuDWNC3+Og0aiyVz9qKDon
-OIkZPRrOJ8ygoqL9DfPkSnWPzTJYY4vPjKaoPHrMyBuJxz3WlCtwaEVniSUyLdLi
-zpLxab7a4qaSgGYhhnux6wat17yg67gfY6E3SEPHBB/4fUzBliH/JNkRvBG4iy8/
-XDPo1J7VdXn7lapd5q8NOdPjeqyyvj+qUTxv8QWnIHkkyQ5EivtbuMAUtJN8UIPf
-pYoHmiHVVCbWbretUrKw4XHeEwTlEv4kyjSokvH/jNvheD9wWiOols6wJjDpNNez
-GJK55mBW6Ul7+QskYCNubsoBdQDvRHyNo0nK0OL/UuATzKKExTF/nSAMn1QBx4IL
-NMloRniDxTtnde5vfF7LaNM8XLZgnp+dPk+DFJH4RvYbLr6V+eARAJnUr+J+zrbV
-IglFVigiLv1p93nODcGld9fJc4iMzGIj7fhhsHR7r5tZS9OSxfjdwheDguIqr63O
-UrRUNmzDCnqx0tVsmJSRFd+qKd7EWsqWuhvm7q5ojA==
-=oUFl
+iQGcBAEBCAAGBQJTIVGjAAoJEJQzkH1pP7W4lusMAIR8tl3Cd2tRERACJANAqtjB
+gc9Ja3Ga3hKKnqCOtubTj56HIru1R3Vv/zQdp/6Bi65T6uy8fB4T9h4VIIrC/kes
+Rh4Z2TmHQPYBLP+6R5ocr+l4fvKvjM0Ref+aFrNv7Bfhssydr4T3WXAhAQpKcvHO
+qjMQ0hgb8MCHpgJLTWQC5TpiYXh9NVLkvKzFaUS7oxNNl+w7gGOx0i013OfJEBtv
+uKb6eaSg92OncDmLGXbi1CRmXjd2OJAfKJ2QeSREwGybVYE+YZUaqn9Skten5oXE
+GrIQ0F3vk6tyKHSr+CxUUL5Aq+CYXwBHqnyep+uydsAJp1zvHejqrNV+m78FiHV8
++jfE+NKtsSeTaJknqoi1dfCYLfNc25pKzYm+ESref9xr5pQ8mwlofxubMWlV2VA7
+n0+59r9QfkTp119pHFYufaaMnGOIcXpqnRWNI8TItwuyJEhqgaEwY/ESkZ3kqum5
+po2r4G6Q2isR2QmUQOA4eVDVO2WFpY1N0rsGsz5byA==
+=cE5K
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mg/files/mg-20140220-freebsd.patch b/app-editors/mg/files/mg-20140220-freebsd.patch
deleted file mode 100644
index 70ba4909e5a9..000000000000
--- a/app-editors/mg/files/mg-20140220-freebsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mg-20140220-orig/sysdef.h
-+++ mg-20140220/sysdef.h
-@@ -15,7 +15,7 @@
- #  define __USE_GNU
- #endif
- 
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- #  define LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX
- #endif
- 
---- mg-20140220-orig/tags.c
-+++ mg-20140220/tags.c
-@@ -15,9 +15,12 @@
- #include <err.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdio.h>
- 
--#ifndef LIBBSD_OVERLAY
--#include <util.h>
-+#if defined(LIBBSD_OVERLAY) || defined(__FreeBSD__)
-+#  include <libutil.h>
-+#else
-+#  include <util.h>
- #endif
- 
- #include "def.h"
diff --git a/app-editors/mg/mg-20131118.ebuild b/app-editors/mg/mg-20131118.ebuild
deleted file mode 100644
index f07b84408052..000000000000
--- a/app-editors/mg/mg-20131118.ebuild
+++ /dev/null
@@ -1,52 +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-20131118.ebuild,v 1.2 2014/02/13 14:24:37 jer 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 hppa ~x86"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/clens"
-
-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)" \
-		CPPFLAGS="-DFKEYS -DREGEX -DXKEYS -I${EPREFIX}/usr/include/clens" \
-		CFLAGS="${CFLAGS}" \
-		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses) -lclens"
-}
-
-src_install()  {
-	einstall
-	dodoc README README_PORTING 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-20140220.ebuild b/app-editors/mg/mg-20140220.ebuild
deleted file mode 100644
index 15c6847d307f..000000000000
--- a/app-editors/mg/mg-20140220.ebuild
+++ /dev/null
@@ -1,65 +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-20140220.ebuild,v 1.4 2014/03/03 21:49:00 ulm 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 ~hppa ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses
-	!elibc_FreeBSD? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-freebsd.patch"
-	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
-
-	# remove pkg-config call; we pass flags and libs as parameters
-	sed -i -e '/pkg-config/d' GNUmakefile || die
-}
-
-src_compile() {
-	local pc=$(tc-getPKG_CONFIG) extraflags extralibs
-
-	if use elibc_FreeBSD; then
-		extralibs="-lutil"
-	else
-		extraflags=$("${pc}" --cflags libbsd-overlay)
-		extralibs=$("${pc}" --libs libbsd-overlay)
-	fi
-
-	emake CC="$(tc-getCC)" \
-		CPPFLAGS="-DFKEYS -DREGEX -DXKEYS -D__dead=__dead2 ${extraflags}" \
-		CFLAGS="${CFLAGS}" \
-		LIBS="$("${pc}" --libs ncurses) ${extralibs}"
-}
-
-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
-}