Remove old.

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

17 files changed, 117 insertions, 600 deletions

diff --git a/dev-util/cloc/ChangeLog b/dev-util/cloc/ChangeLog
index e4618884304f..662f20d44e7b 100644
--- a/dev-util/cloc/ChangeLog
+++ b/dev-util/cloc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/cloc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cloc/ChangeLog,v 1.11 2013/08/18 23:37:28 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cloc/ChangeLog,v 1.12 2014/03/22 18:59:11 kensington Exp $
+
+  22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -cloc-1.58.ebuild:
+  Remove old.
 
 *cloc-1.60 (18 Aug 2013)
 
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index 35ebfc4292bb..1147aaa9f43d 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cloc-1.58.pl 336446 SHA256 4a484496ee05be4e5b3a6bef8f3337d7f6733c731bbc58dc7d00f5c3eb714f68 SHA512 5f189545e97d132888948a8a7f60dc551e4a0700af4a37c949f5311da326d9ada6780f2faee7fbb4b02545f9fa3afe2caf01c7bf3a8eedbde0155ab797b29f55 WHIRLPOOL b74cfc99159101cd465a9721893719e81f7caa2156848b52ad3e0b2f6879ff1b8711a9f904a64690d29ffe813cfb45b059f9ecfa3628a62da310d7239af4d321
 DIST cloc-1.60.pl 344405 SHA256 4aa870bef104fd2b8f03c667ef8be2cd671cdf59f46c72046c43ed14e222a05c SHA512 569f789cb5ba4164b4f75e4953d8a5be7cd6fbb83ce0356aa0eb6d1c7d863aac91e131df79d90dbc2319c20757e9f758b55ee76390f7f4511e534c451e1a6913 WHIRLPOOL cb2b1ca35aab8eadb0335bac914e546b744c2246d1afc961eb0d683de7461f031bc12e3725d32ff0bcd29260ad2098fccd5291130d321b242797fd93b3de95cd
 DIST cloc.1.pod 12468 SHA256 0e6890acd5836ec43aabed1476e2a1417ea4d454968297c68c1b782e818f979b SHA512 50b4085704c7936de9993476195570957c9c5e864f4a2dbac114ff148a813b50ccba0c6e29d5bda4c4e5cd7c7a09e314233438ddd28f0e0585db54975e602659 WHIRLPOOL 25d9b78a7a0fb88f2ff1192afd8cd5963ab61b06883874b8339a1d4fefbeac4b080d413107f06b34975cd2e7ea92e4313767f2c2aebf39e21ef7cd408bf152ae
-EBUILD cloc-1.58.ebuild 815 SHA256 aaa15bd0cf42d7fd7212843c0e55905908dda10c9726a5acf71150309a073c14 SHA512 92dbf5d8721840583c2042eedbc07c50848e433817e69d3e6b2772d45a131c273e0c260a863b9fcc0a642ce487006f1bccd959732fc34ba81e2bc0f16a5e7f13 WHIRLPOOL 3d93fa921d82a260268c6d41cfc23bdb315d0eb2483ac0f3df9062d81d65db65521770926ca74f5fbd3118dceaa69bd3792767606f07463d8366029e11e2e86d
 EBUILD cloc-1.60.ebuild 815 SHA256 7dbad5ae2b14215ee0c31e96a2e78636141239f519fd30eb49e50aa1518e8419 SHA512 f0325c048793d7ad50f6b79d1508f1d1358c3a535c73fde93bbbd01a97ef19b8730d6ff65fd76f7c50d85f3df4ac674f7db83405666a0391e7ce477d79074955 WHIRLPOOL 6cfd1ba1bb9b22e7c4bd25276a9c95d34bf287f4dce63c8cd2e88be882ffe17303c9c891b85586cfa533d9067790d9990951914958c87950c38d2d28a7696fe5
