Cleanup old.

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64

11 files changed, 12 insertions, 397 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 8d6836c9c26c..92401936695c 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.219 2014/08/10 20:43:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.220 2014/08/11 22:24:36 mrueg Exp $
+
+  11 Aug 2014; Manuel Rüger <mrueg@gentoo.org> -courier-imap-4.8.0-r1.ebuild,
+  -files/courier-authdaemond.service,
+  -files/courier-imap-4.0.1-disable-fam-configure.in.patch,
+  -files/courier-imap-4.0.6-aclocal-fix.patch,
+  -files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-4.0.6-db4-configure.in.patch,
+  -files/courier-imap-4.0.6-db4-tcpd_configure.in.patch,
+  -files/courier-imapd-ssl.service, -files/courier-imapd.service:
+  Cleanup old.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   courier-imap-4.15-r1.ebuild, courier-imap-4.8.0-r1.ebuild:
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index aab2425131c4..81d433e5d9b2 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,13 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX courier-authdaemond-r1.service 373 SHA256 c5b647b2f72f8f3097a093d929d021b2ec758e5f8183c7990dfb56af2eed9f8e SHA512 5ef9b65c24700f93a31626d2a657e19165853151e5c33eb96b0d41b818b4669a2785dfb868054231df20acfdfc4218a0bbc7e21260e337a3075c54f97ba9c46b WHIRLPOOL edc6e642105862d7cc3a2b10ae28ea08a9d17a30d99c7620615da74fe2f587a4fae827d656cba0ae0395126dfd72d171172b4ada611e1b0cb8669e02b45bb4f8
-AUX courier-authdaemond.service 376 SHA256 a275d29b61029b92e7ce76c1d16f9ec943a6cd0e2199821811253fabb6801370 SHA512 534f64625c21d65b22d3887c649df94615daaa80cc49800877c93990a1974998099d94585b49a2b5b7f637c106cc72b9caec1b79c8a3f7e7e82be731e9ebb124 WHIRLPOOL b1b68a2d4c9d11ddc18b41e3e3be19dbb121d03997a82e67afa94855a62391aedaee60d70728d14d362296d3097241a2d7786db3c3471e08b17153d8df3c98b6
-AUX courier-imap-4.0.1-disable-fam-configure.in.patch 654 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54 SHA512 193e40c5ef0e87c00b09d689433d34ba1a007a246fdb85df646fe66732d1170ed1567aa0b994c86b78635e96f1dc855973ba3330b058deb2633a5a77f414c0c4 WHIRLPOOL cf88477da67885f03d427b192ca22ca5140f7724039f3ac4124a794c4461cf9a0ad161a57aa8004eca61e94b2a3224af0df7c4b8d6e6c167892071b2dc887360
-AUX courier-imap-4.0.6-aclocal-fix.patch 237 SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579 SHA512 b19701037db1777f7c3c94a8da89381dab143fb2608f0bf0e8195dde118715db9586e5dc5fb9ec17910b132dfed1f63c22f6df22a4cffa66daf45a1e72b04ca3 WHIRLPOOL e34fdf1f9f514caaa1cca8bfd59d11ea7071fb919c343566cb0b0f32f90feec4f5f73160b73ab2ad13816f369861278e943a703b86b0e1c2a2c309d508c96ab6
-AUX courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558 SHA256 208e443f2730237ee8ae858eb21c3895c83651fbaacda881bdf46076b5182db7 SHA512 74508949240b5d60d2b6ab44d042ccf02752e29584c4b3e457de10450b97e86709cd420d126ba7279612cd4476de2d66704eb34f8f63feaeabcb5088aff24a61 WHIRLPOOL 2ad6dc525d8f5849a6f1f926269440baf3292b7ec47fc705565a93bdd8372ad4ac9dd7b313aca164a65f47f1d6b4fde01b79e672a2e82ab7d7b285349e7d6de8
-AUX courier-imap-4.0.6-db4-configure.in.patch 1497 SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c SHA512 54899b6cfeded1f2cfbc5ba05a02cdbb97cb94d45b29fd986ddfb1416f60b3676bf3b6189b28e9a03fe38bdf149cb0e0ab4d5f63544db9e0190fdffa3c91fc35 WHIRLPOOL 094d8ff14ca40e494611dc2f7e03c6deb7bae0a9baa198ab6a3c84fd86611144427bc9fbe3f9abe36ea9fbc4c5d1d882c8d322ce930933bc00e0b84bb4970ed9
-AUX courier-imap-4.0.6-db4-tcpd_configure.in.patch 264 SHA256 553b9b20afad380b2901318b6b2152b14c1f26ed3bfe26126364284f143cdd21 SHA512 66813cce1a07c518f9dd7c8d91dddb21ade2ab3ba78153574856949061e70708a8ba174dfad40bc8988a13eaab6ebbb5eb69a961a9b2b57a7fe271750b3ed41b WHIRLPOOL 11f6d027e5678c7d801e8df65c7a1093a711ff3081bb344b477940a885085c8135ae230dd385f646a46eb1c8aef8102c5946a6ac91ce6aa331e79ec0bfcd5c78
 AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1200 SHA256 c417f5de1bf2eeb5a7918931c30f1902d9f463279d8aa73ea0e13623923805df SHA512 f348c26d0aa3ebcb8674f3aaafdc4fa197873a22d5715612d062f4588a4f57a1e5ecfeb96705f8d082fd4fde9cd3e72fbb6d12a292863f640fc0d29957108d9a WHIRLPOOL c5fdcc2330fb1e7d5d9614612b42c7e3be3d9c1a73ee4f689462984923b6b4f4f967c1d90b832141f60f50ea753fa6d0156bf9e72d22d41265075d1293397803
 AUX courier-imap-4.0.6-r1-courier-imapd.indirect 81 SHA256 5d2e175e20aa5d7b7049a76be847a9bd974d25625b5324ac8f23680cb7e734bc SHA512 22108e1a09e9fc6e6c035ca7f55ba382ec87bf889dd88c2f9934b087d285853a6eb8453fadfe456f9a6de57f973c988bbaba8ec449366f0df8396b430b1d64bf WHIRLPOOL c111c0cf627a4ca0287faeba60ed15a40b8925e1e0d0bec4b58a783feed2073a129a78b0578e0b309a0dafec00a2aac8b1427395bb65454a51d3c475c86a0f08
 AUX courier-imap-4.0.6-r1-courier-imapd.rc6 949 SHA256 67406394a81a4ca697b8d08e987a0680b4e7622ac30ea009241b002f1d3adc8e SHA512 1bd84922060131933d8b07f47b50c7034e872db873d5010d0cb1362926f71709e7deb4b8b3054c45d99101df48eb1285b673ebe0b8de8292edf2d06ba235fcf3 WHIRLPOOL 9edb817403b91e9e5ac76e3f16d46ed12b91c88ca78ba3f7ff8c116495ab254c1a81427b7f79518df192d8d441ea53f5c9f844ce8b353eec91620dc427aa1e59
