Remove old.

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

36 files changed, 63 insertions, 1235 deletions

diff --git a/app-admin/apg/ChangeLog b/app-admin/apg/ChangeLog
index 0d941d59f360..88b2349bff77 100644
--- a/app-admin/apg/ChangeLog
+++ b/app-admin/apg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/apg
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.39 2013/06/02 10:51:28 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.40 2015/04/14 23:30:06 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -apg-2.3.0b-r4.ebuild:
+  Remove old.
 
   02 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #328951
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 61d4adbf0e41..c64c26b65189 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX apg-2.3.0b-cracklib.patch 925 SHA256 fbe7c7761187b358164bc768ab57475d2662bf855d79f285af92de15e007b3da SHA512 19477c54c22d2fff712a8a5822bfa11fbf42a55a27a18eb9d6bdbe38e3c388342bc36f596d4c2e03cfbdb9c4a4c6a35b519b48e909602332e063e41c906889eb WHIRLPOOL 9828271de5f5837180b879d78a2a60da07fc285b773669c650a81dd3a7552ddacadc7cc02b2797966065b1ab99b147ae8e3f91412b7c14de4ca18c861aa028d9
 AUX apg-2.3.0b-crypt_password.patch 836 SHA256 7d2946a8b67bebf3f53bcea86164b9259596b2625f5dd6302d49acebd3defa03 SHA512 3696ea5cf3ebadd22daf589ee708e1472e6f0d7e569cc479b1ea4e59743a31aa484a254e4c02d908996faab624999db76e443f74dccd2117fdab44e1e7fb8580 WHIRLPOOL 351334be1ed3c50031ec1fed7692a83543c6622fa987e55a9e0001b5a0a62dded902bc333c073d53ccc7d39ba9d578adecdb9f772e4a42de21c7f5f38b1ed157
 AUX apg-glibc-2.4.patch 261 SHA256 2d9e4deff463ba2419fea45d9942309b6d7ae5e3b32ceb835715bc98791e23cb SHA512 c7a3f388b5132d21caf6d45ad0c987bb9511a9fc4edd9e7f75739c270438d436159603b4eeb554bbc8cafce3329d01b66d11ab6e75f43b8bd2de57a31bd73bf5 WHIRLPOOL a4413d709f2b6badece96d9723cc5f65503b1418b8498880cec90f34a360e0227e129eccd80f35af1f904b17e9e6bfb4cdf5809e8ef67e99bc96093aa9e8e563
 DIST apg-2.3.0b.tar.gz 109995 SHA256 d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92 SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a WHIRLPOOL 519b9b9137db3e3009d91ca9ab0b0e782c4840aae7b32b3aed035aebdb9380091b82169c9c6bd37829464792dc686219b70403c88b029b713278e7bea7f105d8
-EBUILD apg-2.3.0b-r4.ebuild 1316 SHA256 3cb336f76c469b9636e9a72a4f5cd7ec558f5f0e6a429109dab25b5c65e925ea SHA512 ee779f4b319547fde382eeac4a0bf096f8042a0e303b1d902223171ac5aa81593d51b1a94c9ff6e130a693a91201a73c1f5ff1beeb0dae3771b4b46babe76775 WHIRLPOOL 666379bb249f8c100df7403d547ec5e95dfc428706eda30b3d474f611f889c3873bc23e91b6ab82e3d925866b1a556eacdc383cc4a3157f21995a99722018c27
 EBUILD apg-2.3.0b-r5.ebuild 1464 SHA256 177174dc43c70a26e85bed6a53639ea321982097346821906cc2f27143d48022 SHA512 e8353e9123c15fe5197ac7e49acab7b832231b010aa1e5238999cae0fe778edecccbb8e6a4c0a1f4b5a65477193c010d920cb3b47f04bddff19265079afe1a90 WHIRLPOOL a23e75ab361ea5e89fa693e5b1da0f5f88c8be8e44b4fc6775a6bdcef36f3865a027cbb8be2ef0e897ec2556390dba84d53f5793e87897477a19c4d9bc2ce7b7
-MISC ChangeLog 5333 SHA256 f19522e9ef69686cbe3e7df2009cbb3ccb77ca928d1805d46e93bd3f1ca93a50 SHA512 93ef658eda050fa37f4e7a07378001acda753a7e0a0a5f54bd453bfb70df125642e49cf258d606a510f7b6f6a5ec27d5c664a6a83b462ef886abe8961edce207 WHIRLPOOL b35d63eabcefa7bb80a82af79bc4d4763b71b214c7cf1cdd96bdad2c7c2bc84a58656b27204de3043cb6651f44a54d955b8a753a91fce9de76f66b812cb0fcb0
+MISC ChangeLog 5419 SHA256 7d9454f457f19f065530cc6d62463cf57dd24c61a25bf9494ead6a48a9258d5a SHA512 6abb72a351fdea04d9876bbac07c632ea92b1ed2ee9a03ae60a8dea3efd80d31c2501d36201ea2658b27fca14a0f0c5f8cf3e46f47f1b4bb453674c4fcbeca5e WHIRLPOOL 6000b47aa29f508ee1bf83a3f3c5adc652cc566d8a00aefe3dfdb78e513653d693dc113fce672e7e0b2370e491d4a75bc510c753aa0de7352c5998d749e58f16
 MISC metadata.xml 477 SHA256 647ddaab557cf7e791d831a8c9edf24fc319737a90b278f5089a9c35be34fa9f SHA512 c03258e98b2a483623287710a7db74665feb11a82297f652e4ef5cdf7647a9639f5e0bccb6fe337dd46d69cc994f776e512085c2d5a6a00e2d9b58a928a99cfe WHIRLPOOL 5986148ffaf9f688c0053a5ce8b93969c1c5d014b038a6249c27638c08176c6774d422a225f9f8c4903ee092d306b01708fcd66821f07b2aadec23b64958780f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlGrI7EACgkQCaWpQKGI+9Ry7gCfZ+8IegWUJrMn+baADj8MvuLQ
-8G4An20Cp+cVw0QBpIsKAtc+ykO8aqTU
-=CVJp
------END PGP SIGNATURE-----
diff --git a/app-admin/apg/apg-2.3.0b-r4.ebuild b/app-admin/apg/apg-2.3.0b-r4.ebuild
deleted file mode 100644
index 7eeff9238c1c..000000000000
--- a/app-admin/apg/apg-2.3.0b-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b-r4.ebuild,v 1.6 2012/12/07 19:00:36 ulm Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Another Password Generator"
-HOMEPAGE="http://www.adel.nursat.kz/apg/"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cracklib"
-
-DEPEND="cracklib? ( sys-libs/cracklib )"
-
-src_unpack() {
-	unpack ${A}
-	chmod -R 0700 "${S}"
-	cd "${S}"
-	if use cracklib; then
-		epatch "${FILESDIR}"/${P}-cracklib.patch
-		epatch "${FILESDIR}"/${PN}-glibc-2.4.patch
-	fi
-	epatch "${FILESDIR}"/${P}-crypt_password.patch
-}
-
-src_compile() {
-	sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile
-	[[ ${CHOST} == *-darwin* ]] && \
-		sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile
-
-	emake standalone FLAGS="${CFLAGS}" CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "compile problem"
-	emake -C bfconvert FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	dobin apg apgbfm bfconvert/bfconvert || die
-	dodoc CHANGES INSTALL README THANKS TODO
-	cd doc
-	doman man/apg.1 man/apgbfm.1
-	dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
-}
diff --git a/app-admin/bastille/ChangeLog b/app-admin/bastille/ChangeLog
index efb62bed016b..7321f5325cb4 100644
--- a/app-admin/bastille/ChangeLog
+++ b/app-admin/bastille/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/bastille
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.24 2014/12/09 22:30:09 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.25 2015/04/14 23:39:42 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -bastille-3.0.9.ebuild:
+  Remove old.
 
 *bastille-3.0.9-r1 (09 Dec 2014)
 
@@ -125,4 +128,3 @@
 
   This was patched heavily to work with Gentoo (gentooficated) by the 
   venerable: Bryan Stine <admin@kentonet.net>
-
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index 34054300bffd..1197ac370212 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -1,29 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX bastille-3.0.9-perl.patch 1049 SHA256 c7c6e711fef165698681f65f070f903d2f1b746554b9acdf34897491d65daf01 SHA512 23446f6ca65fa4b164b6dd688eb31a957cf76ce5017c4b74b4bcf402091811e1b2b51a55957c6bf6de5b7f6b7f58a9f651c7f85b760b5d270ec9280eab405dfd WHIRLPOOL 4331f1ba82fff3b2b9612cf70d38bf830d9ac7550656d960d63df51111fa2f44c30c2792d5eb192c9fa70d1eb20bf21bfd129d5b4946dab75d839efac37f87eb
 DIST Bastille-3.0.9.tar.bz2 319045 SHA256 1fd66ef724441a36459d5f937ce76c3bb9f7ccc9584d318a916ff59f709fc02d SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0 WHIRLPOOL 5e2044814844d6779dcdd9d8154696502936a73fd599f630c18ff218b32c75edb094a3c3b50ec496d6db05a0569f3df08f423f65f86ca4de98bca3888aac48b6
 DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 SHA256 91773f8fda6aa67dd87c4451f04ed525965c7408590281b960a3e717ff57880c SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f WHIRLPOOL 624d539d140b540e29e453d178afd23f6ba8d8f1584309852eee2f73c179f1d8e5eb907ddaddc939c4b47a5581400956c7c5a17fb9c039ed54cda49d22144c00
 EBUILD bastille-3.0.9-r1.ebuild 1652 SHA256 15e078f10449e228a8e5c6172fcc74985603b99d7864ea710f448c183b82bcc3 SHA512 f3b43f6960e32014386c24fd12004be989b72196611586e0653bbc683f8e322e9497f641113aec3d946922695f9145b9edfac51576f9e57c854afa77f5308f3c WHIRLPOOL eb565875f1877edb2b50c42e8d747f6f768b24fd6933ca640af93458f34c9ee2344daeef96aedf0a54149e97c0c3268837499804d3482d0bda96da0e3c3fc82e
-EBUILD bastille-3.0.9.ebuild 1464 SHA256 710d74cfab1e8c462f7e53d2e23cec48cdb20fff67d047d18a181aeac194f317 SHA512 39b2738630cb248f76516693434aef2add7c3d47504cfdf4910a2441776e14ffd2f6270a96e189dd7b2f1ae9fa772287b131fffc430485b9a434983f5faf04dc WHIRLPOOL 473751e5cb6df76c44d226ab46066db3fc53acbe7f2f9e630e79ee0028fabe4ae00ce35a9eabe3c2173cd58474021dd9f703bce9cedb3ef5594534c5ae7fa801
-MISC ChangeLog 5460 SHA256 de0bdf8dc033ecb967410c472fe7b322806e7f9c8e8df6d1901fd6c8071dc355 SHA512 6f5a83152b55ccbc86a6f173799d8c0d7c03aa3d7dddad75e3a8d8bb0c5211d85c04e7ee8e26009e6db92d4bd80cf45a0c511f10c44a86a3700b669e0e884210 WHIRLPOOL 6f093b999424fdf9c794e468fd30df7b402e80ac76ca2798ac19159ac37aa6502b271026da5aec310da6e57f827cdb931305e6a4a96e2b9653fa22e833c0d274
+MISC ChangeLog 5542 SHA256 c274330d537907e6f6f67aa79c19c27b9d8bd59c33bf3854c40ba66985fb6a7d SHA512 ad3612db12b25c1afd14ab3776648735800e5126095d70bfc1cbeb99baecb6e7659aaaf118593807bb7fbd9d24c5594d4d6a9685d04d24920c1b8417cfd9f816 WHIRLPOOL a7ed90f9892f572106786f8bd808590237e3ff90cbfdbba9b772f2d7ebfa046096dd48c163cb47513a8ca23f619c5aa535711ee7bb38c07791f5945d3fec99ff
 MISC metadata.xml 286 SHA256 9c9c5625bf4a32d33ef611d71174288108bfa3e235fdf1c61ed48f73a3753aca SHA512 395cd5c2ef20caacdd3cf6c92ec36b18b98aad8520d4e3b381923cbe8584868963ecf2e61befc3fb8eafb2cab60593b3db22e374286dfe22fa4b26a4534245dd WHIRLPOOL e8be352bd80754a530113b3bd75610a5a9d86993eaad7c87d0523cd033f192efa033a0360a298b6c7630c3d3d3397b11246bac6023f271e7459de90d3b82762f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUh3f4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcrncP/i6UUnlkn3wAnB6aHHLFjxTc