-MISC ChangeLog 1569 SHA256 bb50b69c2b96ecd2b1e58b5da22c433123df2b7aa20a5f8d28cf6ca74fa906c8 SHA512 d88226ffab0a0abdcc8bed15b95849562856afea7d3c026ab696f8b143ee457cab4d163da83c38a285d8c97963ba808f5dab281f225c4ca2521fbca34ac63a13 WHIRLPOOL 2dfe2801037802767c795ba0b7a1c7bf48c36360cb99a357e03de83f05e6989f42c225415dad337289d1ce40c0ca24bb6a537f121d57e390f1989ee184a7ef77
+MISC ChangeLog 1660 SHA256 e02433d9e26abdf2b80ff0988cbf1aba6c76a78930591dc189c1d6cf648c99fb SHA512 e52ebeb38bcd342cab2431548f405ae7e0270266a7e170fe1908e0a5fa97df2be1344c6c984267e571358f52da01ae849c161142e211a4c96de4ef1c6de3eb24 WHIRLPOOL 1492f6b3602ccb60cee9f5fbc73ba77e03b7687482ab2bab5727b9a10ab9a7ceb6d513cf57f4215dd7af8a72050e29ba747f7f6d15decf24c73626f970ba73d1
 MISC metadata.xml 357 SHA256 e5a1e8ff723c2148b1a7b3fc8d1704fa524aabdce3475cfa6d508bf7ff17bcd4 SHA512 a46ae6c0abb41cd744aa5dbb57f9e1ba1398036040432417549189467745b8dbfd5bd57712d137afd4b8c6eeefd25169837d21cd39f8ec6f1ba54443c81489e1 WHIRLPOOL 5c1d87ef9a76385997e01a954d0b6a1e3a5f8eedf9a7a1f8e2723aaeaf201b2a8c62aaf5138394775306fa85c7e7019fd95a81a289a9448e0373f684f9afc213
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSEVq6AAoJEEqz6FtPBkyjfLEH/Aqf3Yp90CF9A4coHKZ6HND9
-+0LrOWHzvEeSBxduIiiWISuruDTbdPBNaAee1B/Z7N32/mcoy2wMCSRqFNpBl6Ww
-RdSoYWV9wwS8huOS8DPVVh03P9+xQrcVqQH0e/znmxG7ZCC4NRcLrqIEC+d0tahk
-zUxK6VWPOYgUvK354avxAu1puDr1R1oDTCGg0QOFOxgAl+Q4MsRrfEyElWk4gdJJ
-sRQIkAZFmuBS0qoBPSrx2kHKI9yV/VPlK/ldLtv28A0uzbH0RS8kmWvg2gVNdnz5
-Tjh/N/OQO742OyJo6k5D9KXoNoajBsyQ3rpkZODvjUoYkwwnpaNUwUzSd2WQVMs=
-=vtYn
+iQJiBAEBCABMBQJTLd1/RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7FddEACjR9lamvwHMs7I0V87A5lTGcy7ckqv9vHSAVV3+OVg/vZyjhl260Fp5mT1
+8rKuwhh93M8VQGT8Z8b8crH/RknG6dO0auY+dv+JS0O7/efq67FtfO6bkwmCQOrH
+0C4EL9pjLGcQ4S843jsO3BzheKvgcp4XttMLx+Gt3pAbW4Z6uXNXE1lbEGcdSa1F
+5rtJvqUrLDK1eQoQzE9BF+rjHEV6zufE/FlNqYgu9sQWe7lLCdQOeAPOrnhc9rf5
+H/+a7uSL7Lc2mdefcx7aZaKPL7RgDPryprHJxwItrt53qFOpzVswgYUXvR9zdfIs
+1a3dyn8TmHYSFZ6w/H/LD3MWNcxG/Es/lTXh+eC/QuZHgLOaEDL6B1ly+7d4oXtV
+mvvpwAmYNGoIemj1bcsqF3/j17tuPblsmf4lsHJK0ZqsBCeT4sncF+HsikoA/DMg
+rMQN22elqfYY34tMkHPjy6SpsHANC5djVvgY1vw0T0b0hEH2U/3hSNWbzELzOHpT
+iT9MhZzG9D7k3E0xAos9CExljCIuJIq2S8nz4ZlqQOlzRZL+XRvD9y1LFcUAjMUZ
+JMf4yWeYTKNFAf08Gb8jw+HzBk44T7EFOWYHjNr/20JWGVZgAqOkKrM392ddgFh0
+jVhM7iMa6NoEkb9D4BiNoJ7+6ce2Z7Ub8onjFFO5jqL0B7J8ew==
+=s5kI
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cloc/cloc-1.58.ebuild b/dev-util/cloc/cloc-1.58.ebuild
deleted file mode 100644
index cada8eba8660..000000000000
--- a/dev-util/cloc/cloc-1.58.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cloc/cloc-1.58.ebuild,v 1.1 2013/03/15 03:44:04 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="http://cloc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/perl-5.6"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/regexp-common
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_prepare() {
-	pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
-}
-
-src_install() {
-	doman ${PN}.1
-	newbin "${DISTDIR}"/${P}.pl ${PN}
-}
diff --git a/dev-util/lockrun/ChangeLog b/dev-util/lockrun/ChangeLog
index ff862a64caec..45f45726c866 100644
--- a/dev-util/lockrun/ChangeLog
+++ b/dev-util/lockrun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/lockrun
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lockrun/ChangeLog,v 1.13 2012/07/03 20:30:35 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lockrun/ChangeLog,v 1.14 2014/03/22 19:01:35 kensington Exp $
+
+  22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -files/lockrun.c,
+  -lockrun-2.ebuild:
+  Remove old.
 
   03 Jul 2012; Jeroen Roovers <jer@gentoo.org> lockrun-20120508.ebuild:
   Stable for HPPA (bug #422075).
@@ -46,4 +50,3 @@
   05 Feb 2008; Caleb Tennis <caleb@gentoo.org> +files/lockrun.c,
   +metadata.xml, +lockrun-2.ebuild:
   Initial import
-
diff --git a/dev-util/lockrun/Manifest b/dev-util/lockrun/Manifest
index 9e2e97ad6347..1605ceb07689 100644
--- a/dev-util/lockrun/Manifest
+++ b/dev-util/lockrun/Manifest
@@ -1,6 +1,25 @@
-AUX lockrun.c 6575 SHA256 a334776691c0e0c7ceea0ea78bac9124ab9df176797cd77cda95a1307065e715 SHA512 8e273c357b18cf893c5ef181716ab62a023791185cadaa49fc473577d575cb2a0a435cb7878223c9e1105af64180f0ec3622b261df7760bd55d28b58f909741d WHIRLPOOL e9829b2c060cbc141b07500acbf04fa56904ea9128aa3380614e9fff6429a872226118f3f8f2286ecbca3c32f2e3cb733b883d2bad9299071bf139631c5983ca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX lockrun.c-20120508 7021 SHA256 e9e60ae24c52875332d775a94f1fe188f7cf0d95b2de9e728f83dec693aba44d SHA512 7db0e2ac35dd3a88625fdb88d35b3ef9c1a0820439f05bcb4ee028a698e1a47b58c439a4f0b603cf88873a8120300b8fa5633d429ccf8c95fd5927d04448a1dd WHIRLPOOL fce3d2c1974eb32b4a0c9ff108012babecfc1538ba9f9f5f120b313716f8b093481516478fde1f105c93183db1ecf5161142708349659b034de4270883b96957
-EBUILD lockrun-2.ebuild 649 SHA256 853cbedcc882d9cdb5d743890ebe531413d15f17ce1fac7214c7cc05c1171600 SHA512 c8e22136f68d2c597638238cfc5c4f630330002d1055ea31475aea66b25c822fdaaab648e6b803471aad5d929e5c876bc966d8b514e1cad98128b6caf3e68753 WHIRLPOOL de2f4508fc78b608176d155d7960301d63e19847a50a36e66d0a2bf354950c650c2b0cd3dcec3889aafc2d7adc4a7c9c04c01e70bdf4367b32806d614c5c1947
 EBUILD lockrun-20120508.ebuild 711 SHA256 9a8e5c33f0d480625dad169f3384a55fe0e4433bc2da00d3f429b6cf15f904b8 SHA512 4186b12f0b9d72253b85bcb7904e320c6c225a97724ad8e67b37425f8cb680be6bba8bc5c914deb54c6809ac6ceee8a2ab98bb84a7b101cbccadd4cecc4aa407 WHIRLPOOL 1dbf3cec5585829ecface36673643986c9f756462122b4c22ede67f37ae1d48aac1ee7af5d0ddae576bfefc10c962ace8a5217813401fd6af881b10316cf8a11
-MISC ChangeLog 1690 SHA256 54dbc999d5fca5f557442e466ba19a9b13b594f7e0f3da4c1f8e97fbb3743014 SHA512 dca6db9fed624942af1884cb27466130bc1dba23a7ebe1e0b46d8b20d3913a8f3e2d001d9c94c27ec6bb4b086ffe51c1e571884505fb092ad0f1d086f068de61 WHIRLPOOL d9d809ee696621c7d98309b05e451bfc8cedea00a2c77e45560be493565287e407ea095d32490703119a96c28b6a12607d4b1d4ab0141ec2e4024eb101ca0e70
+MISC ChangeLog 1806 SHA256 9f4fc194618cb2adc547ab90fc283426f4d2dc57d1ec41f03f19f38cff8dcf25 SHA512 d58392101eedfc6593daa3938534e0ff42fd43f60d384d3cbba7464de6364aab9802232bcd0f2b62479eb051de5ca47c8a9d74049e32f18c95af36e0abe38d2d WHIRLPOOL 28e49ba6424cb80560afd7c145312379a4de056007b1696052f08f7e37a08a3bdb0bfefba6065a11bd6556f760fe99906f1ad6b9e472ac2a3edb098ddfe2e1a5
 MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJiBAEBCABMBQJTLd4PRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7JUID/98CXWi2NwyagnvHCxWJi9t3A6SPuXq+Q3pnSBCFikHkKxaeYpdzYHwUsSQ
+EN1JgAkGnDWTiFhCTY9A4S9+89075P6qBPjcJZdy/dfl3GaHvCrDJlldnTERcFcm
+7/ALIClbnbFMf1OPkGG3XtazEDewYpZH6hwVn5U5eQt73lfnciao5QyYJjgiPn+H
+0Rbg5964CxFPlTnq4v3KiVR/H9ypMewmUO7xu2+7u/tNjDcGcBOVbfhRxaQKqX3s
+Qv+FZw4/u+7xgpxDSHwofxqgJjCZ9QDucqUZSUS8orijeVXt03ocF87rdCpcJAvE
+P68xb/tNdxP6S6vN36E2PP+GPWrTVDqmowo/NFWUqWIqOTbeoCutkVKT3Fmg/9Ac
+WtkzKqEJMx9I36aMdvryL9buaf/wIpDnUVmxqKb1pmF1othNJhWDhH6pp6wyMqWB
+APrUwvyNvZ5Ie0UqyCh8KMNphfuI0pSg9nauMoVjMGNblQTf8HgAova0Jr2DXsQF
+SsEZJevx6yz3ItyZATXDuVSFVt577opwvgul1dRTGYc3140oqZLiDSONNJ8gYfws
+R3gaTUiwxaH3bUHLbMRfkK6bYiMe5DEoxwqb1LTB/pB8J5rssddJotseuesAF7le
+hHifKAOaWt62wWQdKjS/C8gcv9PdncXAejPiPNWmCZJuYtdw3A==
+=ma7j
+-----END PGP SIGNATURE-----
diff --git a/dev-util/lockrun/files/lockrun.c b/dev-util/lockrun/files/lockrun.c
deleted file mode 100644
index bccc0db7bcb7..000000000000
--- a/dev-util/lockrun/files/lockrun.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * $Id: lockrun.c,v 1.1 2008/02/05 18:22:38 caleb Exp $
- *
- * written by :	Stephen J. Friedl
- *              Software Consultant
- *              steve@unixwiz.net
- *		http://www.unixwiz.net/tools/
- *
- *	===================================================================
- *	======== This software is in the public domain, and can be ========
- *	======== used by anybody for any purpose                   ========
- *	===================================================================
- *
- *	Lockrun: This program is used to launch a program out with a lockout
- *	so that only one can run at a time. It's mainly intended for use out
- *	of cron so that our five-minute running jobs which run long don't get
- *	walked on. We find this a *lot* with Cacti jobs which just get hung
- *	up: it's better to miss a polling period than to stack them up and
- *	slow each other down.
- *
- *	So we use a file which is used for locking: this program attempts to
- *	lock the file, and if the lock exists, we have to either exit with
- *	an error, or wait for it to release.
- *
- *		lockrun --lockfile=FILE -- my command here 
- *
- * COMMAND LINE
- * ------------
- *
- * --lockfile=F
- *
- *	Specify the name of a file which is used for locking. The file is
- *	created if necessary (with mode 0666), and no I/O of any kind is
- *	done. The file is never removed.
- *
- * --maxtime=N
- *
- *	The script being controlled should run for no more than <N> seconds,
- *	and if it's beyond that time, we should report it to the standard
- *	error (which probably gets routed to the user via cron's email).
- *
- * --wait
- *
- *	When a lock is hit, we normally exit with error, but --wait causes
- *	it to loop until the lock is released.
- *
- * --verbose
- *
- *	Show a bit more runtime debugging.
- *
- * --
- *
- *	Mark the end of the options: the command to run follows.
- *	
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/file.h>
-
-#ifndef __GNUC__
-# define __attribute__(x)	/* nothing */
-#endif
-
-
-#define STRMATCH(a,b)		(strcmp((a),(b)) == 0)
-
-#define UNUSED_PARAMETER(v)	((void)(v))
-
-#define	TRUE	1
-#define	FALSE	0
-
-static const char	*lockfile = 0;
-static int		wait_for_lock = FALSE;
-static mode_t		openmode = 0666;
-static int		sleeptime = 10;		/* seconds */
-static int		Verbose = FALSE;
-static int		Maxtime  = 0;
-
-static char *getarg(char *opt, char ***pargv);
-
-static void die(const char *format, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
-
-int main(int argc, char **argv)
-{
-	char	*Argv0 = *argv;
-	int	rc;
-	int	lfd;
-	pid_t	childpid;
-	time_t	starttime;
-
-	UNUSED_PARAMETER(argc);
-
-	time(&starttime);
-
-	for ( argv++ ; *argv ; argv++ )
-	{
-		char    *arg = *argv;
-		char	*opt = strchr(arg, '=');
-
-		/* the -- token marks the end of the list */
-
-		if ( strcmp(*argv, "--") == 0 )
-		{
-			argv++;
-			break;
-		}
-
-		if (opt) *opt++ = '\0'; /* pick off the =VALUE part */
-
-		if ( STRMATCH(arg, "-L") || STRMATCH(arg, "--lockfile"))
-		{
-			lockfile = getarg(opt, &argv);
-		}
-
-		else if ( STRMATCH(arg, "-W") || STRMATCH(arg, "--wait"))
-		{
-			wait_for_lock = TRUE;
-		}
-
-		else if ( STRMATCH(arg, "-S") || STRMATCH(arg, "--sleep"))
-		{
-			sleeptime = atoi(getarg(opt, &argv));
-		}
-
-		else if ( STRMATCH(arg, "-T") || STRMATCH(arg, "--maxtime"))
-		{
-			Maxtime = atoi(getarg(opt, &argv));
-		}
-
-		else if ( STRMATCH(arg, "-V") || STRMATCH(arg, "--verbose"))
-		{
-			Verbose++;
-		}
-
-		else
-		{
-			die("ERROR: \"%s\" is an invalid cmdline param", arg);
-		}
-	}
-
-	/*----------------------------------------------------------------
-	 * SANITY CHECKING
-	 *
-	 * Make sure that we have all the parameters we require
-	 */
-	if (*argv == 0)
-		die("ERROR: missing command to %s (must follow \"--\" marker) ", Argv0);
-
-	if (lockfile == 0)
-		die("ERROR: missing --lockfile=F parameter");
-
-	/*----------------------------------------------------------------
-	 * Open or create the lockfile, then try to acquire the lock. If
-	 * the lock is acquired immediately (==0), then we're done, but
-	 * if the lock is not available, we have to wait for it.
-	 *
-	 * We can either loop trying for the lock (for --wait), or exit
-	 * with error.
-	 */
-
-	if ( (lfd = open(lockfile, O_RDWR|O_CREAT, openmode)) < 0)
-		die("ERROR: cannot open(%s) [err=%s]", lockfile, strerror(errno));
-
-	while ( flock(lfd, LOCK_EX | LOCK_NB) != 0 )
-	{
-		if ( ! wait_for_lock )
-		{
-			die("ERROR: cannot launch %s - run is locked", argv[0]);
-		}
-
-		/* waiting */
-		if ( Verbose ) printf("(locked: sleeping %d secs)\n", sleeptime);
-
-		sleep(sleeptime);
-	}
-
-	fflush(stdout);
-
-	/* run the child */
-
-
-	if ( (childpid = fork()) == 0 )
-	{
-		close(lfd);		// don't need the lock file
-
-		execvp(argv[0], argv);
-	}
-	else if ( childpid > 0 )
-	{
-		time_t endtime;
-		pid_t  pid;
-
-		if ( Verbose )
-		    printf("Waiting for process %ld\n", (long) childpid);
-
-		pid = waitpid(childpid, &rc, 0);
-
-		time(&endtime);
-
-		endtime -= starttime;
-
-		if ( Verbose || (Maxtime > 0  &&  endtime > Maxtime) )
-		    printf("pid %d exited with status %d (time=%ld sec)\n", pid, rc, endtime);
-	}
-	else
-	{
-		die("ERROR: cannot fork [%s]", strerror(errno));
-	}
-
-	exit(rc);
-}
-
-
-/*! \fn static char *getarg(char *opt, char ***pargv)
- *  \brief A function to parse calling parameters
- *
- *	This is a helper for the main arg-processing loop: we work with
- *	options which are either of the form "-X=FOO" or "-X FOO"; we
- *	want an easy way to handle either one.
- *
- *	The idea is that if the parameter has an = sign, we use the rest
- *	of that same argv[X] string, otherwise we have to get the *next*
- *	argv[X] string. But it's an error if an option-requiring param
- *	is at the end of the list with no argument to follow.
- *
- *	The option name could be of the form "-C" or "--conf", but we
- *	grab it from the existing argv[] so we can report it well.
- *
- * \return character pointer to the argument
- *
- */
-static char *getarg(char *opt, char ***pargv)
-{
-	const char *const optname = **pargv;
-
-	/* option already set? */
-	if (opt) return opt;
-
-	/* advance to next argv[] and try that one */
-	if ((opt = *++(*pargv)) == 0)
-		die("ERROR: option %s requires a parameter", optname);
-
-	return opt;
-}
-
-/*
- * die()
- *
- *	Given a printf-style argument list, format it to the standard error,
- *	append a newline, then exit with error status.
- */
-
-static void die(const char *format, ...)
-{
-va_list	args;
-
-	va_start(args, format);
-	vfprintf(stderr, format, args);
-	putc('\n', stderr);
-	va_end(args);
-
-	exit(EXIT_FAILURE);
-}
-
diff --git a/dev-util/lockrun/lockrun-2.ebuild b/dev-util/lockrun/lockrun-2.ebuild
deleted file mode 100644
index c5e4e0573d3d..000000000000
--- a/dev-util/lockrun/lockrun-2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lockrun/lockrun-2.ebuild,v 1.7 2010/08/11 01:00:23 jer Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lockrun - runs cronjobs with overrun protection"
-HOMEPAGE="http://www.unixwiz.net/tools/lockrun.html"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${FILESDIR}"/lockrun.c "${S}"/lockrun.c
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) ${PN} || die "make failed"
-}
-
-src_install () {
-	dobin ${PN}
-}
diff --git a/dev-util/mock/ChangeLog b/dev-util/mock/ChangeLog
index b36cfe07b7cd..0fca6ef631cc 100644
--- a/dev-util/mock/ChangeLog
+++ b/dev-util/mock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/mock
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/ChangeLog,v 1.11 2012/06/07 21:35:09 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/ChangeLog,v 1.12 2014/03/22 19:02:24 kensington Exp $
+
+  22 Mar 2014; Michael Palimaka <kensington@gentoo.org>
+  -files/mock-0.9.10-chroot-fix.patch, -mock-0.9.10-r2.ebuild:
+  Remove old.
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> mock-0.9.10-r2.ebuild,
   mock-1.0.3.ebuild:
@@ -44,4 +48,3 @@
 
   02 Mar 2009; Ioannis Aslanidis <deathwing00@gentoo.org> ChangeLog:
   Initial version.
-
diff --git a/dev-util/mock/Manifest b/dev-util/mock/Manifest
index 0cfd648ff054..5f40cd3db698 100644
--- a/dev-util/mock/Manifest
+++ b/dev-util/mock/Manifest
@@ -1,7 +1,25 @@
-AUX mock-0.9.10-chroot-fix.patch 591 SHA256 1af4b45640aa957cb02675bf2fa29ecb2a5cbf7aeeb69fe12a90106a2701a06e SHA512 0bdadf47d235326ec4709af6485530dd506d647c86c505565fabe24892c74dd422c1328fb320180edf17a760ff48e4ae59066334122eef28cf4e4caa82338498 WHIRLPOOL 1b5b05b55eb7194cd021296302d31917719e8f9fa480a4c46432465b18c3bf2aed3de080387bf9e5ab9e0f06e2f98542b0f089c1bb0ac039f0cc4489ba45750f
-DIST mock-0.9.10.tar.gz 147687 SHA256 5d9919435310e86c5a91acd22726a3091eea7705470e8b7d903ebd8413fd3839 SHA512 8ef01d51d0418e31fbb3796d84e315c3fa1cbd4294b59d0f8c9c33322bbc09fc9c71d4668be0f4c818bc5e57be0b3490e2331807d1757b6917cca829943501d3 WHIRLPOOL d2c852f7fa773b3ee007a65b83bf1e07b9a739d9d47caebfb500b6ac69b941df071e79aee60b8603271da8653379bd48f172410c5594ad5ec5d1ff0e9432059c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mock-1.0.3.tar.gz 237654 SHA256 7b0c29920f97d4cf51d9f29eb4728e514eadfefea3b8d9888f228bc91f97eb54 SHA512 da95fd3a43236f6919416c66d49467daaf0562d7d4e06c4ab9f8a9e4906e9f6e5ac4c5cab4638d2d2ec6dbbc6a3f2a6c2d0436347aeaa553c6dd57daf0212eab WHIRLPOOL 2ffafd13560988b4d8185d28eccac3c04f8c2ba2b910590d3f229013d211723a5b05253a74559281ec0d0d6badd5211af57e198505910110b48b59a0291a234c
-EBUILD mock-0.9.10-r2.ebuild 775 SHA256 bf095c2a14cfa8f9665a9830782451d02b7b08ad57bec63ad155c5f653cbe3d6 SHA512 ce2ddc77ef932685cf57bad38108fc064be59fc2ffefae1fbcdeaed34fadf69fab2c4a972cc5ff6870806545708acdb2ac11a3542331a3b076660f3e83fa26b7 WHIRLPOOL d69c26bc3fd5a0cfe36d7f784aaff975f43445f13b87456f1452180571cb8c55eb2611bcdc7cacc9124f7c4bb3794c9346e3d10146645b32174ee3214d65bb6d
 EBUILD mock-1.0.3.ebuild 708 SHA256 bc85e9373dff6cfa6be6eea05be3f8bf62db80e4c8cee6fb0bd2e5964e2be106 SHA512 0a5bbb8d905ad24aab0d229aaa52b7268680bf512e9b7050ea12a7f77f6a762ae9661d62ea15faab02f3544094ec57950ce1c4eba5dab588471a7eb134672d0c WHIRLPOOL 0057add469fdd66a50a9e56532f870b4df488713c99d91feefc6dcf098aee4178a255b36d26518d3cf625065c8380870655eabaf82ef82b7cf6865701b6e551c
-MISC ChangeLog 1683 SHA256 d2df51b99f6202f3875d1ea0a3c6a6077787777a1342f2eef45b9cb29ebffac5 SHA512 72db9a4a6a851e9789b6e123623eeaaf194edb927d8472d7886100106a64b5f0705488676069837116e6a8dfda9b58d58300ec5de5d5f94ab6b16404d39cb0f2 WHIRLPOOL 1efa19508137a884cd709c1e1c8bc6436d26cd8d908370a0b3e7b623b84e087862ccdf4d0689410db19b5d5d37a8e000325e4755a70bda2dc94a929544a83d06
+MISC ChangeLog 1819 SHA256 01c6f25b5e3fb0836ff13d944b79e2a5a07c914d0391d999565b78b342296bf2 SHA512 1b6ac735959888e5774fb9791a68683235b7440958c70b393e8441604fce619542077979b08f58b670a325ddd7a8db6454745d8b9132987f562813a858d470f4 WHIRLPOOL 3b8b1adf0ca617c5ddc33e15179fad42610432ecf6c7ca1db4a6d4622f1b4b2c15288b4c03ea312ae02ccd5e88cede8e8cad4755071f21c2166df69225fe7955
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJiBAEBCABMBQJTLd5BRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7GmrEADGspcB56zxIgOO5POd2SyAXeCPCIuhizwmgBZHefkWBgO6zLk6afSttJW4
+gcalZduGVLGPgNyjLmPaVu6fk3WMnStWkZNI6Dp2CdW9qzZEd0E/ax6160bFL9XC
+5DWOS3dwi++QY8LcPT9L81+5MBnhFgFCFnRCgkQBCGIvN2ZU0s74b81nhK8K5fjG
+a+eHr816BnocBpjUH9tJk3Afbg8P8DUtdo/I37QsIKhp4rJpSXgP/5iEUAm/dIJy
+v1Lhs9F7K3C6oalmprH6bEiCOB0KXSvFDLROZuzJ16KbC48ZAt2szlGI4QegEj6k
+Hjf92aLdVYO/PuKLl5Iejibc9CpqExY77RTQp9rIcG12Ip5Gh1PzjToIF8Qner7r
+S9bc7FfFWGQ+A64qhk5GEpxy3OGmvbm+yrR5KsUYQCJvt/NYL7gcEuPXni6kNQVT
+P3IderwAbnMJf7I1HlxVRODf2Roz52FRzf9iZtgv4BOCRuQIqdduysdeWmYsioks
+q5ATwpc9pZWm9DkS4+WeUoc8a8zY1ynhgMnZni0kFFDg9mdMHzl3A2kLJl53ovok
+vQAtbIqxJn1li84OZx06YWE9s7hzzdv4Fb7NcPqm64IftZvtytE4R+4BG2rkZq+h
+e6dDknq3re46aiPQQgVMN+v7NV6iz4rmitlo9RmQsZYGs7CfgA==
+=TKhw
+-----END PGP SIGNATURE-----
diff --git a/dev-util/mock/files/mock-0.9.10-chroot-fix.patch b/dev-util/mock/files/mock-0.9.10-chroot-fix.patch
deleted file mode 100644
index bb24a3b20dc9..000000000000
--- a/dev-util/mock/files/mock-0.9.10-chroot-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nutr mock-0.9.10.old/py/mock.py mock-0.9.10/py/mock.py
---- mock-0.9.10.old/py/mock.py  2008-05-20 16:41:20.000000000 +0200
-+++ mock-0.9.10/py/mock.py  2009-03-27 17:40:15.223434449 +0100
-@@ -522,7 +522,7 @@
-         try:
-             chroot._mountall()
-             cmd = ' '.join(args)
--            status = os.system("PS1='mock-chroot> ' /usr/sbin/chroot %s %s" % (chroot.makeChrootPath(), cmd))
-+            status = os.system("PS1='mock-chroot> ' /usr/bin/chroot %s %s" % (chroot.makeChrootPath(), cmd))
-             ret['exitStatus'] = os.WEXITSTATUS(status)
- 
-         finally:
-
diff --git a/dev-util/mock/mock-0.9.10-r2.ebuild b/dev-util/mock/mock-0.9.10-r2.ebuild
deleted file mode 100644
index 1d2306710c6a..000000000000
--- a/dev-util/mock/mock-0.9.10-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10-r2.ebuild,v 1.5 2012/06/07 21:35:09 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils user
-
-DESCRIPTION="create chroots and build packages in them for Fedora and RedHat"
-HOMEPAGE="http://fedoraproject.org/wiki/Projects/Mock"
-SRC_URI="https://fedorahosted.org/mock/attachment/wiki/MockTarballs/mock-${PV}.tar.gz?format=raw -> mock-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/yum
-	dev-python/decoratortools"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-chroot-fix.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	enewgroup mock
-}
diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 5730e9b12fa4..53aef2ace46a 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/nsis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.44 2014/01/26 11:02:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.45 2014/03/22 19:03:27 kensington Exp $
+
+  22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -nsis-2.46.ebuild:
+  Remove old.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> nsis-2.46-r1.ebuild:
   Stable for x86, wrt bug #495676
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 14ff38e0a870..472fd0e30ed9 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -6,23 +6,23 @@ DIST makensis_64bit.patch 18743 SHA256 df6377f0e21ef585064c3dd999550e1aef9df8c22
 DIST nsis-2.46-src.tar.bz2 1499014 SHA256 f5f9e5e22505e44b25aea14fe17871c1ed324c1f3cc7a753ef591f76c9e8a1ae SHA512 8716cf6dc086d8b9eb3c707b3a65790bf2e2b41116243d86243514ec6b2db7c508dedef027863bbd6650b21ca5f94ef7dd6706fe14ddc151c4548ecb15858ee6 WHIRLPOOL d716a7b78b20517dff420f57ff820a5aac4654d77a3a0760ee7512aff12d9abbb8be20da888968b151571363ddc1b8c3b02cc7e51784c95ab5169b8a1ab424e3
 DIST nsis_w64-mingw.patch 10378 SHA256 e3fe5f5675ac3562ae67283914f5ecf83f313e9127a406477f04c2aeafd945d5 SHA512 b8f0f7151a53335a5b3bf49ef2a16d805642c43a238afd424541be7d64a1a543ded28479ff503da84591b358f5f71728a815b704a083b94997cfbd5246b6f2b6 WHIRLPOOL a14e5168550974947d4da50747b7dd9893117c0b6dc981bdcd8c0fa053ead8d5a61c8317e18bf9f81a10c2b2efa398c3d40a3da011cc3c3dacef241f5aaa622c
 EBUILD nsis-2.46-r1.ebuild 2972 SHA256 98832a12bc2c9a6e799e2e5598f24f6c6f39b6b9b2582aa7890dad340769a42c SHA512 1df9010d33443e5ab7972136a7118b720c05791372426d13984d17f1174e362def72c3342992cab9d014a354be6682ed4eab95c60e79c16fcb25bbc85f6dd938 WHIRLPOOL d8f9377b40c912c89f6fbdd3a21893853bb2aaa3a989f988bcc8b2b57ac7ea56b593222e102306862bf4fd202c24b1953d6e8b8ad02b11d806872806d0dcbf8f