@@ -25,20 +16,9 @@ AUX courier-imap-4.15-disable-fam-configure.ac.patch 626 SHA256 53f8a4504580c50d
 AUX courier-imap-gentoo.readme 2827 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f SHA512 a677218ed39483dbe07358382f557a877486d5028b890ce25822663a6fff58a4744d245537a5395c7a403a566522753c91f9c0c511b9a7229ac1ea2ba4a9c54c WHIRLPOOL 57e7f12fd054f5c22a4ec37bc7ff661dd07d09c4b95fb55849d7115a154a067ac1ff286445b987f39f83f3889c4dc82daeaa1cb9f72919bdea3486c22bdeab9b
 AUX courier-imapd-r1.service 299 SHA256 7c4800926bad3283164f91ba39a0aedc3404643062f7f508b1ed9bea71d34044 SHA512 5b44983d067b447bc60bd5365340c7ffd0c7102eba93fd87dda6cafb95c8625efe5badfaa4607c13a21ce37a7e781f5b81a47b9b18666403263e3d8789310d44 WHIRLPOOL 38310850fd03c76f72116862c97a0e1add1b7008b95416a2c6a3b7127b8a377d6ff497dbe9a36c085040e531716c0ece931266b055c7d7087c3cf2d8ec962c86
 AUX courier-imapd-ssl-r1.service 310 SHA256 c4705212124c13f01dd386ed4342c2a9d3ea436735fb3d8d066121b687eadcc2 SHA512 431a1113cbc10aa4042c621fda43eabaed79b4e0fabbc4692073c92368448324f958d3ad922b99b4290efad8a8164aff3698ac69e4e3c1f457d1616f769c11e5 WHIRLPOOL d13024f93ca06a3b019d6a9804d7ad3024bcc1cf6bb782fc27b4b7563492140ea4d13882e14150ccb60b2f7fe4a7fc7a298467e6627387e934d48d5d75dcae1a