-UL4zgdEPTxgbF45seqqIBnuq06zccLHfpxuP0S14fAKHJruq6rx5wCw4d3M+Zryi
-ZEewSpuwA/XwtKxXT/jkTEasnC9gTr2g/fwG2qjuvqUReB5GpYfLNlPydsBGR1lA
-gpMaIDEslVbxPVnoxErKFVZ59Cc931g+F0kUf3Ig8e5GHFxaK2/gSvJZvmUdqrnE
-PU0d1HydHH6CxCKGALamPXqC5VdX+9KfjOAr+JRRUksHUDRMmZCMEPjZf8uxHnB/
-/E3iOkDKwZIcUdvLI7EE6gGU11P66X10QucjfBu3KkZTO0kdM27qmoT/GMjkTnsr
-uYR/kPJU6fCKdAbl7+wjo06bgL9IYSRIoVEdrTfnoudN8szFV28sNMSWZ8EKaXhb
-wLUYKQCymvOUkwtso000iCL7toBqWCDBKjONcEtwX7eAT3G4sXriDPOTynVraZEN
-FjDh9ipY+IvvdOxt4c2em7mgNtiZoOBahPTxoM3xPTWVi/JzmBvwiGx/RlkZ+cbe
-yk/YT+E858R9Cnnzn0Bkcan1utO7Y1KhB5YnCeD/c2ECRWJDv1FeXynl/utB5JU7
-KuuZxm0y93HgHpBPLViCYogvAZXzt/XtsmkqjTVvI5oMo1PYnWcv/QCAnTdpITvb
-cLJ846YIpKicxB+/7zs4
-=Mv2s
------END PGP SIGNATURE-----
diff --git a/app-admin/bastille/bastille-3.0.9.ebuild b/app-admin/bastille/bastille-3.0.9.ebuild
deleted file mode 100644
index 6ba1d8fb6c86..000000000000
--- a/app-admin/bastille/bastille-3.0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-3.0.9.ebuild,v 1.1 2009/01/09 00:36:14 battousai Exp $
-
-inherit eutils
-
-PATCHVER=0.2
-MY_PN=${PN/b/B}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.org/"
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE="X"
-
-RDEPEND="net-firewall/iptables
-	app-admin/logrotate
-	dev-perl/Curses
-	net-firewall/psad
-	X? ( dev-perl/perl-tk )
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
-
-	cd "${S}"
-	chmod a+x Install.sh bastille-ipchains bastille-netfilter
-}
-
-src_install() {
-
-	cd "${S}"
-	DESTDIR="${D}" ./Install.sh
-
-	# Example configs
-	cd "${S}"
-	insinto /usr/share/Bastille
-	doins *.config
-
-	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
-
-	# Documentation
-	cd "${S}"
-	dodoc *.txt BUGS Change* README*
-	cd "${S}"/docs
-	doman *.1m
-}
-
-pkg_postinst() {
-	elog "Please be aware that when using the Server Lax, Server Moderate, or"
-	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
-	elog "to set any advanced network information, such as masquerading and"
-	elog "internal interfaces, if you plan to use them."
-}
diff --git a/app-admin/cancd/ChangeLog b/app-admin/cancd/ChangeLog
index 0de2dd721976..77663c78c769 100644
--- a/app-admin/cancd/ChangeLog
+++ b/app-admin/cancd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/cancd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.10 2014/08/10 01:37:44 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.11 2015/04/14 23:40:36 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -cancd-0.1.0.ebuild:
+  Remove old.
 
   10 Aug 2014; Patrick Lauer <patrick@gentoo.org> cancd-0.1.0.ebuild:
   Fix description for more repoman happy
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
index c593ac6436b9..377a496fdfee 100644
--- a/app-admin/cancd/Manifest
+++ b/app-admin/cancd/Manifest
@@ -6,6 +6,5 @@ AUX netconsole-conf.d 866 SHA256 480230a83fade7e2c284936fc8814c07e075d8296e37aa8
 AUX netconsole-init.d 1624 SHA256 0e89a95b572450577ff1192feae29059ebab9caab99639557cb709bb9b0c401c SHA512 98d8f355e6607bbf69bf50ace366e5b868474ddbbc7b68a076bf013b862424b88a8aac3eeb5c4db3c54f3c73c17938a1b185bdc54be185d188863b9d08609ed0 WHIRLPOOL a3b68aa97ded393be32b7c70ca2094d80d40535307f53582812d2f43b99fa7740bc86a070a4ae23d8781d1ccd4397a0d1fcd2e346b473d65462c18cbf05d4a20
 DIST cancd-0.1.0.tar.gz 7634 SHA256 aea21e3eadee64d2b76591d272dcd03c566215b2320d7fef5cfe0937c3ef0315 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb WHIRLPOOL 84e1b6461bc5ae40b01c71112fed9999e590a7cbed54da6850131bd475eafb6ab7830a418a6fc46bf217645ed73aec080af6d4117a9ea97f1b48dad92cc93caf
 EBUILD cancd-0.1.0-r2.ebuild 1412 SHA256 2f4dc7977b638a8f403da6a0447571925735689cb4dbc57ecbd32dafee46d22f SHA512 36ab09fdf09519d550406d26d0b1abb24ab8e28347322db3498f5f0e983da85922f7fcdb72388b26c194304b2246330205ce4d560f233fa66eedff5cebb0da44 WHIRLPOOL 70c21d98a8182493c75ee51fd06c05e71a980a40d26956d619699f73226ec44ef854da5c85d38f636419509d77960da309dabd7a1b21d5ec0d31ab08141e4eaf
-EBUILD cancd-0.1.0.ebuild 925 SHA256 2ac72bb2e15e631f01f8e64146df536907c33abd33cef83c8ed5b2873e6378e2 SHA512 9eaefcdc3c4b5c77c164e575d3e0f5e525571277a804c0c1b9b4ea75c2bb5caa4af3e1c6ef051d759a0661c2ee7fbf9d0f49abb418fdcb74ff8b93498be04dd0 WHIRLPOOL 2580ba87e6cebe57ef3cd7f25044b06590cf89cdbdb5a5c9f666c021e770455126dc1132bb83bd99a86ebdd4b2797600148a567b72c1dbc5f78a63a66b0212dc
-MISC ChangeLog 1770 SHA256 d0d940453d7be9065a5ce54b8c4cdac8d3a09fc3fc85c0fdb426ae0287306bd2 SHA512 512f4fa7cfade626fb01219c068ca9ceacd7eac59e0e139d1e3b8a406ed6e772d34c78d08f6f6623653bea152c5fb681f6ce895c8b5696687534ffe0fe14ca02 WHIRLPOOL 2c6d2ac6a184d98341ba5ca56d4998ddaa44d6550864abe45b34b1a89adaade7e88ebfe74328dd8e0cc4b20f30cae3026520b88c15c1c7d378f0c98b0df88db9
+MISC ChangeLog 1852 SHA256 ca19e23785116140793ca21835c07f27004ad9033c469699124fc85278925824 SHA512 80e279801f9a6c9e61570e33fbe67390306bffbda580432f3b9b7b9952d3fab830332b6d3c8852d8c1d52c61b26ac079044487a9f8ebd099bf1c9b2c62ee0277 WHIRLPOOL 363e3f42498a8671fa56c166dc936dfb91cca860a7cb9ff4cf5bce9c433d99185b92745db8cdf4a3adbbda4f8587633612f3dc6b14a401732db61e8b15b80c65
 MISC metadata.xml 254 SHA256 01e5e65407b8647d4a3ba7fc968e271368b319b1b34a2df8fa891c70099a3e63 SHA512 1e5e169b9f7bbc60a3b0e19a0f21d108b6d5cdea4ab299817c8d157370f8a6a876c901aa94e4c8ef817f91fe53fe4cf029d72931d5fdb15b91b8119dc3d78e55 WHIRLPOOL acd26f78ca257d987fda8fbec98f3a9df754b8470d36fcf137b219760e9cfb5b95656fa104847c8e3cdb5b1f284ad97f3d6924ef8343c763e83f942abbeb9f23
diff --git a/app-admin/cancd/cancd-0.1.0.ebuild b/app-admin/cancd/cancd-0.1.0.ebuild
deleted file mode 100644
index bd92e843d1fd..000000000000
--- a/app-admin/cancd/cancd-0.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0.ebuild,v 1.4 2014/08/10 01:37:44 patrick Exp $
-
-DESCRIPTION="This is the CA NetConsole Daemon, a daemon to receive output from
-the Linux netconsole driver"
-HOMEPAGE="http://oss.oracle.com/projects/cancd/"
-SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	# slight makefile cleanup
-	sed -i.orig \
-		-e '/^CFLAGS/s,-g,,' \
-		-e '/^CFLAGS/s,-O2,,' \
-		-e '/rm cancd cancd.o/s,rm,rm -f,' \
-		"${S}"/Makefile
-}
-
-src_compile() {
-	emake cancd
-}
-
-src_install() {
-	into /usr
-	dosbin cancd
-	newinitd "${FILESDIR}"/cancd-init.d cancd
-	newconfd "${FILESDIR}"/cancd-conf.d cancd
-	keepdir /var/crash
-	fowners adm:nobody /var/crash
-	fperms 700 /var/crash
-}
diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index 44085ade5076..a1189400a23f 100644
--- a/app-admin/chrpath/ChangeLog
+++ b/app-admin/chrpath/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/chrpath
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.29 2013/12/10 18:57:46 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.30 2015/04/14 23:34:39 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -chrpath-0.13.ebuild:
+  Remove old.
 
   10 Dec 2013; Markos Chandras <hwoarang@gentoo.org> chrpath-0.13-r2.ebuild:
   Add ~mips
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index 7a79e6558d65..8bca71b72c19 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,30 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX chrpath-0.13-multilib.patch 4129 SHA256 332b779882707da6558965eccf1ab220781124ff9b879da5023d2efb90b86434 SHA512 45f1a25a7abee84e955ffb13485480efb1f768cb225d35a57fae5fa6a75dac7d633aa7221aad81aa6fef2cf8f27f221dcaee972ad82e70677049f2f2fc6e9ff3 WHIRLPOOL a4fc4f3ea617d930cf3afedc78cdc2c6add3647c2ef53bfd7721deaff8007f5e6ec8fdc6325319286ebe3be39926c3576421b0f1d4229ed9f763763aef2d2403
 AUX chrpath-0.13-testsuite-1.patch 575 SHA256 f780b05ce1bc8b77012bb81dabdbd9ef7487643e767c734275f5d8f915355dd4 SHA512 0969af4defcf4b3650e4416c8d17d747f6a785b6a2f0cdd2105e6ff111c04ecbfc236c073e6f48096494b08c41d6077a332b02104ff3e07e60c542d706f7ef6c WHIRLPOOL 8fe7b3892ab4b7a31292dc70a69c620add39e1b826b2612233a171186f7f70022a5d3d19caef921a93888542f3e7e0b5b2034b5874742294ce34393bd7f0a400
 AUX chrpath-keepgoing.patch 1041 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c WHIRLPOOL 672b65fb60207d4b9325ab2a5a8f8c35ac2082d8cddd3ec03e631558dc0cebc9b1edcfef637b8e85fa8a1a8943e210ad8df234b96f88b1bcae5008365ee434d1
 DIST chrpath-0.13.tar.gz 125129 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e WHIRLPOOL 7bd658095647ef13bbad2e07e14ea3d3b7d3de7bb71c272465701a5430a76ce33639a641f8964194c8a78c181401522d175181da6c73336392e5f8444d43f1e8
 EBUILD chrpath-0.13-r2.ebuild 1342 SHA256 ca541c3ada4fb17ec6883fb8131c38f23c28904ef35e119794615da063603c39 SHA512 034f55496711d951f412d5a28447659d67bd1e684eab60dcf435d7d697c74e71f5b7bb137e6f850cef936f42909a58360b485c9bdc4b3e52af19c5ef997ce616 WHIRLPOOL 1271ef2fa9993e4bff2f53563574d30260ae9d1e59364ded8d0da743155c24e3b9a57179e4121646c82f1ef32e4cab31e68af80d1d4fc71ef73283dd7d8d55c5