-EBUILD nsis-2.46.ebuild 2897 SHA256 c875eccaa126d266df2c769baf8162f871d73dbdd075b12f6f424472fc6bbf18 SHA512 1571feffba54e28c9fe0babb400bf0ecf5db233ed830b0ea7251732ff4393eac3b8fe174ee8029316661e1dfff5f10edddf2a22c238505e056746e7f45543f97 WHIRLPOOL 0f88d059c1f698948238d4ed59974ec960e54273cab6fcc70ecf8b2cb9bc007ad82de3c53c10af13b5adc5dc390bc584621c6a97768421562f5f71dc9a0acc36
-MISC ChangeLog 6048 SHA256 c62ed13a2659464890b970507b07ce061760fdc22c4d33efeb967fc6b6d7a258 SHA512 38324032f09cb7c9cdc009dfbb9bc1daba38ed3430850d4ca39a5aec683d6a4420402443a4fdc027b741f775e79f94d41cb581aa8ff6e25fa68f15f43fedfafa WHIRLPOOL be7cccff04a6e30a058f1f94ed7afac374dc1f980e071b391822c033230c3973629a64e2918ac646a274146302586ae4546e978bd5141ccb9aa46abdf64eb58f
+MISC ChangeLog 6145 SHA256 4af2184c30dd72a31e1f30318655ebf6f9ef375f21c79862fc3fd5001aa9299b SHA512 8d418d2db9f55e612f9fbb09944dee52413cb030d488f824c631a2d3f7660bcd2e1baa2926cc066512d607b84847cfe0144ef3198c9b52534ef7c482445e42df WHIRLPOOL e8bcc2a359dce7a56d0a83737c442a8eecbdb4dd1b27ea976fda791640b8f28ba4cb06e0b4b1d3c30c283ff164fd6f7d3abe8ba8a06655e7f843c0269c3db3e5
 MISC metadata.xml 883 SHA256 986eab9050a01dd8146bf8d956c5e4b0298054d3f592135653bade4cf8a6eb19 SHA512 28cee7b7069341b298d9111a288f8c7bd60df69adfaaf7706811ae7cd9f3d2be13dec85adfd94d23dafa511fbff0ff699dcec917a5d251a999882d965e0ff61e WHIRLPOOL cd1dc3da64c57e9711cec0b741be2710b1c360a669cd76f3e800d3f7d394607a82f3daf8e370684f67b4aa8584d0b6971e5c1aa10111722308840932a715830e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5OtXAAoJELp701BxlEWfWyMP/1FbG32viQfMziUewsSkA9Ka