-AUX courier-imapd-ssl.service 277 SHA256 9c1e97c93137a83fc5381d5ba2ba557777a22a7993d977b4cb9a139256330877 SHA512 8aa16239d239af9e344256de351bcd25cce5c92ccdca481d16c9c97bdb4c576bd889bb6bcbea163d5b472d3792a120fc1141e43701db8c631087f90a99076988 WHIRLPOOL 6b410784ee8850afa53cc6472e6945541e01252c584d86c43525721a09833a1a4ed0f34b5bcab67e711e2d26a31874942ec7daf1f7cdc70419a2ea955c20a94c
-AUX courier-imapd.service 265 SHA256 48c43249df0b0a2ff18372fca67d36da290f73bc1f9b453365015554985ca38e SHA512 154101170d1c7f03d3c63693695037027dfc36b086fa47bed4631de478f4a33c839dadc354990be2d0ecde1c27868f0d456565ced3fff79eaddd61199388c23e WHIRLPOOL 9eb2a50e5ce26a27aeeb42c6d91e55aeba3f033f2689777dce8782bb6d21a777ef575351ce41b3c51a0cb6f1475a887254fa1a4646c56bdf5fab01619426135c
 AUX mkimapdcert 996 SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4e043eaec4f6 SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4 WHIRLPOOL de07fbe8ef656223a5fe43c5e8b6df909257e0c171978db30d0c43e3ef56a927dd26b11468545c89e431dceb34f75a44b290192d304c5e32eb29fe54aaf6d111
 AUX mkpop3dcert 996 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 WHIRLPOOL 7b30ab63852376236717eb7cd230b453e2144f56641f506bd47b5fbea645fd7ac53c9147a9e3707a8b0233e74218f69c6b6d8c0f8ff764b3aa13a18d22d966b8
 DIST courier-imap-4.15.tar.bz2 3266353 SHA256 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a WHIRLPOOL 1b5e42bd1f72e3205030b54e9564ce45c4eccb394b31c64a616f225def5a5df05f74ef62c59fbea63b18ce336d77cc2368170a982abb7a6e94d309d0c6ee4dd2
-DIST courier-imap-4.8.0.tar.bz2 3362734 SHA256 ec7511a4398920a04f3bb60cf1208e29a9a5432baeff4d356a4ec142113bfbf2 SHA512 71f5aa44f1ab06bb83f06cffac728fde796f3fc8c00a7acc80e157a9c072876aa0c189781325c39634d14c4bbf8e0ac0b14d05725c7331bda817ea28a85be5a7 WHIRLPOOL 7dadd694348699222a52658cdec971bde7a2a3a4f0385745c32243e234784200a4415840de1e643943f83aa85cc29eb56ae4c5097c6a60c36e65ee2a40aa87f6
 EBUILD courier-imap-4.15-r1.ebuild 7476 SHA256 24485321de4297189f04d66c3e891771f191b2ed161f57d6aeb18d0ac6c71e0c SHA512 16c0b5bb93cfb2d9ab228f571a1d2edd4d817d08bd4319c5e15bc70bac74634eb93a5a9175d5b867d339c062c6e7d4e018a5834d57afd46cb1ccdde8025b9b29 WHIRLPOOL 7a9510f2cc9d2fb3e24f3d30c4d4b15ac3819c02bc931d5fd6b7439aef7b1c2c667183e57af50966d586a64af98a97b79d16684136062f47be13cb8cb52c63cc