-EBUILD chrpath-0.13.ebuild 777 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53 SHA512 2a8853cac93199083f29a1f112896648af0dde83a633af20e93945f2a4ca00147ed5f3845156b4eca10c50efde18b5331f1833f4ad67d14c86afe306aa240c6a WHIRLPOOL 605bc77b087e4f253c5d8c63400dabb675a0fc318ee011051e20fca3fc645891444485f4919caa547f261794c062a9a3db3c3c839f4c33f0823b84887dd25ffe
-MISC ChangeLog 4683 SHA256 955c1b976b4834a3c2885b1992c35fa493183fcfdaf312add31076ad50ebb24c SHA512 09704a6bc4d9284fea553a6dbb95641291223f89f782e537da18e666b4152fa40369888cb7476c94b8bbb5b0f72424ae6a2cb16be50b020ab6482e6a6d7334ae WHIRLPOOL 17dbd5e0092b16550d8f6510205070dda66ea9eef5dfad8abd77e6e61859f652f6247dd5fe2f70f1699102ed5fdb1597261d0a6a5718e826f28df868edfca795
+MISC ChangeLog 4765 SHA256 00098156f3972943bf4094fa78d2554701509df903f89d246ddb9dafbeea8c9c SHA512 5bf27a7fc83e9c9f0cabc489cc5e40e9fed3185a9d4aade1e34bcb4417fad3224452287ee2a5f07c166535fda30497edd00d2c9c187f89a5735af1def9858aa9 WHIRLPOOL 380b6d05543fc0ef267ddae7147cddb58af6aa5dc531b854275173c03679c3de12e855d91a2674ec77a09deaa83850803f786a86957a38f82005c8559ac0e9af
 MISC metadata.xml 225 SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99 SHA512 1fdde313b88da74abee88501d319d418a64ba8240c767a6e5299f2139bcaf88d7aa641afae06b67ea6d39e13efeabd1ec82d747930d023fbc3166cc5107f6ac7 WHIRLPOOL 73eb6a0663c64c5c6968c504bca38cceee546f6996a2f0fdfbd30e28a5e86c21f4fa56121593c32236a7f4508b36712d784f173981605c16398fcf6c0a833eda
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCABmBQJSp2QfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88O9UQAIMWfZgOHFRH70lm+OPCfP/7
-sUSfucwfx91t73u3rE1BggJZkqyHiF61hWZXrAwcVwHZwnTHTvn110XaSdLTnAmj
-rLiPc/1X0kAfrC2FlVpV6F/zTuFq3d3NpYv6LliHUApchfsWf2YTRt3w9UpFBVXs
-dd0n28ZljWdoBYlfT73tZlAM6qjjJHyGIzSM0hURnxteJK+hI8GmP5LpCKOs6S/X
-xWGc4IPEDaWv94uPN59wMPf+MOEwBu2cnyPY1S5yVUcnKVNpPmz70cR6jJv2Bf1y
-Vez0iWPoV0SgkRtL96VoBk6H9V4L2ZpufFn1GXIKVCvdIgnb1wUkQHdQEzngowvw
-ZdYyjNw59U6Xve0nVOeOUZHURQC9D9XnuVxiUjK1xbDMzJJ/cUb8VopwxRJVE4LQ
-LM+bBrb73tQby/L5x1oB2RSPxT/Sg0lZSjg96bu7Vuk91SJIw6IDmfElLVM7SxP6
-Acm62yGDbkFlEWp6YPkXOCRfsHOD/4gG0ZRuY9RH4CF6viP4Am4zb5AOg5twiID0
-aUNjHJEa6RcFDtneKbOZFAY1ybwkbRoN9EY3F5lvb0WpmP/3BhMRtzjpA3q8VErr
-ZIELvn/mTMNPvdSUc8VvOPkFjmg7/u+oyKLSREzUJ5RdX1yw67jbPZdzhUJTbmMg
-fx/eLvEcKBkChA8Py44t
-=kk3V
------END PGP SIGNATURE-----
diff --git a/app-admin/chrpath/chrpath-0.13.ebuild b/app-admin/chrpath/chrpath-0.13.ebuild
deleted file mode 100644
index 8f615a73d78b..000000000000
--- a/app-admin/chrpath/chrpath-0.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13.ebuild,v 1.12 2009/12/07 12:13:28 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables"
-HOMEPAGE="http://directory.fsf.org/project/chrpath/"
-# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry)
-SRC_URI="http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-	dobin chrpath || die
-	doman chrpath.1
-	dodoc ChangeLog AUTHORS NEWS README
-}
diff --git a/app-admin/conserver/ChangeLog b/app-admin/conserver/ChangeLog
index d1ebb52060b3..1ea4a914fb81 100644
--- a/app-admin/conserver/ChangeLog
+++ b/app-admin/conserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/conserver
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.83 2014/06/27 23:10:42 chutzpah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.84 2015/04/14 23:33:31 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -conserver-8.1.16-r1.ebuild,
+  -conserver-8.1.16.ebuild, -files/conserver.initd,
+  -files/conserver.pam-include.1:
+  Remove old.
 
 *conserver-8.1.18-r1 (27 Jun 2014)
 
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 2e6d54bafc13..63df20220444 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,35 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX conserver-8.1.18-dmalloc.patch 2806 SHA256 4c2ce7620fd78d2d4b2fcdb11fbef03eb532124f95dc9653488d6c166fb59621 SHA512 90d3a4bd6fb3a58ece053e4680dab5b24f23c7265e5244f3185b67a143c58ccd2c200c2fccc0a6cec8444ab2895f358138cba05be27119b014187e539dfa78d6 WHIRLPOOL 6f2cc198e2b1d7e335c0f89ec674c0ccd0111811deafda3dbe61708b0621173ce7a51e524e9c3235a052c047f320aa0996bc94d159b11ef52eb112989e414c41
 AUX conserver-prestrip.patch 882 SHA256 3e333d4e3bce4faa67255fc8065c22590b24e812956f8d7b9645ae2788dd4839 SHA512 aeb112f8df0bd97ac3e3b909a42c54d2d16d6d59d39ea10dca9c86d2a6f866ba33c56fca77fb551c706314692469ed668a0158ff04712594192856b363bcb4af WHIRLPOOL 6a6b14c7a85d8bd3fa938792e580a84e31b6c048e54e06a137569a95f5382524d4c4687e01c66e7403d32accf829637e157dd44cd9edaf6523b7b9d4557540d6
 AUX conserver.confd 288 SHA256 1b3986fba9787bfd39c6c6921f4fbe644b048592cd7c2d8a69e73be15cf588c3 SHA512 2f562c2addd765222f83e3e07575d0ecd8dc8bff09468812c6939670900fcc84c05c97ad2a782e72f505330319b88b10a7a09a057960c576f91d1a2c6e1bfcff WHIRLPOOL a10378375c343c0696a5d9c2e2a9fa7beec1e76bf1020d6c1823793b72b4614dc3d9f5d961fbcc571fbcc0c7d8bd975b39e01596f3208f444971c2b5f88463f0
-AUX conserver.initd 1172 SHA256 87d44499372ae77065d7b04640bfb1a3ee138866abf0848f3bcac053f54b866e SHA512 bf3a52ef7411fa4352289f908f34f80a6400177cf0388a1d2ae04f607eefc4b63e7cb67c6705d2227c177269e200d85c52251797a6c4e0c148617f0dd8a4d839 WHIRLPOOL 76fb3c241a0a7d9fcc8801e76f0cb39391622808f367bd14b3cf66c26b830664966e1984ad040ec08333fea7dbefaaaba92f03c28f746c2b5b8218ff93590f55
 AUX conserver.initd-r1 1208 SHA256 892ce145fb85bab091ee7519b89bb258f370d547a859ed44fa041dd4a0d74f5d SHA512 d6b5a864f7626229a483cf468f6f560645cea1f32577e3a3158f695bb40c4a79cfec7a270393aa5aa0f88855eb29a7d295eacbecfaa0eb3c84626af7707d20f6 WHIRLPOOL 200030ad5de7bdeac797b6c60fe51933a3975626998a9abf0862e052991e713003d1ca0da506915c57b8d894457aa7c05e830b08340c7cd32de6fca46b2971c9
-AUX conserver.pam-include.1 210 SHA256 facea91616049551f44655a7f8a270c61dd571e860284abc972fd3430a9b8d50 SHA512 75441a60244060603229f4d6e41501a1250e07845a6763c5d7702740cf657a0d755dfee524b0f5a71f4c5d48a5edb786ef9166648d928c866e158c9e960c958c WHIRLPOOL 92eab67307edb92e72f6ca4aa01ee9800c772f627b30f6ca9e30d59964c116c6de4869018cfccfae5d0073c162b8253e11ed699d8f3940c5da6846d6abf97c0d
 AUX conserver.pam-pambase 194 SHA256 7b1f7770c8781453907b2785c54b1043c8e66202437479c4d9664b71a0bac816 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9 WHIRLPOOL ad118856b14aae65730dc224882d442314b6620df51fae55b000ab74afb744f2f99e47d009c8733e18269915ac0f02e5cdc1bd2a3e0b67f8527ef9b39bbe99d4
-DIST conserver-8.1.16.tar.gz 311373 SHA256 43dc9d81bc23d76a0ec01acd1f54f5c276b715feeb8f52bb33b5c81f325a46d8 SHA512 a1cee166d68836d348fc16118d4d27f1538e6a4de244a689327590a674534d8931558b9cb258f07e6559a0004f2e7709c15c9a296fa708601a5ec4c994d33eee WHIRLPOOL 325f053a2a36a4b0f577c4bfe8fce8a1e3d9f03a7be33ee19419146f1e770454368fc8a24543bca4ba6b1f2ecc4ebf05b1c062f8f52a59e723031c21dc5a42d0
 DIST conserver-8.1.18.tar.gz 323247 SHA256 3c73cebf732419c41c7c860032e41d83c1f152fe3115a30dc9851820b7864e14 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f WHIRLPOOL e12e54f2af25ef696ecf61818da0dd8cd09c23ca03e0fbb8445ee8eca5dc4ec2dbb25e88a68ac4a51c49b89838bf875ac65ac0e59d49337f36aa3929aa02dc81