-Kd+OdzbwmWyd+p8oKl/Sll1I3+T/wXw5FNW7HbMt7RcNBPCNP+awZZD5QK2kklnB
-xJgWOKUf3oJL8yBXNp+7pxDXjCqUgceKkkb2pa38jXEFZwWE1wLbDjHo/O8cMebl
-MxbONSScS+OJMaaVf8atILvuOzI0B/YWmfqoac9VxzRHufuQ56EXrll//mRGuPAJ
-ZNA12DfKWe0ztmJvCLin8wWRJ1XkWBcAe77zS2pBiJgQUoJmh8vtHILbJu9YprMS
-BdF3jR6aDOXPTGkpp2z9er6AAm6uygBHsz5N/dpvrcInckuZirnf8HWBQmpG1lar
-o5vtP7e3nAsn2db8/cZBvErscyoigp1mD8jboAQ1wo1ok5nFCFgR/TdMQtLuWbtV
-JQuUT6MTkmCuOaLxb5LNsTPYVETm4Nrf3GlX6wontjGJlLSeeV8lKexqAc53YNWm
-6v80x3qj8N0zqSDS1LTZnpkVGL8hprFxAAvbRq21HkgPqu7ZwdQD5ZK8lzF4i4/d
-56krDbTpWTkc7SQi8SwGikWEoDyI5GPTfArwvb/z5Ncfz0ZWqRV6kqiM1Vpe2sUG
-YJFH7KZJ4lY2Mkkrk9AhbYRstAmdufZT3dq1VGx+eXwOYVDowSJTg3OQPAsyDwtx
-9URTJWAkDTIFzZDou9Ya
-=N9Zw
+iQJiBAEBCABMBQJTLd5/RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7EujD/9oDyCgfY5/Imc6+OS1edBUJyqIxaGQ/33Vsyx9F6tJFZwoSSM4OblfDeYq
+PPOLiBXcXXtULLSkatXKbxAt2igDVsxW6fQVZ5THHS+TzwHWzajQ8QzmiDc8444H
+Xu6hvZ1V69mduHPUBqxHjKtIYVyYGN1Z8pGXbmsCHX4PvohQ+bKbPdUABq7iWYkx
+nGOFE7pYbERRGKFwlqbaAHWIrWL2QO48UFE3MoyLSlczNnYgVCTprzJrTLhNSyyA
+er3Lo9nS7n1IcFzkDuIOamaYvJN3ZwaE98zTplClD1K+PX8VNDAKvzk7KLlTAlTb
+XGd39nA1eQScwbEfwjECbdA02QpPyivNTCC7f+nzqvuspcbpyFDUeCJzfc6CsO1Z
+445o4xg7Bs1miSviFqNwa06BK9pSXVSz7UhD9E/8+GCrXx6uHz2Lfvmcp83KVnXA
+R8I7TgWOiqFKySeU1B0uFHqoyDXZhiv6qZVfQdLs9wR646ZslKTpum0l+1OZqlnP
+i7OJC5jUgtoGTB/pfcauGkrf/e8L+v5K8bukhhycF4myEcybFJqcA5QI3S3wEqyy
+cwtA2Xkl1/Eb0Pxu9u8br4KBHIV81+CutFaRIwfW6zNcbPguEQSGbEuAbEn89ar7
+Fcw55eIl0SLIGnlE/VEueXPGFf57Sc46EHOUhWJ1J9CVcq33gQ==
+=7jdN
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.46.ebuild b/dev-util/nsis/nsis-2.46.ebuild
deleted file mode 100644
index 29bb061af6c7..000000000000
--- a/dev-util/nsis/nsis-2.46.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46.ebuild,v 1.4 2013/03/03 12:10:25 xarthisius Exp $
-
-EAPI="2"
-mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-}}mingw32)
-
-inherit eutils
-
-DESCRIPTION="Nullsoft Scriptable Install System"
-HOMEPAGE="http://nsis.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="ZLIB BZIP2 CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="bzip2 config-log doc zlib"
-RESTRICT="strip"
-
-# NSIS Menu uses wxwindows but it's all broken, so disable for now
-#	wxwindows? ( x11-libs/wxGTK )
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-0.98"
-
-S="${WORKDIR}"/${P}-src
-
-mingw_CTARGET() {
-	local i
-	for i in ${mingw32_variants} ; do
-		type -P ${i}-gcc > /dev/null && echo ${i} && return
-	done
-}
-
-pkg_setup() {
-	[[ -n $(mingw_CTARGET) ]] && return 0
-
-	local i
-	eerror "Before you could emerge nsis, you need to install mingw32."
-	eerror "Run the following command:"
-	eerror "  emerge crossdev"
-	eerror "then run _one_ of the following commands:"
-	for i in ${mingw32_variants} ; do
-		eerror "  crossdev ${i}"
-	done
-	die "mingw32 is needed"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	# a dirty but effective way of killing generated docs
-	use doc || echo > Docs/src/SConscript
-}
-
-get_additional_options() {
-	echo \
-		PREFIX=/usr \
-		PREFIX_CONF=/etc \
-		PREFIX_DOC=/usr/share/doc/${PF} \
-		PREFIX_DEST=\"${D}\" \
-		VERSION=${PV} \
-		DEBUG=no \
-		STRIP=no
-	echo \
-		SKIPSTUBS=\"$(use zlib || echo zlib) $(use bzip2 || echo bzip2)\" \
-		SKIPUTILS=\"NSIS Menu\"
-	use config-log && echo NSIS_CONFIG_LOG=yes
-	# remove the following line when nsis bug 1753070 will be fixed
-	use amd64 && echo APPEND_CCFLAGS=-m32 APPEND_LINKFLAGS=-m32
-
-	local tcpfx=$($(mingw_CTARGET)-gcc -print-file-name=libshell32.a)
-	tcpfx=${tcpfx%/lib/libshell32.a}
-	echo \
-		PREFIX_PLUGINAPI_INC=${tcpfx}/include \
-		PREFIX_PLUGINAPI_LIB=${tcpfx}/lib
-}
-
-do_scons() {
-	local cmd=$1
-	eval set -- $(get_additional_options)
-	echo scons $(get_additional_options) ${cmd}
-	scons "$@" ${cmd}
-}
-
-src_compile() {
-	do_scons || die "scons failed"
-}
-
-src_install() {
-	do_scons install || die "scons failed"
-	use doc || rm -rf "${D}"/usr/share/doc/${PF}/{Docs,Examples}
-
-	fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${PF}/ /etc/nsisconf.nsh
-
-	env -uRESTRICT prepstrip "${D}/usr/bin"
-	src_strip_win32
-}
-
-src_strip_win32() {
-	# need to strip win32 binaries ourselves ... should fold this
-	# back in to prepstrip at some point
-	local STRIP_PROG=$(mingw_CTARGET)-strip
-	local STRIP_FLAGS="--strip-unneeded"
-
-	echo
-	echo "strip: ${STRIP_PROG} ${STRIP_FLAGS}"
-	local FILE
-	for FILE in $(find "${D}" -iregex '.*\.\(dll\|exe\|a\)$') ; do
-		echo "   /${FILE#${D}}"
-		${STRIP_PROG} ${STRIP_FLAGS} "${FILE}"
-	done
-}
diff --git a/dev-util/synopsis/ChangeLog b/dev-util/synopsis/ChangeLog
index 391ac8096021..9d5e3f7b90bf 100644
--- a/dev-util/synopsis/ChangeLog
+++ b/dev-util/synopsis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/synopsis
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/ChangeLog,v 1.17 2013/09/05 18:40:36 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/ChangeLog,v 1.18 2014/03/22 19:05:29 kensington Exp $
+
+  22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -synopsis-0.12.ebuild:
+  Remove old.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> synopsis-0.13.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/dev-util/synopsis/Manifest b/dev-util/synopsis/Manifest
index 028f12c005b8..016a52647a6e 100644
--- a/dev-util/synopsis/Manifest
+++ b/dev-util/synopsis/Manifest
@@ -2,28 +2,25 @@
 Hash: SHA256
 
 AUX synopsis-0.12-gcc45.patch 482 SHA256 2ded05ad8072673f36e49781b84a29947c2a42978b0627355e23c0421470b8b4 SHA512 bccb0c6975d0763bf29f08de86349cb41aee1843e08201c7cd22455daddda1c9d419ab39ae67348d0566ae681fc1f90f777d3756b10e0fad2f72eee5fc213b9c WHIRLPOOL fe5ae542a745218262a81b73a79ddc2d6d40e9d7996adea570d25a7b3f4f827ae212defc63c6f07f67d18cc76b59710c020032ea9b3b881b0f75e8a5fd464446