-EBUILD courier-imap-4.8.0-r1.ebuild 7378 SHA256 dcf03580a17698699033e6df038e5366a72a5796973763ccea6c18ae7deb6835 SHA512 95616c43a59eb400bd97ada62fbfa2b16f829cf4783e38afaaaabb4695f6865b385b711aa0b2701f6a26b3ed918debfc8a9b08ae1883e16a8ecb33a69b178719 WHIRLPOOL 370563e5ffca7e70716901404a01faf8eb4dbfa08f2133bb3b062852102b347bb68b33392e61eab084704fdbb61b39cc432d7bc27d0b187122b38a2ca16e6bf6
-MISC ChangeLog 42501 SHA256 56b8e7cf673feaded4183b9a320e41b442faaa62ea6b7ad34c19a1bf12343941 SHA512 993ba1fae26c29d33a09eab609d52ce18536c89a006ff44123ef04421ce0eeadeaed28e51486156d60ac415ffb02c4949456a81fc36bfc5bea61972f6f26e1e7 WHIRLPOOL fc42419e47af66afdd0ef3c9637abf9f75796ab98f6cf1268853eac64ed7dd23028b79fdad0659f4e71fafda341b2ce54d232e04669c4454a2b9ce004f208e41
+MISC ChangeLog 42974 SHA256 d157462574b64858f4c67666ec6d9440fd009afa41a2b793c2c94a4239a41a3a SHA512 63b3494728948b0a069009567723066aa5d23abb9fa97f45360a8f6d21e30db7243cfd1e50e0b71034a0ac4088239adc1c99a2f26f0376ae86a3ad829810cfac WHIRLPOOL 1f6c0fd1f3ed0b2d7b143c96d99ee48f515837e1a06cca8e4bef84b954d662b666f8184ef9001a12d92b70f62f7d9b44582aa4e872ecda138e2d7a94ef390bc3
 MISC metadata.xml 591 SHA256 3848b4b44a10addc990c5b4140bd39c1178594dcb1af5e581656cbb23b90a2ca SHA512 08a8e3d8693eed082c5559e0a74c2eddd777473ccbddacb8e6605cb6113ecd4830226fea3e1e98f4d3b70ae0a5bb37c5bede58b8268376c02f3f7f34ed98353b WHIRLPOOL 9f35bc05f52154df7cf9d1f148e6d4d11037ff0d12816c59a39bf9d53bd74c60e438a795e6732ecfae2af14e80ec34ac7825128e331414ea590c8ffe8e00a17a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn2YQACgkQcaHudmEf86oEMACfZrtergnYAO53avkGGFmvDrZj