-EBUILD conserver-8.1.16-r1.ebuild 2239 SHA256 531815617d1d42d99e428ef0edb4993339683b8584147ee6c1e817994713f0df SHA512 4f7311c6c274b36c10d1bb74ec8ba4dc13bf1ce63fb3a18f39e61e18f173bcd4e1e4319eaab2ffbe9acf0905f8a0b032b52ced5d73ed241b9092b510a4bf4de5 WHIRLPOOL 779e673697ebf59b38a3eea7da9aeb86e09b324343433f55b1f50a8e75df5a4d2eaa1d61c3ca4365d7201f13e67dbcfa684419938494064177626cfeb08838e5
-EBUILD conserver-8.1.16.ebuild 2165 SHA256 771daae241f511e9434aa0be7f17b5d4f9320612696e362ba49ecb8cab641b7d SHA512 e85c2534c9b08725386982aa07f4585b3aca53ee86a0d9fdb1a7a2daeab19f71c3b3cbb796b6d952d2f93d2a12463aec5580cdbcc8f4188cdae3e044d69bef68 WHIRLPOOL 1d6296460046e34fafb073bb297ea64bc1aafcfbeecc65930fda2bc1231dd0b9c310505c2d7f15ae9746d76f55f07a11b5d527db0c82ecc0552681dd8c718a86
 EBUILD conserver-8.1.18-r1.ebuild 2363 SHA256 78f330584c712054394593962b27cc0754cc5486118b447e7a61c1d3c2037f40 SHA512 9b7ddfe92a8f060765fa64c34d004aefab8cbc52bab78c9b89896d2acc8667f48ea77426f3eda9dfedabcf8a1f34280c7a338339dfdec069ea2ec1df04509f78 WHIRLPOOL e19294f1395b2a121146440cfa37ef6fd8414dda8039c6e9fcc7d7439075bf72899e1e4e6496be59c34e5d35245fd8d5cc41258c6c669eb12b3c972bafa72d13
 EBUILD conserver-8.1.18.ebuild 2347 SHA256 ee9005a4d7f1a06ae85626990829d45a17a0acc0da06de6e9aaefdeaa1c21582 SHA512 d1fe461e7df72238740f2994c2244cf3564cfe9020835d4d679ac4047ffc87bb08ebd71351346d88128d93fe780d497741125e23380ad145255b93c827ed272b WHIRLPOOL 9a1e8e02e18ec19d79599342ad7ec8d7d031a1bbb362fff1f6447e3ee198a842d1d5292463688cf49422c0dc9e9e1849b6051501b36bcb9ce09c309880df6ca1
-MISC ChangeLog 12103 SHA256 9c49f16c4b1d5e5a53b5c803e3d99b02351ac2e18d5a9b39e1e004ce7b55b21f SHA512 ba84e4cc2d525161362c208b50df160fbd9cce6922286ff5e3e3721121a6a42f836f24df090b00f3d8965cf42ba3e42983f3f411daa6af940c48eda208f80207 WHIRLPOOL ec454fbef47d2185aaf3f56f8d9496939c6fba56340685361acb412db4e0239d69ecd5c88e99eddb4873e7efcec5d420219b00f84aa21ad8072c0ad417edc6de
+MISC ChangeLog 12278 SHA256 f5e72f6c3f872178415492a4ff11035e0128488957685d812b7baa952e772adb SHA512 e0da7f40a9d14b1d6abea24798035ddd8cccdd5a6ef46e8d4356fa63aa575a6cc9094cb60c7be7d00e9210048b56c89bbb187ae3c5a84a6ac65cc19691d8a819 WHIRLPOOL 52bd71a60b3e93b0be2f3e07f2ef0cdbef1fd8a7e9846f61ed9ce076d9bd5f9b17ee350c31e237b5cca1cbfefb9dbf142ad4ceb0e748a2b9c6b29a6fa8dfef45
 MISC metadata.xml 1131 SHA256 7cce96deb69c27bbe02d633a2df7113c2150f5aacad5746b288b3b710e157c9b SHA512 af3272767059cb1a897f13b97d912918fba4f60491d34c6f590a9ce3fd4ef2683b13a455a89b84a1f2237f0c14aaea48c8226f4134fbc205c9ee894a48923692 WHIRLPOOL 385cdb38f2968f765e6c0b2b723e046cb6bd34b1a5bca527442e924356cc37ac553312499b6c42da8d45d735ae2891839a80edd5566fc72a363ef9b765e8b1a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJTrfn0AAoJEHy/RO9cNQiDcL8P/0iq/Y54K8v+YFsM8PRKtqI4
-wpKH15wS2m2zijU8wHoF/lUzAKkBkQAxFG6WgECBnRR54lPkFkbYuhpLQfnpJfWf
-7f0Gt5GhDTL+WVVT/g0ETCw2oakpmRaofCxCRoVejaWWXVNt6QmoZhRanS5qLAWM
-Un8suxkXlz+guDC7hx+PNvCgcEoguRdnqHQdT8MKna/p4q9EVde7GHr/YRP4YnjC
-g/zA7TYxTEYmvuNyiZNC7mjZUVCWK+53VNLWtQLYRNfxL7D5/QSEhNsuwV4TPjUX
-LoHPB7DZrkpatjTDKsk1ctGJTwl3+1ES7xY1HXFw2d4BScndaFDrZXO1COLs83EP
-Fe0yHWq10wZOYeq/bRD1KwtnsgDbYOCtHfcJpixVcYHXEu1iQhrb2TiDBc3qauk6
-d5ASTkcL7wb9Kpc4HF5H/tDHsX/zBQXOpvhGeq0vpjdrpAprjeigtiKVkVGNT7fU
-Dz+qS5XlCWcZg7uGhH3xsPBqOnKMvarRiipjgjYwAvtqsHlC5JzIQvYMH/9Pn6s1
-4AyvT5rP0jpTt/qQ0HL1drSj/VHM29yJnTeNrMhHMV6jLONdP6RT3oO3eEdiGFjx
-NggREf0V/b7mXy8QsnDDHZbsDt8fIoP4ttoq4wZxpMjp1c6Y8jac8wAnPokYLxWO
-iLOgTRxLzXKIiQfNjmha
-=Be7b
------END PGP SIGNATURE-----
diff --git a/app-admin/conserver/conserver-8.1.16-r1.ebuild b/app-admin/conserver/conserver-8.1.16-r1.ebuild
deleted file mode 100644
index fddd4f573471..000000000000
--- a/app-admin/conserver/conserver-8.1.16-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.16-r1.ebuild,v 1.7 2014/05/30 13:05:18 swift Exp $
-
-inherit ssl-cert eutils pam
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/"
-SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam ssl tcpd debug"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	debug? ( dev-libs/dmalloc )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply patch to prevent package from stripping binaries
-	epatch "${FILESDIR}"/${PN}-prestrip.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with tcpd libwrap) \
-		$(use_with debug dmalloc) \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782 || die "./configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	einstall exampledir="${D}"/usr/share/doc/${PF}/examples \
-		|| die "problem with install"
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	newinitd "${FILESDIR}"/conserver.initd conserver
-	newconfd "${FILESDIR}"/conserver.confd conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ PROTOCOL README TODO
-	dodoc conserver/Sun-serial contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-pkg_postinst() {
-	# Add certs if SSL use flag is enabled
-	if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
-		install_cert /etc/ssl/conserver/conserver
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.1.16.ebuild b/app-admin/conserver/conserver-8.1.16.ebuild
deleted file mode 100644
index 0921b2e73683..000000000000
--- a/app-admin/conserver/conserver-8.1.16.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.16.ebuild,v 1.6 2014/05/30 13:05:18 swift Exp $
-
-inherit ssl-cert eutils pam
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/"
-SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="pam ssl tcpd debug"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	debug? ( dev-libs/dmalloc )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply patch to prevent package from stripping binaries
-	epatch "${FILESDIR}"/${PN}-prestrip.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with tcpd libwrap) \
-		$(use_with debug dmalloc) \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782 || die "./configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	einstall exampledir="${D}"/usr/share/doc/${PF}/examples \
-		|| die "problem with install"
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	newinitd "${FILESDIR}"/conserver.initd conserver
-	newconfd "${FILESDIR}"/conserver.confd conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ PROTOCOL README TODO
-	dodoc conserver/Sun-serial contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	newpamd "${FILESDIR}"/conserver.pam-include.1 conserver
-}
-
-pkg_postinst() {
-	# Add certs if SSL use flag is enabled
-	if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
-		install_cert /etc/ssl/conserver/conserver
-	fi
-}
diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd
deleted file mode 100644
index 5ebc22baccc8..000000000000
--- a/app-admin/conserver/files/conserver.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/files/conserver.initd,v 1.3 2004/07/14 21:10:02 agriffis Exp $
-
-depend() {
-	need clock
-}
-
-checkconfig() {
-	if [ ! -e /etc/conserver/conserver.cf ] ; then
-		eerror "You need to create /etc/conserver/conserver.cf first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-
-	if [ ! -e /etc/conserver/conserver.passwd ] ; then
-		eerror "You need to create /etc/conserver/conserver.passwd first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting conserver"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
-	eend $? "Failed to start conserver"
-}
-
-stop() {
-	ebegin "Stopping conserver"
-	start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
-	eend $? "Failed to stop conserver"
-}
diff --git a/app-admin/conserver/files/conserver.pam-include.1 b/app-admin/conserver/files/conserver.pam-include.1
deleted file mode 100644
index 50d360ce431c..000000000000
--- a/app-admin/conserver/files/conserver.pam-include.1
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-
-auth       required	pam_securetty.so
-auth       required	pam_nologin.so
-auth       include	system-auth
-
-account    include	system-auth
-
-password   include	system-auth
-
-session    include	system-auth
diff --git a/app-admin/diradm/ChangeLog b/app-admin/diradm/ChangeLog
index 3b5bc51149b6..5f442c971edd 100644
--- a/app-admin/diradm/ChangeLog
+++ b/app-admin/diradm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/diradm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/ChangeLog,v 1.50 2015/03/08 00:45:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/ChangeLog,v 1.51 2015/04/14 23:24:04 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -diradm-2.9.5.ebuild,
+  -diradm-2.9.6.ebuild, -diradm-2.9.7.ebuild:
+  Remove old.
 
   08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> -diradm-2.9.3.ebuild:
   Cleanup.
diff --git a/app-admin/diradm/Manifest b/app-admin/diradm/Manifest
index 67753fc1592e..c6de3e95c008 100644
--- a/app-admin/diradm/Manifest
+++ b/app-admin/diradm/Manifest
@@ -1,10 +1,4 @@
-DIST diradm-2.9.5.tar.bz2 113429 SHA256 8d189981d0fbd63bd55114f7b1c34f97f39a832fa5093f63be3c403ba4da87e4 SHA512 95342ece8ee79bf846ead7a0b5af0954ebded47663c0325476599252269e1f7dbc72437b69a777d2e02382d9c824838592eee1d916da6199f8982b4df7833158 WHIRLPOOL 91f33d6007a119269ac6ba5c7881a2cdc3fc77076824b7c23c7eab2c4403c605a2d1455b0f705a7db6d9b8a2277470ab73c9af10b57a94b7b0bede939298000b
-DIST diradm-2.9.6.tar.bz2 113599 SHA256 8c316d05a8d5faf73fc9608bb3bfd1c610148c0132f7db80f92423c40ce08256 SHA512 4a6a976cedda306e4eec2478e1fd61a00f67c93b23ca86c701cd10bc32d73ce52a3d0ade97f04f0f2d0cd0dba292e3110ccad35d68a6b34ef9b651412b1a5768 WHIRLPOOL e7d55bbb30e0379d24b5172bc9f156b6d9e8ce4cd42e62116be763b01e00db29b0efd39d6e6192dcf8039ef6acb3fc7e3e713a05128ffc1d819ec21a79a3af94
 DIST diradm-2.9.7.1.tar.bz2 126172 SHA256 0a10f8b8b872a1f985c1f73da0109e8ba5ebde09ccb4760b56e67d4a1b88f2bf SHA512 5052f7b7072cd61eb9c70d23057f6c0d2fa68a151792d7260ca52716c9588c06234d335af84b967df23da4b4a8650502cab3b18900dc15e71f71b0888224993f WHIRLPOOL 31c2b6eaa913aa0a273652958233e0ace3b309063448add6b446a41e48903b984810f0ce668b27efbbca8c558a20a379692a3d7d3997d8481d0dbfe19827adee