-DIST synopsis-0.12.tar.gz 9849309 SHA256 42d3c63e31e03afa558bdbab895f6630fe7fee2612bbf52fdfa9b959f36b1110 SHA512 15e368a4d290d019bd21f12af51ef61a7133e499626fe3b59316a2490e366267500f8e7a0239c4705dbfcfb6e6390017ab39fe42b24a52b25ede8f1f7c19f160 WHIRLPOOL ba27bd3969d8867bf0024fef2e33a571a1786ab5fe7ed65ef42cb44a0700914e2ebb108d46c3eaa02d506a20deeb577b2573de966b148c0bac61f35d778bc2ff
 DIST synopsis-0.13.tar.gz 10691494 SHA256 8a27f39203d828ace4a122b8bdc4f98e3746af724f88a0d75e1380fe736dbe5f SHA512 cdd84f4b9fc8a7b0edaa017e7a332bba06cd4fc804c49b84b1558a84e814e3a8a4b8c5801a8eaf149e6475dbacbb879f04ade57e31d660dfac5e0c83887abd54 WHIRLPOOL 0198437a19b8871428ddc1bcbbf01cad3b9e660cdb577f48c3542fcffc2b31acbb92ef5938b4e2d4a0404c5db85de9915772e953b93c45505fd8341748222aea