-IeMAn3yD201knWRaIfc+9Swg5GqdQt36
-=okDC
------END PGP SIGNATURE-----
diff --git a/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild b/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild
deleted file mode 100644
index 92e724ed6790..000000000000
--- a/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild,v 1.12 2014/08/10 20:43:48 slyfox Exp $
-
-EAPI=5
-inherit autotools eutils multilib libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6 )
-		>=net-libs/courier-authlib-0.61
-		>=net-mail/mailbase-0.00-r8
-		berkdb? ( sys-libs/db )
-		fam? ( virtual/fam )
-		gdbm? ( >=sys-libs/gdbm-1.8.0 )
-		selinux? ( sec-policy/selinux-courier )"
-DEPEND="${RDEPEND}
-		dev-lang/perl
-		!mail-mta/courier
-		userland_GNU? ( sys-process/procps )"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-src_prepare() {
-	# Bug #48838. Patch to enable/disable FAM support.
-	# 20 Aug 2004 langthang@gentoo.org
-	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
-
-	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
-	epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch
-
-	# These patches should fix problems detecting BerkeleyDB.
-	# We now can compile with db4 support.
-	if use berkdb ; then
-		epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	# 19 Aug 2004 langthang@gentoo.org
-	# Default to gdbm if both berkdb and gdbm are present.
-	if use gdbm ; then
-		einfo "Building with GDBM support"
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB support"
-		myconf="${myconf} --with-db=db"
-	fi
-
-	# Disabling unicode is no longer supported
-	# By default all available character sets are included
-	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
-	# to include only specified translation tables.
-	if [[ -z "${ENABLE_UNICODE}" ]] ; then
-		einfo "ENABLE_UNICODE is not set, building with all available character sets"
-		myconf="${myconf} --enable-unicode"
-	else
-		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
-		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
-	fi
-
-	if use trashquota ; then
-		einfo "Building with Trash Quota Support"
-		myconf="${myconf} --with-trashquota"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	# Do the actual build now
-	econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--sysconfdir=/etc/${PN} \
-		--libexecdir=/usr/$(get_libdir)/${PN} \
-		--localstatedir=/var/lib/${PN} \
-		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with gnutls) \
-		${myconf} || die "econf failed"
-
-	# Change the pem file location.
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
-		die "sed failed"
-}
-
-src_compile() {
-	# spurious failures with parallel compiles
-	emake -j1
-}
-
-src_install() {
-	dodir /var/lib/${PN} /etc/pam.d
-	emake DESTDIR="${D}" install
-	rm -Rf "${D}/etc/pam.d"
-
-	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd "${D}/usr/sbin"
-	for name in imapd pop3d ; do
-		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
-	done
-
-	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd "${D}/usr/$(get_libdir)/${PN}"
-	for service in {imapd,pop3d}{,-ssl} ; do
-		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
-		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
-	done
-
-	# Rename the config files correctly and add a value for ${MAILDIR} to them.
-	cd "${D}/etc/${PN}"
-	for service in {imapd,pop3d}{,-ssl} ; do
-		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
-		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
-		echo 'MAILDIR=.maildir' >> "${service}"
-		echo 'MAILDIRPATH=.maildir' >> "${service}"
-	done
-	for service in imapd pop3d ; do
-		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
-		echo 'PRERUN=' >> "${service}"
-		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
-		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
-		echo 'LOGINRUN=' >> "${service}"
-	done
-
-	cd "${D}/usr/sbin"
-	for x in * ; do
-		if [[ -L "${x}" ]] ; then
-			rm -f "${x}" || die "Failed to rm ${x}"
-		fi
-	done
-
-	cd ../share
-	mv -f * ../sbin
-	mv -f ../sbin/man .
-	cd ..
-
-	for x in mkimapdcert mkpop3dcert ; do
-		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
-	done
-
-	exeinto /usr/sbin
-	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
-
-	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger
-
-	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
-
-	for initd in courier-{imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
-		doinitd "${initd}"
-	done
-
-	systemd_dounit "${FILESDIR}"/courier-authdaemond.service
-	systemd_dounit "${FILESDIR}"/courier-imapd-ssl.service
-	systemd_dounit "${FILESDIR}"/courier-imapd.service
-
-	exeinto /usr/$(get_libdir)/${PN}
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
-		doexe "${exe}"
-	done
-
-	dodir /usr/bin
-	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
-
-	# Bug #45953, more docs.
-	cd "${S}"
-	dohtml -r "${S}"/*
-	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
-	docinto imap
-	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
-	docinto maildir
-	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc "${S}"/tcpd/README.couriertls
-}
-
-pkg_postinst() {
-	elog "Authdaemond is no longer provided by this package."
-	elog "Authentication libraries are now in courier-authlib."
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
-	# Some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
-}
-
-src_test() {
-	ewarn "make check is not supported by this package due to the"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
-}
diff --git a/net-mail/courier-imap/files/courier-authdaemond.service b/net-mail/courier-imap/files/courier-authdaemond.service
deleted file mode 100644
index c4cbbf1c18c1..000000000000
--- a/net-mail/courier-imap/files/courier-authdaemond.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Courier Authentification Daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -start /usr/lib/courier/courier-authlib/authdaemond
-ExecStop=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -stop /usr/lib/courier/courier-authlib/authdaemond
-PIDFile=/var/run/authdaemon.pid
-
-[Install]
-WantedBy=courier-imap.service
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch
deleted file mode 100644
index 7019d02a6af5..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- courier-imap-3.0.7-orig/maildir/configure.in	2004-06-08 15:44:23.000000000 -0700
-+++ courier-imap-3.0.7/maildir/configure.in	2004-08-14 15:28:20.525714876 -0700
-@@ -60,6 +60,12 @@
- dnl Checks for library functions.
- AC_CHECK_HEADER(fam.h, :, :)
- AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
-+AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
-+       fam="$withval",
-+       fam="no")
-+
-+if test "$fam" != "no"
-+then
- AC_CHECK_LIB(fam, FAMOpen,  [
- 			LIBFAM=-lfam
- 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
-@@ -74,6 +80,7 @@
- AC_MSG_ERROR([[FAM development libraries not found.]]) ]
- 					)
- 		  ])
-+fi
- 
- AC_SUBST(LIBFAM)
- 
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
deleted file mode 100644
index 14e9cda636ab..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.orig	2006-12-30 09:28:52.000000000 -0500
-+++ configure.in	2007-02-27 12:13:38.000000000 -0500
-@@ -16,7 +16,6 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_SYSCONFTOOL
- AC_LIBTOOL_DLOPEN
- AM_PROG_LIBTOOL
- 
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
deleted file mode 100644
index 4f14d72db5a4..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- bdbobj/configure.in.orig	2001-09-18 18:26:28.000000000 -0700
-+++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
-@@ -21,15 +21,23 @@
- dnl Checks for libraries.
- 
- saveLIBS="$LIBS"
--AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--	))
--
--FOUND_DB=0
--AC_CHECK_FUNC(dbopen, FOUND_DB=1)
--AC_CHECK_FUNC(db_open, FOUND_DB=1)
--AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
-+for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+  do
-+        AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+        	AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+        		AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+          		AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+            		AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+              		AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
-+
-+  done
-+FOUND_DB=0
-+AC_CHECK_FUNC(db_create_4004, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4003, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create, FOUND_DB=1)
- 
- LIBS="$saveLIBS"
- 
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
deleted file mode 100644
index 03d2c03912a8..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.in.orig	2004-11-16 16:02:11.045791896 -0800
-+++ configure.in	2004-11-16 16:03:06.743324584 -0800
-@@ -150,16 +149,22 @@
- 
- if test "$db" != "gdbm"
- then
-+  for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+    do
-+	AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+			AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	  	AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	    	AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	      	AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
-+    done
-+  AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
- 
--	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--		AC_CHECK_LIB(db, db_env_create,
--				[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--	))
--
--	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
- fi
- 
- LIBS="$saveLIBS"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch
deleted file mode 100644
index 6fdff769afa7..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcpd/configure.in.orig	2007-02-02 17:20:18.000000000 +0100
-+++ tcpd/configure.in	2007-02-02 17:20:58.000000000 +0100
-@@ -84,7 +84,7 @@
- 	USE_GDBM=0
- 	LIBGDBM=""
- 	dblibrary=../bdbobj/libbdbobj.la
--	LIBDB="-Wl,$LIBDB"
-+	LIBDB="$LIBDB"
- 	;;
- *)
- 	COURIERTCPD=""
diff --git a/net-mail/courier-imap/files/courier-imapd-ssl.service b/net-mail/courier-imap/files/courier-imapd-ssl.service
deleted file mode 100644
index 395611399db3..000000000000
--- a/net-mail/courier-imap/files/courier-imapd-ssl.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Courier IMAP Daemon
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/courier-imap/imapd-ssl
-ExecStart=/usr/lib/courier-imap/gentoo-imapd-ssl.rc
-ExecStop=/bin/kill $MAINPID
-PIDFile=/var/run/imapd-ssl.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/courier-imapd.service b/net-mail/courier-imap/files/courier-imapd.service
deleted file mode 100644
index e8780b63729b..000000000000
--- a/net-mail/courier-imap/files/courier-imapd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Courier IMAP Daemon
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/courier-imap/imapd
-ExecStart=/usr/lib/courier-imap/gentoo-imapd.rc
-ExecStop=/bin/kill $MAINPID
-PIDFile=/var/run/imapd.pid
-
-[Install]
-WantedBy=multi-user.target