-DIST diradm-2.9.7.tar.bz2 126122 SHA256 de3833a8e6632e69245ff248022426e5ce33f14f63f09d8c102e84bb14e2fc5c SHA512 a7aba26d6eff8829b4e2e65e33d030c2373101c5dd526285ab5a79fef052c08e1886204a7d6d2591ebe0807f0f396d189f9e1263de06f37497aa8b76fcae6395 WHIRLPOOL 7f93087282cddd32e3ecd85a9da89dc629b3bd925a12eab40c69a37e7c522fcdbc8cb045be1deea3bcb405e1aaab0e64a0ee38dcdc45acb7944f9a7743989984
-EBUILD diradm-2.9.5.ebuild 2070 SHA256 bf6cf4a4a704f859f24086fe99733a0a8ca403b88da93bf8942f8a65ea1a5536 SHA512 6d008148d590e1ff39837d1b0c048a516c20b2eb479be505b08fd1fe252e05a4ae5648bba537f9a2b6a9ec38ccc35ed9134710b01dc852781364a1492cfe6fd6 WHIRLPOOL 72aff93a48d62cad7f3cafa20870acaae71377ed9f9b15a7a336f297c46c50218df998daf597145778225d55289e48215cac9dd6e4fabcc47d18b1e58727d9b9
-EBUILD diradm-2.9.6.ebuild 1877 SHA256 9c1fdcba192037753912c889b27b33536b4355180d8a9cb5e88f9d3aa3578fd1 SHA512 a39bdf78b757250e1c6f8ac07613dc5fc3263c0ad8cb9de9e000b04d42e3d28295c8de887e340b52ba3e8879d20db3f57344db5aef5c541a48ea88585a5f56eb WHIRLPOOL d86802f79b05b034cf5e2ae6a1b32f804c14ff7a3ebe6aac3f9f7453b76406382f1fc6f41cab0e6df193333c2f07e4120035145bcf6b808b335a2c477ea8f9e7
 EBUILD diradm-2.9.7.1.ebuild 2183 SHA256 5c10a7b66c46769858d841d76f47b10b2db43f5b0e26ce6673927cb337a74250 SHA512 b320ed1e32740b648bf7054e32fd65aab226717c557657928dbf8480e4c3c8e0e715881682478f47055c583a629177c6fc2bd98ddc4d0a798f933db33c8c0261 WHIRLPOOL bf9eab5e61abba98980ba63fc26066c8b1361b7bb10be7dc06c4c3b5eb6c812e56fdd69c78ae4e6763707658a8ff96f85d8c56f5d77c3d2fa7c93be635d07160
-EBUILD diradm-2.9.7.ebuild 1909 SHA256 14422aa01ae94970cc93664f89ed8a47f36b7ff03edddec2807dc4ffaa25381f SHA512 a4beada0b9ff43fa0d4fd78d38ed7c35d1f61fe981d93ffef3bc612118733f152c91f89b800f5ad549bfd0817fa83f0d19863e339ddbe697e1a2ee6e9734b0cb WHIRLPOOL cce1b1c5a0205f65b21eea275a56fcef65a37030ac355782588f5fc741b53c80cb87e6ff7a6f9d7a730f7cbeb29f81375785f120a111b59b19a61408798143a3
-MISC ChangeLog 7406 SHA256 312e4c13374206779a6830cc95a3ff98b46a938189bb98daae5cc68f3ec9f1e5 SHA512 64ef7d5b15b1ce3840d8c77e6708078df4adf4d4542b674615fa26cd92c8096ad5869cb8c0b2ec3aab68fee562a6e87fb6a84423fe0bf000216f1b235407e191 WHIRLPOOL a491e787e7ec9d229701656f06b5812c07ee0d95358f2cc968734ad5cbbffc47b675f55c596369b3e950dd98e35ce427ee5c3c608a24972feba657c10f76ae01
+MISC ChangeLog 7535 SHA256 34044284c11e3e4aa9a39a3cc64214fe2497fe8ebce3385b1c824464319de3c0 SHA512 60433cb3dfde17720c978b32b1e2aa198b4b66e8214c8d5aa5ce2b5e2a440687e0789e505bdd06531e8caf402ff675569d613fa83c9f47352e4ab6e090d342b7 WHIRLPOOL 87cead42d337403e19ff9c2e9c2b77b22ce49e051acbeb2bb957f04644b841bbddb62bbf05b001f91ef151979eefb54b73f349a7f947285a259e33632803ac2b
 MISC metadata.xml 413 SHA256 c4f68195f9ade1c1127ca62be5cc7e969028dfa1662517e6b41a0781f01aa3e4 SHA512 69a020b77a79f6920e19f947d290eb81cf013a5849da6db40d90455ab4f11d32bcc654671da1b441369c6173e861d5c9684d0a88087e4a5ac083e77d011c9495 WHIRLPOOL ba5e4f86ccc4eca097103d185dafda171cb8372e2b7bb1ee5932bbe4b7cdb1f1ad3a3c702b4386832825a0f731c71ebcc1699935078e4e3e9e9369c65533633c