-EBUILD synopsis-0.12.ebuild 866 SHA256 82e7d13be8dc8ecfd2e06613f37fc7cb64f4e6d6d3341fecd3084bdd000754cb SHA512 195cff7144b5ab10dc46471de7205acdc17685a8892411134024fb51a9fdb01d61dacf77a9c2340915e05bb4052c20becc35e4eb774467bac1e2246c4d31a0d6 WHIRLPOOL 34a27f068e23e720cfbc4c055e07fa22ef1ec48a0ddc4d7db4630e531dbe289f7cd2e755726623be9f2143862cd6af852e6aaab2900c0c3ef6d6196778ba60e8
 EBUILD synopsis-0.13.ebuild 1352 SHA256 c14629045804fdd139587cb6ae513629d086667d593d175357d69afedc3b94b3 SHA512 a2cd4912f88c060c7ee5d8896c04fe76739b034fb0c4e7a8d3dc87011e75ed1c9e00ab5c6ae7ef54873fd3c640c3ddf2d8b2244a93867c899bf289201b5ec8be WHIRLPOOL f60eac3454c9b0e5c82c7122004a5edb8aae74ebfd14d937fb6c029dcf8b045ccafeccebf5b79591abf96e0ea0525ab13a1a09e2f1e439126058c2f5f2033082