diff --git a/app-admin/diradm/diradm-2.9.5.ebuild b/app-admin/diradm/diradm-2.9.5.ebuild
deleted file mode 100644
index 007d9e5720c8..000000000000
--- a/app-admin/diradm/diradm-2.9.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-2.9.5.ebuild,v 1.3 2014/08/10 01:37:40 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="diradm is a nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
-#HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
-#SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
-HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
-SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="samba irixpasswd automount test"
-RDEPEND=">=net-nds/openldap-2.3
-	sys-apps/gawk
-	sys-apps/coreutils
-	sys-apps/grep
-	dev-lang/perl
-	app-shells/bash
-	sys-apps/sed
-	virtual/perl-MIME-Base64
-	samba? (
-		dev-perl/Crypt-SmbHash
-		>=net-fs/samba-3.0.6
-	)"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 dev-util/dejagnu )"
-
-pkg_setup() {
-	if use test; then
-		if built_with_use net-nds/openldap minimal ; then
-			die "You MUST have a non-minimal build of OpenLDAP to use the testcases!"
-		fi
-		elog "Warning, for test usage, diradm is built with all optional features!"
-	fi
-}
-
-src_compile() {
-	local myconf
-	if use test; then
-		myconf="--enable-samba --enable-automount --enable-irixpasswd"
-	else
-		myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
-	fi
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork THANKS TODO KNOWN-BUGS
-	if use irixpasswd; then
-		insinto /etc/openldap/schema
-		doins irixpassword.schema
-	fi
-}
-
-pkg_postinst() {
-	elog "The new diradm pulls many settings from your LDAP configuration."
-	elog "But don't forget to customize /etc/diradm.conf for other settings."
-	elog "Please see the README to instructions if you problems."
-}
-
-src_test() {
-	use test || die "You must build diradm with USE=test to run the testcases!"
-	emake -j1 check
-}
diff --git a/app-admin/diradm/diradm-2.9.6.ebuild b/app-admin/diradm/diradm-2.9.6.ebuild
deleted file mode 100644
index f4ab660fd6db..000000000000
--- a/app-admin/diradm/diradm-2.9.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-2.9.6.ebuild,v 1.4 2014/08/10 01:37:40 patrick Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="diradm is a nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
-#HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
-#SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
-HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
-SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="samba irixpasswd automount test"
-RDEPEND=">=net-nds/openldap-2.3
-	sys-apps/gawk
-	sys-apps/coreutils
-	sys-apps/grep
-	dev-lang/perl
-	app-shells/bash
-	sys-apps/sed
-	virtual/perl-MIME-Base64
-	samba? (
-		dev-perl/Crypt-SmbHash
-		>=net-fs/samba-3.0.6
-	)"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Crypt-SmbHash
-		>=net-fs/samba-3.0.6
-		dev-util/dejagnu
-		net-nds/openldap[-minimal]
-	)"
-
-pkg_setup() {
-	use test && elog "Warning, for test usage, diradm is built with all optional features!"
-}
-
-src_configure() {
-	local myconf
-	if use test; then
-		myconf="--enable-samba --enable-automount --enable-irixpasswd"
-	else
-		myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
-	fi
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork \
-		THANKS TODO KNOWN-BUGS || die
-	if use irixpasswd; then
-		insinto /etc/openldap/schema
-		doins irixpassword.schema
-	fi
-}
-
-pkg_postinst() {
-	elog "The new diradm pulls many settings from your LDAP configuration."
-	elog "But don't forget to customize /etc/diradm.conf for other settings."
-	elog "Please see the README to instructions if you problems."
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/app-admin/diradm/diradm-2.9.7.ebuild b/app-admin/diradm/diradm-2.9.7.ebuild
deleted file mode 100644
index f26c73c25017..000000000000
--- a/app-admin/diradm/diradm-2.9.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-2.9.7.ebuild,v 1.6 2014/08/10 01:37:40 patrick Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="diradm is a nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
-#HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
-#SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
-HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
-SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="samba irixpasswd automount test"
-RDEPEND=">=net-nds/openldap-2.3
-	sys-apps/gawk
-	sys-apps/coreutils
-	sys-apps/grep
-	dev-lang/perl
-	app-shells/bash
-	sys-apps/sed
-	virtual/perl-MIME-Base64
-	samba? (
-		dev-perl/Crypt-SmbHash
-		>=net-fs/samba-3.0.6
-	)"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Crypt-SmbHash
-		>=net-fs/samba-3.0.6
-		dev-util/dejagnu
-		net-nds/openldap[-minimal]
-	)"
-
-pkg_setup() {
-	use test && elog "Warning, for test usage, diradm is built with all optional features!"
-}
-
-src_configure() {
-	local myconf
-	if use test; then
-		myconf="--enable-samba --enable-automount --enable-irixpasswd"
-	else
-		myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
-	fi
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork \
-		THANKS TODO KNOWN-BUGS || die
-	if use irixpasswd; then
-		insinto /etc/openldap/schema
-		doins irixpassword.schema || die "Failed irixpassword.schema"
-	fi
-}
-
-pkg_postinst() {
-	elog "The new diradm pulls many settings from your LDAP configuration."
-	elog "But don't forget to customize /etc/diradm.conf for other settings."
-	elog "Please see the README to instructions if you problems."
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/app-admin/gam-server/ChangeLog b/app-admin/gam-server/ChangeLog
index e0df492c9358..6b105e1ed9e6 100644
--- a/app-admin/gam-server/ChangeLog
+++ b/app-admin/gam-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gam-server
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.34 2014/12/06 16:39:30 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.35 2015/04/14 23:38:38 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -gam-server-0.1.10-r1.ebuild:
+  Remove old.
 
   06 Dec 2014; Agostino Sarubbo <ago@gentoo.org> gam-server-0.1.10-r2.ebuild:
   Stable for ia64, wrt bug #529392
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index 746bf3658778..748e9385603c 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gam-server-0.1.10-G_CONST_RETURN-removal.patch 2470 SHA256 adddd1f54bb33669d9163398308ebb732f33b6c12b1363a0dcf765ff28fc30ad SHA512 56cf8439d64c3856cc768a0d6aa67e00e82579b0db60b1f25b195024eec1628f61013718f3139910735eafa15e05f4fabe4373ebac053778abb1c89201c6cf0c WHIRLPOOL 425495ec6bb9cc5993631b9c5ef24d33261f71e9a039120a373235bae3cb386b8a938cd06714a6fba57a2378f868d372b063efc325bc98faa43b3c136c4d00b1
 AUX gam-server-0.1.10-armel-features.patch 1490 SHA256 6b6faf3084ca2ddf577575395172901d637a96e5db8dd42bc5268d58a767d30e SHA512 fe6365489428ca9206a36b8dea495d5c4beb381fe43dd49aa2fa022f8ea34d8068275ce42f41211ef7ce8bb2c1dce952673d4b2e72eec5be00161fa8f8bcb2a5 WHIRLPOOL 935fde8a3683a1cb9f7f44307fe136a7f8251982501e54209625bee681d8ef23cfbf27d5f8b127da200a800c778b91013124ddd8caf970810c018d7f44dc356a
 AUX gam-server-0.1.10-crosscompile-fix.patch 764 SHA256 27e92227c19a6ae61336f66cefe7d44fca43fe7e0c8122fe32c313b4d848f28c SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23 WHIRLPOOL 61c2c95cd7874eb106fcb1e474a10e21ce79d0c10220520810d904e4dac106ccfe12a09782d0ea7cb42c7369a1226fca9b7f4d826e5f62140713ea6a8ac967c2
@@ -9,24 +6,6 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 SHA256 e19ede71d259fbe5888c066354413
 DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 WHIRLPOOL 49ca0e192d8f5e28d6ffbb201b98b0f2c736554447b37c50eaa6e76e499ab77d696cf585c96c6a38f94c2589c634e694daf2e4969ffddbbb245b07b8a6e7b2d8
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
-EBUILD gam-server-0.1.10-r1.ebuild 2577 SHA256 97a76076f990734e3e13f5662cd363e36440676c20713cad4f1bd38a71b093fd SHA512 90ecdb77398a11ab9edf8d5a7c62b71fc61277c723e9d0b7af973d4ca78f76a08c79e64808e1c42f288fef8b1c550c541b0addbb0079897ed8acb4d1ad0253f3 WHIRLPOOL 8e67616ea0e71263eb20dd59b661b9f69cc09de765806c9513a06b24a2e5f8492c2cfcb804b39a85720a032c950609f6950ed05056ad5c8b9478b0b0c45b2e7d
 EBUILD gam-server-0.1.10-r2.ebuild 2594 SHA256 4fd23101acee96703a4a3c3db832d83898edf84beb1c1aafecd59ee6f7b88cbb SHA512 b60dd1160205d530864940b567073baab0f334c879c3a33f8695cc7fa85b01d11872241fbfbfcdfd24f3a6d771151445b14f4acae89827d9afee7538eb16d1a4 WHIRLPOOL 8ef722ce31f57b99711262174e087e65b1202c0f8e0c7f916948270fa7b48fa3f4632e38c703ad45e97c092dcffa87db510c63d369053013957dd1d0ea169986
-MISC ChangeLog 5184 SHA256 8fc33f715d447c97c31043938a428f732ea6148aca7e08baf4570ff29d2c1267 SHA512 c304f844d53c8ac39d120e1e3cf19640c95aee87ab0b6ff62e46703c2c76a56c8ddc05c3e97102d6af6096953b372ca9ac342d5a8a35adac8d633fabd6f81fd1 WHIRLPOOL 27a61b94e99ace8b4b27fc455792fa1481154232e98535fd711dd246fe417470b3997808bdeb2c72eb279034ec72704b03a533e6daa743e9613abf26d81c7ab3
+MISC ChangeLog 5279 SHA256 d97b1bab3adac87503be5dd5d16026f19f4bd2e28d3d9dc42480ad7e0b753784 SHA512 e9b0581f2b72f65882b80c3731f5cd9aa753b54be90f08fceb6b529585ddd0b30fbeb2af4f990b8d3f98a233b5eec9fb5272ce6fa403fb99b72f16d06d10447b WHIRLPOOL d557d11c6823042219b7a80b380d01fe2249bbef558939ff68153be977a29e0ddb01bf5150dd679f9f1ba6b288947dac44516ec849e20ab85143502be4de0075
 MISC metadata.xml 244 SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c SHA512 9f697206cf152d13b2a3e26645959ab3353a34e4158832139689359aad999114afb8ed80e2f82464674f358434a891d74f2e94079c2c57fc7a125d17e735ff71 WHIRLPOOL 47f92e411c189c765f6665e28402aa0411ebe898b306925cf395ed23085738120fb4075682d6c86f5818de5a3d70cfeca2fda163e3eb83764ba0b4d8dce1fb04
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUgzFDAAoJELp701BxlEWfmW0P/RDi1bTrEeFITqnUQPMIkYLu
-9Y8NoBDl2MW6P0zn+44Unp3gi/jflP1KnerptcudCM8mWzr2K7dVe3MsdgAnQf9O
-bG52g7/jKmVN8kmuvcKOvOhEzSpvp9tnZzqoh1207jzCyzTu+vFIdcS27PZNEJ8v
-5AdjErIu+LNpQ9q30kVQpaWgEwkxRb9kRjwxulbik/MyNaKnIvOBRK+EEv86RbCf
-Vza1bt0g6MRFiauYWTz6e3nUkyl22bWKkP2MfSbCHeGdYOcO6Yxo879/Ny2vdBBu
-37j+mzHuM57kp7zghBlh/kcktbPxCl+0aoxz+qpPj1nFsp26Sb7sdKxAdOKBX/jF
-/5trhECNN5MfoGCMGQJQysIpnw6pH0lVp/HsbqXm77S/UAXo7UkNG5LsRNGLKAp7
-v8Xc+l0FvimxdDdH9N4o5eyQdzqZvbiaPQGxE5/8KDrh79/DNuPNfyVWnOXHzkcg
-vtsLz0rF1VskceZPr1hcPuVNkoTBZM1jlR9lhAM6EGrTsUV9ZhD8nbbk6J2MLo69
-4fpjWsMXiYQX2xJ/lrCMxHuPdIwbC9MHNspf7ifYfWLwyOLhe1ujmRLwZ5C/jMli
-VkyklKEaHznfhVmmrDp/o8qukDRNOCLD3czeggWiNqtlnL8K8sawriDoD3ctQX3D
-9gVve9z9ojuBEi9MAKpt
-=bIfW
------END PGP SIGNATURE-----
diff --git a/app-admin/gam-server/gam-server-0.1.10-r1.ebuild b/app-admin/gam-server/gam-server-0.1.10-r1.ebuild
deleted file mode 100644
index 2e109d22e806..000000000000
--- a/app-admin/gam-server/gam-server-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10-r1.ebuild,v 1.10 2013/04/28 13:04:13 ssuominen Exp $
-
-EAPI="3"
-GNOME_ORG_MODULE="gamin"
-
-inherit autotools eutils flag-o-matic libtool multilib python gnome.org
-
-DESCRIPTION="Library providing the FAM File Alteration Monitor API"
-HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="debug kernel_linux"
-
-RDEPEND=">=dev-libs/glib-2:2
-	>=dev-libs/libgamin-0.1.10
-	!app-admin/fam
-	!<app-admin/gamin-0.1.10"
-
-DEPEND="${RDEPEND}"
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	# Fix compile warnings; bug #188923
-	epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
-
-	# Fix file-collision due to shared library, upstream bug #530635
-	epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
-
-	# Fix compilation with latest glib, bug #382783
-	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
-
-	# Fix crosscompilation issues, bug #267604
-	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
-
-	# Enable linux specific features on armel, upstream bug #588338
-	epatch "${FILESDIR}/${P}-armel-features.patch"
-
-	# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
-	epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		configure.in || die #466948
-
-	# autoconf is required as the user-cflags patch modifies configure.in
-	# however, elibtoolize is also required, so when the above patch is
-	# removed, replace the following call with a call to elibtoolize
-	AT_M4DIR="${WORKDIR}" eautoreconf
-}
-
-src_configure() {
-	# fixes bug 225403
-	#append-flags "-D_GNU_SOURCE"
-
-	if ! has_version virtual/pkgconfig; then
-		export DAEMON_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include"
-		export DAEMON_LIBS="-lglib-2.0"
-	fi
-
-	econf \
-		--disable-debug \
-		--disable-libgamin \
-		--without-python \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable debug debug-api)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 5e7c7da3a2b7..2c221a1bdc92 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gamin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.114 2014/06/18 19:00:16 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.115 2015/04/14 23:41:37 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -gamin-0.1.10.ebuild:
+  Remove old.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> gamin-0.1.10-r1.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 10af90a69279..e693a76140cb 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,26 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 EBUILD gamin-0.1.10-r1.ebuild 746 SHA256 44e70a0e973ae09aef6ffb225d5c6575c53bcadfff58ca2af821738129e5c26d SHA512 b44d45cd715a4f9e0a3f69956345e557e9bcffdd320d6dc9135d724b9283c1e5e4f80cd7a9761e8bbf1f58812c90e4a359be4c48c0cc32e172806ac50ffd6c47 WHIRLPOOL 587e704e7f904be381d9ec69b404ebc99c71f3996d276d6f4a6d16c65bbbc5357db7f0c93260ab41c085576588efa016977ad3dff8eacec8e743e6943b4a579e
-EBUILD gamin-0.1.10.ebuild 687 SHA256 d74b62a0a63a77622069a3397e018cf1f79798c4973e49db1b4869ab73364ff5 SHA512 6effecdc66186a26b8034aecb47d88326918b3fba9185049e1c17881a23f8729295097dc4ff4ff2e285f0bf8cf001dd177de572e141eab4608038e9a37c5f86f WHIRLPOOL 0b920a942181dbf49c653533a67920bc07d28211c653a99fb318842869b22145e056028926c8c9c89641f2786f6456a725ab868659f480d0c2370494c6a13876
-MISC ChangeLog 15306 SHA256 ddfcb92a5c71302fe0766221f7d804a18b7e2ee7fcecdf50334a33cb6a8b0f2e SHA512 7fc04b4ac024b67dabbd3b571acd807f76887829f931d5b2601737163f68b2d59fc6d6a3f4f1521b2af7f3e5ade6178bf91dde0aff8e89b09c20f48db67d1c96 WHIRLPOOL 193a36a8d7102506c3c8738defadb700d6222e328e0a394222eb7401e8db9329613aa18692a42b37544337d4495eb338f53b7631777982fb75a8b07706b9bbb9
+MISC ChangeLog 15390 SHA256 b27a606a318ab4062a8f2c2c3641462a1ffd803c19f6cd0f5b69b15eb263c1cc SHA512 3a9538fed3c20d8f285e5508f8b37d700d7a23dd1f993607ae3ebb4943dd3d38560a30e5b8b58d61c37c74c0ad050eb6bf757084ab6a64d8cef3327a73db2cae WHIRLPOOL 57de2eef2da19e5e78eb671f2d10bf3048e3c6de87d3762d54d9692b58aaa510edd0d85f5668e16ed07bd5f004aedbedc83e8a0150ad2aa3c077bcdec51d3f8a
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJToeHBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOamIQALTBKbjUYd4QeXTJZ/knuXBC
-OgB8ENvKowg3H2HcvU104+Xj2M+/cxJzMJQn64+dC9l1T6vMTTALt4W5I63YqUTj
-FoZjpLZUg9ntesEojPlLdMd6x1MANBacfsYxBhk/dA7r1RunYtCvgBMCZ3q1RALJ
-vLhuD3aRVS3ujSpjuZ21R3rEwBgSQhVLl79COovQN3OspVac1FYIlitjPJwCy1vr
-ugJ/tMMLxpsfGlhuZMs5wMjCP1sWAHcABabbUFUX6mr68lTiVPwTY9nHb7uF5726
-HtSs0SGLstWLk4QBnkzN02nEs+0ynkOPOrLYHVu6itejgY2M4XTKNyFweqwass5y
-ilocll48DY0UFKSHHjgffVf8nX4Uw3/XNVSuw44Lkgd0v+cO3bddjP5EFNzcqHL/
-NaRpXWX+ZENCl1kytLX02N32sYVtel0lVGctevpMdSZBk31NDloEgPEpF9e4NK5+
-XaGNKeh2zxFGe7ybuxkKXriMFEpG6CES47O3ZkEdTs2UNBRny6jBc3BS7JeNxuHA
-5v7iVd9orrPGmRQjBUzHhsiGvAwepequ6/TpQ3ysAMdtsVPjctTmFzr+D3KI7IVo
-MFSsb64PN9CwDXQAVdJHpEhUk2AidVOQcMyKlB5ROj74eYqNN6SS+Qe6fezaGWha
-GV+X+JzLJw1aWBUKlo+U
-=sckT
------END PGP SIGNATURE-----
diff --git a/app-admin/gamin/gamin-0.1.10.ebuild b/app-admin/gamin/gamin-0.1.10.ebuild
deleted file mode 100644
index 75adfdbc158d..000000000000
--- a/app-admin/gamin/gamin-0.1.10.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.10.ebuild,v 1.11 2012/04/26 17:34:06 aballier Exp $
-
-DESCRIPTION="Meta package providing the File Alteration Monitor API & Server"
-HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
-SRC_URI=""
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!app-admin/fam
-	>=dev-libs/libgamin-0.1.10"
-DEPEND=""
-
-PDEPEND=">=app-admin/gam-server-0.1.10"
diff --git a/app-admin/geolizer/ChangeLog b/app-admin/geolizer/ChangeLog
index 2b225ff30901..6907d99ea6c8 100644
--- a/app-admin/geolizer/ChangeLog
+++ b/app-admin/geolizer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/geolizer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/geolizer/ChangeLog,v 1.4 2012/06/19 21:09:55 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/geolizer/ChangeLog,v 1.5 2015/04/14 23:25:17 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org>
+  -geolizer-2.01.10_p20070115.ebuild:
+  Remove old.
 
   19 Jun 2012; Jeroen Roovers <jer@gentoo.org>
   geolizer-2.01.10_p20070115-r1.ebuild:
@@ -25,4 +29,3 @@
   +files/geolizer-2.01.10_p20070115-etc-geolizer-conf.patch,
   +files/apache.geolizer, +files/geolizer-language-list.txt, +metadata.xml:
   New package split off from webalizer
-
diff --git a/app-admin/geolizer/Manifest b/app-admin/geolizer/Manifest
index c92947988ddb..9a6a3e8410e0 100644
--- a/app-admin/geolizer/Manifest
+++ b/app-admin/geolizer/Manifest
@@ -6,6 +6,5 @@ DIST geolizer_2.01-10-patch.20070115.tar.gz 76862 SHA256 a619f863c9a65a065800807
 DIST webalizer-2.01-10-src.tar.bz2 252664 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 SHA512 5eb0c6344d99f92f8b2f72db533b61e7f79f18b94b1adbadc704f0a0b72998042d53daa1a2b8c92975be91ed25252f21ba99a1852365bccdc2338eb5041d6ff9 WHIRLPOOL ecae01667eb7ea163f8e2b66e9fc02f4fe57178eff067b24114633e1d7fc977097eb094b8ac2c2204ac4b7f72a8bc2cc68387b3a25d6a1653dc119acd7b5ccb1
 DIST webalizer.conf.gz 8986 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b WHIRLPOOL 58c2ced08eeba65e1c7acf951e2e0e1806af58fcd37997c4d824504235303d7f75cf6c05c7ce051e2e2f3b3abff9a929f0dfd7722a995a8ab65232cfb549e83a
 EBUILD geolizer-2.01.10_p20070115-r1.ebuild 3649 SHA256 dc69c14f31e114d73c38fc7c9e8d731ba9cdb11c15961ec4b31efe5eee5e5325 SHA512 796edd36eea81b5d392cda29bbd8bddc7ab851f6a872b731584dea14fff9df0f6dd47c263d13a35c6536ccb273a485b6cb22e730cb3239449ff629ceb0d6c472 WHIRLPOOL 29b3b74608faf787cf1c2a4fc6203b0570d474c893c8fbad9287b0f346d3e223d7fbe72474bd1f732893a4ad13121a22e72948d80baf5957f9ba80d44e404812
-EBUILD geolizer-2.01.10_p20070115.ebuild 3588 SHA256 c96ab0e18b23a2a654749cef62c3a466060810e151fc29f94057c978d662a580 SHA512 d728669abd928c565ac1729a5a0920ab7c9fc0645c083a34377c77a432b6c78a831f811eac8bc427a0e05a782480bc431c9a9f72f353d13c040289cc51806cf1 WHIRLPOOL 1250e57090d1cdb25be4c6daf5dd8d949c2af353aeebcdad8187e97c3c082600307a581d02915ae59681027cf5ada9f4883d3ceb6e8dc81a15b2f84c89845ade
-MISC ChangeLog 1078 SHA256 630ce52968d42ee9aaea549ceaefed2d4f36426decbca85d3f2be3bb1c14c7d3 SHA512 f5f0f1c88389b81c4514d1de3afeeb8212dc3fc680488cd7348058ff7441e8dc8930ee527d86392c85ee07502da66b34d4ac3dcf5679fe251390a9b8b9a223c3 WHIRLPOOL 91e47ac3f450be722169c19cab86aa469a1d21f772570759df3ed769580250aa3e328992c5347b89109a726dbe4f6cbea1a075f259285b6ef08f6d078955eb07
+MISC ChangeLog 1180 SHA256 219480c69d71bcb79511859e64636f934a8049e455bd785af6d2f38de872fd61 SHA512 174f986125aa1077d62a42bb42be91e399b291c106cbc35060bfe4ae8f9c2a802fd4ffdfbf846d6a852cb770937e31fd10bc3f6f59366aae83e6d61bf4468e56 WHIRLPOOL 11ffcd2ece1c50438fead6746939a42549b76c93deee0f9bbcead81f8ecd55bc0478771c5528dff904f0bb74a8390ac77aaffa9594172a5d3d28c8be697d4075
 MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
diff --git a/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild b/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild
deleted file mode 100644
index f8181e65ff94..000000000000
--- a/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild,v 1.3 2010/09/17 06:47:32 sping Exp $
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkill but works well
-
-EAPI="2"
-
-inherit versionator confutils eutils webapp db-use autotools
-
-WEBAPP_MANUAL_SLOT="yes"
-
-MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
-WEBALIZER_P="webalizer-${MY_PV}"
-GEOLIZER_P="${PN}_${MY_PV}-patch.${PV/*_p/}"
-
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://sysd.org/stas/node/10"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${WEBALIZER_P}-src.tar.bz2
-	http://sysd.org/stas/files/active/0/${GEOLIZER_P}.tar.gz
-	mirror://gentoo/webalizer.conf.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls"
-SLOT="0"
-
-DEPEND=">=sys-libs/db-4.2
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3
-	dev-libs/geoip"
-
-S="${WORKDIR}"/${WEBALIZER_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-	confutils_require_built_with_all media-libs/gd png
-
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [[ -z "${LINGUAS}" ]]; then
-		ewarn "you must set LINGUAS in /etc/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${MY_PV}-patch/${PN}.patch \
-			"${FILESDIR}"/${P}-etc-geolizer-conf.patch \
-			"${FILESDIR}"/${P}-strip.patch
-	eautoreconf
-}
-
-src_configure() {
-	# really dirty hack; necessary due to a really gross ./configure
-	# basically, it just sets the natural language the program uses
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/geolizer-language-list.txt)"
-		local myconf="${myconf} --with-language=${longlang:3}"
-	else
-		local myconf="${myconf} --with-language=english"
-	fi
-
-	econf --enable-dns \
-		--with-db=$(db_includedir) \
-		--with-dblib=$(db_libname) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	newbin webalizer geolizer
-	fperms 755 /usr/bin/geolizer
-	dosym geolizer /usr/bin/geozolver || die 'dosym failed'
-	newman webalizer.1 geolizer.1 || die 'newman failed'
-
-	insinto /etc
-	newins "${WORKDIR}"/webalizer.conf geolizer.conf || die 'doins failed'
-	dosed "s/apache/apache2/g" /etc/geolizer.conf || die 'dosed failed'
-
-	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.geolizer || die 'dodoc failed'
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog
-	elog "It is suggested that you restart apache before using geolizer"
-	elog "You may want to review /etc/geolizer.conf and ensure that"
-	elog "OutputDir is set correctly"
-	elog
-	elog "Then just type geolizer to generate your stats."
-	elog "You can also use cron to generate them e.g. every day."
-	elog "They can be accessed via http://localhost/geolizer"
-	elog
-	elog "A sample Apache config file has been installed into"
-	elog "/usr/share/doc/${PF}/apache.geolizer"
-	elog "Please edit and install it as necessary"
-	elog
-
-	if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
-		ewarn
-		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this packge, it was built"
-		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
-		ewarn "you intended, please place the language you desire"
-		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
-		ewarn
-	fi
-
-	webapp_pkg_postinst
-}
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 1b368e588800..e05d9a43791c 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.205 2015/03/24 20:01:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.206 2015/04/14 23:36:49 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -gkrellm-2.3.5-r1.ebuild,
+  -gkrellm-2.3.5.ebuild:
+  Remove old.
 
 *gkrellm-2.3.5-r3 (24 Mar 2015)
 
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index b66aa3ec0c73..24fec9e62ff4 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX gkrellm-2.3.5-autofs.patch 363 SHA256 9d655df4251bf58f2c160949e00d89c1b95be6b472c3c110e4a39a30e817fb1e SHA512 a7684223bd02c9bc0c77f33c618b1b58f639e83935b2e728234af5e364a1573d7a3d8448ace541eeaaaf3236384dd2f042cacb295eb8fdcb850cc2eac3bd614a WHIRLPOOL 1720705d6f174a77b4ffa18eae0bfc3102b4f24b4bc60f24e02fc15004874909704b784081a7eba526321599edea5cb141d1a5a9be4e0a6ec6e46a1d77641804
 AUX gkrellm-2.3.5-binding.patch 707 SHA256 f2602869d98c51910f22022b64b9ebf8f4c99caed3fbfafbc2ec47a977994463 SHA512 c5f52a9e5359244ef5a330f25320e4c2adad3d11d9b5ae443e73e78dba52c88a2b6ce89130547c63727c95f40464d88f42f175cc12a0d0ec97f67717ef611ff0 WHIRLPOOL 6d280db703568db10a6c7cad578d961fecf428c578821ed8d3965bea9137f6227bf86115c23f34d1fcba5a7a399f4378ece49e93a33744464ab841182e35642f
 AUX gkrellm-2.3.5-cifs.patch 496 SHA256 3b669243b900753f0b913cd8764b0f4389c684680ade75c60eaca2820b8caedc SHA512 feffaf5a561bbc47d42061ae3b2acc9d6cb6fc93d43448a2ac9ede89051c34bbec4b1ff0d77e1a2dd634fa78742a105ba66131a1cdb7a59ceb21abaa32f558d5 WHIRLPOOL 3436e2a9b2494059e68b008d426fd284ea0bf9c097149cc48bc92638a38ab6564c40204260b7e648b1e7d153f2ee396a060f2d1f21483d96d6bccb65c0e12372