-MISC ChangeLog 2228 SHA256 b841e6e30f488ba37193fe281aab27b1cad9e4cace19f72ceef34ca108590a33 SHA512 69b586756fed27d3078b993ae0340d8803f5d35773639ff0ebf8e49bf3860e2ae280765f584fd44c536e03e170c705f18af997c25b3026b749965fee800f2e6d WHIRLPOOL 45984b24f1cf4a08dce22ef28086129d3147c0079f3e0f2271fe10b224017443a1b352de4ed95e29b1ad3293c8e3b11236e8a8eb2075c951353b20978461478c
+MISC ChangeLog 2326 SHA256 dfd021c8b49ffae506a775f16ce1036d20268db4d90d61f04c3154f81cea5c6d SHA512 89b9065204e2faa09c6923dea91703fa8652c68d383d4c859bb6e6a1826f9b799107ac702940d623e63315017b2df183c5429c288d98c47cd7ae0d07a8bed3a7 WHIRLPOOL 2d07121249f4241f4a48a3dd6b1bc221bd4d18695a81f6ddd3f87a91d358d8051eb6d39da54886220db99da11b5f25ab5097d5222a1960d07aee95d956580d08
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNBOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcKAP/2yT4ung5sMrEdkpRB3Ugynu
-HaDvHft8OdQX6u0CJ3bJcL5/QHk+fI3OY5NxYHn4bNADklVMtEUH7o1sVZ9CGE7q
-Ex8Be3/GR6is8hAALTLyuLMWxyOPTtvJPfoTQkQojWyGvCoToawN9/LLPXs8CtzW
-dd91s5CG3OUELYlS1SrTdTfChcmqIVh80ghPkxtbugZBvUocGfhvkhjCi8mbEozH
-+uIHCOZlApr/iKC+a6yPAjZbVEhP6rReR9UGdC0V3ccpwjW4ELnPhPXVQgUE2bxs
-zvR0YGSwEtW2X1UzbteFg093sGV0illu/7PlL9k0JLA5n4QMP+sZdzSmmxOdTRgS
-MOEosPh7bE/gpsdMWKUWtZ6rCKzDzWuJPP962Z95DFiH8XcPzNJWXF4wQ3SkPjF0
-xpkSQOwoWex4/RRGcvcTaKiLi7wskNjlfxfMzzed7YcbB5dlo/eJDYA1DcPWNmIJ
-Y4JMfs6/f5iihzTqK+ChdzDrwkDhjvNvzBMQ40t+0lrSbLuFjc4LKBLcnPVsPK+l
-17O7+mCb0FcpJO2jBqk4f9As6d/bKH9IKc6YBtOX2HRQv4jvozzIDUzzs7UZJUhA
-+uXqKz2PA44Vv55MLr3c2RuZJfZF4jKNW/UbwuPYeeAO2Cf3Ok23mxMffax79gOr
-75qFLdwKWeL+86RzHYfc
-=mjTV
+iQJiBAEBCABMBQJTLd75RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7MBfD/4ijQHnwjjdtkwkwRppglDpBEbvBy5skZFBYzEiMr/iumJj1n3OKz4gaLpo
+XZG/8JscGB8eK+z2YrS71KhVf/BVwr6o4i+z9+/s1cKDyoC0JIXRhBCyc1YVrbxT
+rBHZ7ZMfrkCXAMV3UfvF4AckXQJbpEvCNRC0FApOFqcVQPgUp+GIm0xmPLTfvDDq
+SFuboxK8Xj59k3OHg3jLC+lROWcA7pYdmQ0c8pvxa/mbjCqCQTn/rUl1g3huQsmK
+4BxxNkk74/3+KhjK+TM8bIEDuOclQ+uZS1+Oc56PwnFOrJzFF0Xmt1G0HCzwvwOg
+PA5rGpMdzqkUIiNilkpSnZHpZ3t39lF5x41Qe2uRhjIG3NRRg3nzWt10owYtlGMm
+FM84hyf0g+0phi9AlcoeouXgUtKRafk3zxNS6GnbHovmfP/FBrUJkiJPE1+B2ou8
+FoQu0/8JiSl0RLrqCOnMSwzk0YUdu2ODuZk0r75J/G1YtnoWlhu9ZtAY0O065mpT
+1HYanIz6Ez8GoMfPTLaCSsD/M6qzMcuxwyqnVBN8d1Fc7dwJsOop0OUv9CI1KGfQ
+ONagBLaEJljvHjs10jLsIpsU0blzSTNvIkUHlEgyY2aMXxP3w7vX2e9X/XZ8LhXk
+WKxsO320eRRbViD6zY61P2Ixt5N+EP5G56Dvfrfvc0613S/7jg==
+=oNfQ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/synopsis/synopsis-0.12.ebuild b/dev-util/synopsis/synopsis-0.12.ebuild
deleted file mode 100644
index 8dce8d6b761f..000000000000
--- a/dev-util/synopsis/synopsis-0.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/synopsis-0.12.ebuild,v 1.3 2011/04/10 21:14:49 arfrever Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-inherit distutils eutils multilib toolchain-funcs
-
-DESCRIPTION="General source code documentation tool"
-HOMEPAGE="http://synopsis.fresco.org/index.html"
-SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="media-gfx/graphviz
-	dev-libs/boehm-gc
-	net-misc/omniORB"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-src_configure() {
-	tc-export CC CXX
-	$(PYTHON) setup.py config --libdir=/usr/$(get_libdir) \
-		--with-gc-prefix=/usr || die
-}