@@ -13,28 +10,7 @@ AUX gkrellmd 640 SHA256 68eafd11f1c1ff7080a2117facd62d8a3124993fc513c050387f6f32
 AUX gkrellmd.conf 250 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5 WHIRLPOOL 2662e208c7919cbe2e5a162ddcd3966149e59bf4c2172cb519349a983bac914fc2469ff0176043ecf5c43babf6a08ec2cdcb831dcc67ba503f231477cb183e06
 AUX gkrellmd.service 174 SHA256 0a296ef43139b46b4a1d1afb0eda68350ecbdca216bd1f9f74dff040de4a30c7 SHA512 254125456c6541a946a82d0b6727135b59b8371e012eca35c20b4242b0c405a01b2f822a7099105a8e4cab1342ada4abcbc86683584048bb4e2500924904e7d8 WHIRLPOOL bd038f1e752c677ddbd67733dad2eb80a38cc8d65f242e29c255ec95c269e356caafea6b43eb6a7f5225cc5a749fca84a5333b1112aed324cdb031d90f7dbd32
 DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
-EBUILD gkrellm-2.3.5-r1.ebuild 3156 SHA256 d200b9ecb2f3e5c6a374bacd7ca0e9c4f2d8db8b5dd4f2571bb0fb2becc041d8 SHA512 51f6f1560c487066a7fb4866bab5a274e7ff6554dd61bc26cb6ee699fcefbb80e66320cc6e4601ee215f2d828fe43e196a82e388a3da15ae849cc6f9fbd64938 WHIRLPOOL 196128179f5986d8dd296e1982e5c3dd36a428a57fc31edcbfc193898d44fdb15c24d57862c0f7fe5297c46b3d90a1dc298814d2c6a3edfd662bf367ded92c23
 EBUILD gkrellm-2.3.5-r2.ebuild 3349 SHA256 c1df05adb544d319ae2e79289da3d642810c94e913ee919259cf865e93fd5bcf SHA512 289545765fddc4426aca45bcdcf164d143d71cbf8051353c5c744511d8a24d8223bb2c060d22df71c70b049457c5ba2ce8c12937f6c65f1c78ec86ed76f39357 WHIRLPOOL 63e8cc8eacf3071ed486944f7f261f4478ce55eb60f926231c80620d6afeb2c8dcf902dbdd5ea08a12f0a2a365336672cd85645ec0381cb5d5e9a671e489a91c
 EBUILD gkrellm-2.3.5-r3.ebuild 3207 SHA256 35d8fb91af2e3d4ec37db9e1689e9afa8b96cad7c1ac59b68f01f4f0751b647f SHA512 7cc5022ee119b9d9be63d8791f8fb4bea31adb83b5de3f6f9d7b4936b91f093783d9b5571a90fc95e628ec52c03ea7a19a962765fcc3f137d944201c01692601 WHIRLPOOL 0873dc75916f7247a1d9b026581da825397ff6aa58c96bb2badc3695c3b3520912e67578e642dd62100dae86552bf4b56b13ad78ad123efb1b79df166e381432
-EBUILD gkrellm-2.3.5.ebuild 3206 SHA256 c8c7cf7593dc4f15370ef25e0095fc173ddb31a9fda5eeb8592a61c19a11909a SHA512 20057e64c6a6a2a41f4eec2661a7f1e0907d69719bf8a7baf79970c94365c259f22814c8710e5a2b07c7c045241ee54b3bed0bf9f0baa642ed1ef0c1898bf27d WHIRLPOOL 66a9b25b7820fb227e7d9518148e5d87a28b115668a77193b5534c6d72c2727e5c87ee13102623534b4dedc01fa6e32ca1eaff4f0e14c610f4e912eb66f4bb7b
-MISC ChangeLog 28341 SHA256 5b4912abbe06badf002e0955bbf3353a55b853b732cff60b4d937e01fc792823 SHA512 278cc26e2bef6b75c2b51bc36b576dacd50657dd255665dc38266624cfa6cc286f23222d99155270cc285ca65eafa88e3d59ad67ee82aa48d3db74c75131eabb WHIRLPOOL e8a81ea6e377370915cc3892745b9b3f8942d4135dcc5adfc8107fcbcc3e5f8e39a64b3bb15a03ccdc00cbeaefef523f6e46b8064d3a4aa8aac4adb49eaa89b4
+MISC ChangeLog 28456 SHA256 ffff5af0f45ca53319339c487dc625a419b367e4791c943f522b24b8f98c96e0 SHA512 fe00c46ae4f8c32e4c10a76256537f72674ccc38a1fbfd8f85a392396649cf99364b846aae45a2b4e130015029ff3ea70f8d4f4d102a54b0f9ea75936dee4410 WHIRLPOOL 3760a83386e5b7da608069df4d8f2b9801fc771db4ff4ea52cd30776ffc8ac8da7384848d47b6f83e4a8651e4aac95b16004565fbf04e21aa4cc1e124b2b063b
 MISC metadata.xml 867 SHA256 6371505a90b0dc373b167cc05e078f4c5b018d0d350b6b0c59e90a33a0ef4725 SHA512 e90a4ffe3eba5affd444512c8b12ce5f559c97ba8c9730bc384235b1845fc9f08db23ec3b967d4df8ce2ea2daedcf920d0b9c9967e20602803c5fb68f091edcd WHIRLPOOL cdfa4d7ebc3226d43009aa837ab4724772e9f9e3dd79c2bb1f4a90ce8d9ba2114f4b4a1986dd100af82f7e6d07e8533bed2065fa1942087bd85873f26673945b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVEcKsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir3K4P/j/j3HhLDLVTS+nqdhrYYVtk
-JuWat9kWK4rNMRKYvW3pRsMqksGN7h3GOWj28g2R2k0sIBOnFdTN4AaBNf7pMk6c
-xcLK3fM6jjLPJFy8l9y3OkjxtqwrkGQuaaj3HYvyrzeGGU23LrZ1zOu8D1KB14Oe
-WlQeu9XCs5ECMBKdNil1tObnUgjkXqybADdp6jj9EHbtev2Eb7YdKiczaZ/QQBew
-80/SBtnnqKNcMGZlKi21ClpZiqDaLUVwsg2FCf0u7jjCPYWwDLT3EAN5CZWRpbHd
-Nn1PFz1YqN2qCyjTMPqcX2lic98ykfUSep9eE1xO7ovDOWCYZQpr/RvFu5DLEJhH
-EQqQ5NVKcKFn8AW9BKFR/pM2vf+3MR+rh4DGYn+BxdLMjZIc+0to9mrIXeG4hbcJ
-6njAnjTWR1ZugJkyRw9yeFUyG1FiqhMF4/g8mXmPd7WHHwiM5Uyz9HRtBM7R/B8d
-OS6yCPoaaRvEjF7/dwGUJXk7LTFLBS83DD6k6n6WPtUlZSTj7jPj/yY++octtqDr
-aiPEc1GLFpeLSBKqQgExt3mrwOLMirNcowk5u1x77V4cR/kDc/n2zA0IKjMJ3FAD
-VN7iBhwKUru5tBsNAs8In/dY3J3lpI0mFBTaIBr5CnStiUVqwQCuD8cqFLm1V3o4
-mK2d5eqTIkO9rgMkF5RV
-=2GMx
------END PGP SIGNATURE-----
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild
deleted file mode 100644
index 500ddfc64df5..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild,v 1.1 2012/06/27 17:52:13 lack Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
-
-RDEPEND="dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )
-	lm_sensors? ( sys-apps/lm_sensors )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e 's:#user\tnobody:user\tgkrellmd:' \
-		-e 's:#group\tproc:group\tgkrellmd:' \
-		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
-
-	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	epatch "${FILESDIR}/${P}-autofs.patch"
-	epatch "${FILESDIR}/${P}-cifs.patch"
-}
-
-src_compile() {
-	if use X ; then
-		local sslopt=""
-		if use gnutls; then
-			sslopt="without-ssl=yes"
-		elif use ssl; then
-			sslopt="without-gnutls=yes"
-		else
-			sslopt="without-ssl=yes without-gnutls=yes"
-		fi
-
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="/usr" \
-			INCLUDEDIR="/usr/include/gkrellm2" \
-			LOCALEDIR="/usr/share/locale" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-			$(use ntlm || echo without-ntlm=yes) \
-			${sslopt} \
-		|| die "emake failed"
-	else
-		cd server
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-		|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake install${TARGET:+_}${TARGET} \
-			$(use nls || echo enable_nls=0) \
-			STRIP="" \
-			INSTALLDIR="${D}/usr/bin" \
-			INCLUDEDIR="${D}/usr/include" \
-			LOCALEDIR="${D}/usr/share/locale" \
-			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${D}/usr/share/man/man1" \
-		|| die "emake install failed"
-
-		dohtml *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd || die "dobin failed"
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h || die "doins failed"
-		doins shared/log.h || die "doins failed"
-	fi
-
-	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
-
-	insinto /etc
-	doins server/gkrellmd.conf || die "doins failed"
-
-	dodoc Changelog CREDITS README
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.5.ebuild b/app-admin/gkrellm/gkrellm-2.3.5.ebuild
deleted file mode 100644
index 495bd471df18..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5.ebuild,v 1.11 2012/05/31 02:30:55 zmedico Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
-
-RDEPEND="dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )
-	lm_sensors? ( sys-apps/lm_sensors )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e 's:#user\tnobody:user\tgkrellmd:' \
-		-e 's:#group\tproc:group\tgkrellmd:' \
-		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
-
-	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-}
-
-src_compile() {
-	if use X ; then
-		local sslopt=""
-		if use gnutls; then
-			sslopt="without-ssl=yes"
-		elif use ssl; then
-			sslopt="without-gnutls=yes"
-		else
-			sslopt="without-ssl=yes without-gnutls=yes"
-		fi
-
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="/usr" \
-			INCLUDEDIR="/usr/include/gkrellm2" \
-			LOCALEDIR="/usr/share/locale" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-			$(use ntlm || echo without-ntlm=yes) \
-			${sslopt} \
-		|| die "emake failed"
-	else
-		cd server
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-		|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake install${TARGET:+_}${TARGET} \
-			$(use nls || echo enable_nls=0) \
-			STRIP="" \
-			INSTALLDIR="${D}/usr/bin" \
-			INCLUDEDIR="${D}/usr/include" \
-			LOCALEDIR="${D}/usr/share/locale" \
-			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${D}/usr/share/man/man1" \
-		|| die "emake install failed"
-
-		dohtml *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd || die "dobin failed"
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h || die "doins failed"
-		doins shared/log.h || die "doins failed"
-	fi
-
-	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
-
-	insinto /etc
-	doins server/gkrellmd.conf || die "doins failed"
-
-	dodoc Changelog CREDITS README
-}
-
-pkg_postinst() {
-	if use X ; then
-		ewarn "The old executable name 'gkrellm2' has been removed."
-		ewarn "Run 'gkrellm' instead."
-	fi
-}