Remove old

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

7 files changed, 8 insertions, 554 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 6ff5d3e2b0a0..7f20f2cbb2b9 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/c-client
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.106 2012/12/30 16:37:05 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.107 2013/01/04 08:33:23 eras Exp $
+
+  04 Jan 2013; Eray Aslan <eras@gentoo.org> -c-client-2007e-r2.ebuild,
+  -c-client-2007f-r1.ebuild, -c-client-2007f-r2.ebuild,
+  -c-client-2007f-r3.ebuild, -files/2002d-Makefile.patch,
+  -files/c-client-2007e-ldflags.patch:
+  Remove old
 
   30 Dec 2012; Raúl Porcel <armin76@gentoo.org> c-client-2007f-r4.ebuild:
   s390/sh/sparc stable wrt #445063
diff --git a/net-libs/c-client/c-client-2007e-r2.ebuild b/net-libs/c-client/c-client-2007e-r2.ebuild
deleted file mode 100644
index 29e070f1d811..000000000000
--- a/net-libs/c-client/c-client-2007e-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007e-r2.ebuild,v 1.11 2012/12/21 09:05:28 ulm Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils libtool toolchain-funcs
-
-MY_PN=imap
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW IMAP c-client library"
-HOMEPAGE="http://www.washington.edu/imap/"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc kernel_linux kernel_FreeBSD kolab pam ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	!net-mail/uw-imap"
-DEPEND="${RDEPEND}
-	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
-
-src_prepare() {
-	# Tarball packed with bad file perms
-	chmod -R u+rwX,go-w .
-
-	# lots of things need -fPIC, including various platforms, and this library
-	# generally should be built with it anyway.
-	append-flags -fPIC
-
-	# Modifications so we can build it optimally and correctly
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
-		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
-
-	# Targets should use the Gentoo (ie linux) fs
-	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
-
-	# Apply a patch to only build the stuff we need for c-client
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch || die "epatch failed"
-
-	# Apply patch to add the compilation of a .so for PHP
-	# This was previously conditional, but is more widely useful.
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
-
-	# Remove the pesky checks about SSL stuff
-	sed -e '/read.*exit/d' -i Makefile
-
-	# Respect LDFLAGS
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
-		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
-		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
-		-i src/osdep/unix/Makefile || die "Respecting build flags"
-
-	# Add kolab support.
-	# http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/imap/
-	if use kolab ; then
-		epatch "${FILESDIR}"/${PN}-2006k_KOLAB_Annotations.patch || die "epatch failed"
-	fi
-
-	elibtoolize
-}
-
-src_compile() {
-	local ssltype target
-	use ssl && ssltype="unix" || ssltype="none"
-	if use kernel_linux ; then
-		use pam && target=lnp || target=lnx
-	elif use kernel_FreeBSD ; then
-		target=bsf
-	fi
-	# no parallel builds supported!
-	emake -j1 SSLTYPE=${ssltype} $target EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}" || die "make failed"
-}
-
-src_install() {
-	# Library binary
-	dolib.a c-client/c-client.a || die
-	dosym c-client.a /usr/$(get_libdir)/libc-client.a
-
-	# Now the shared library
-	dolib.so c-client/libc-client.so.1.0.0 || die
-
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
-
-	# Headers
-	insinto /usr/include/imap
-	doins c-client/*.h
-	doins c-client/linkage.c
-	#exclude these dupes (can't do it before now due to symlink hell)
-	rm "${D}"/usr/include/imap/os_*.h
-
-	# Docs
-	dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
-	if use doc; then
-		docinto rfc
-		dodoc docs/rfc/*.txt
-		docinto draft
-		dodoc docs/draft/*
-	fi
-}
diff --git a/net-libs/c-client/c-client-2007f-r1.ebuild b/net-libs/c-client/c-client-2007f-r1.ebuild
deleted file mode 100644
index d3f1bf4b422b..000000000000
--- a/net-libs/c-client/c-client-2007f-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r1.ebuild,v 1.10 2012/12/21 09:05:28 ulm Exp $
-
-EAPI=4
-
-inherit flag-o-matic eutils libtool toolchain-funcs
-
-MY_PN=imap
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW IMAP c-client library"
-HOMEPAGE="http://www.washington.edu/imap/"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc kernel_linux kernel_FreeBSD pam ssl static-libs"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	!net-mail/uw-imap"
-DEPEND="${RDEPEND}
-	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
-
-src_prepare() {
-	# Tarball packed with bad file perms
-	chmod -R u+rwX,go-w .
-
-	# lots of things need -fPIC, including various platforms, and this library
-	# generally should be built with it anyway.
-	append-flags -fPIC
-
-	# Modifications so we can build it optimally and correctly
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
-		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
-
-	# Targets should use the Gentoo (ie linux) fs
-	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
-
-	# Apply a patch to only build the stuff we need for c-client
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch
-
-	# Apply patch to add the compilation of a .so for PHP
-	# This was previously conditional, but is more widely useful.
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
-
-	# Remove the pesky checks about SSL stuff
-	sed -e '/read.*exit/d' -i Makefile || die
-
-	# Respect LDFLAGS
-	epatch "${FILESDIR}"/${PN}-2007e-ldflags.patch
-	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
-		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
-		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
-		-i src/osdep/unix/Makefile || die "Respecting build flags"
-
-	elibtoolize
-}
-
-src_compile() {
-	local ssltype target
-	use ssl && ssltype="unix" || ssltype="none"
-	if use kernel_linux ; then
-		use pam && target=lnp || target=lnx
-	elif use kernel_FreeBSD ; then
-		target=bsf
-	fi
-	# no parallel builds supported!
-	emake -j1 SSLTYPE=${ssltype} $target EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	if use static-libs; then
-		# Library binary
-		dolib.a c-client/c-client.a
-		dosym c-client.a /usr/$(get_libdir)/libc-client.a
-	fi
-
-	# Now the shared library
-	dolib.so c-client/libc-client.so.1.0.0
-
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
-
-	# Headers
-	insinto /usr/include/imap
-	doins src/osdep/unix/*.h
-	doins src/c-client/*.h
-	doins c-client/linkage.h
-	doins c-client/linkage.c
-	doins c-client/osdep.h
-
-	# Docs
-	dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
-	if use doc; then
-		docinto rfc
-		dodoc docs/rfc/*.txt
-		docinto draft
-		dodoc docs/draft/*
-	fi
-}
diff --git a/net-libs/c-client/c-client-2007f-r2.ebuild b/net-libs/c-client/c-client-2007f-r2.ebuild
deleted file mode 100644
index 2f5c4da7279e..000000000000
--- a/net-libs/c-client/c-client-2007f-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r2.ebuild,v 1.2 2012/12/21 09:05:28 ulm Exp $
-
-EAPI=4
-
-inherit flag-o-matic eutils libtool toolchain-funcs multilib
-
-MY_PN=imap
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW IMAP c-client library"
-HOMEPAGE="http://www.washington.edu/imap/"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc kernel_linux kernel_FreeBSD pam ssl static-libs"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	!net-mail/uw-imap"
-DEPEND="${RDEPEND}
-	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
-
-src_prepare() {
-	# Tarball packed with bad file perms
-	chmod -R u+rwX,go-w .
-
-	# lots of things need -fPIC, including various platforms, and this library
-	# generally should be built with it anyway.
-	append-flags -fPIC
-
-	# Modifications so we can build it optimally and correctly
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
-		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
-
-	# Make the build system more multilib aware
-	sed \
-		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
-		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
-		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
-
-	# Targets should use the Gentoo (ie linux) fs
-	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
-
-	# Apply a patch to only build the stuff we need for c-client
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch
-
-	# Apply patch to add the compilation of a .so for PHP
-	# This was previously conditional, but is more widely useful.
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
-
-	# Remove the pesky checks about SSL stuff
-	sed -e '/read.*exit/d' -i Makefile || die
-
-	# Respect LDFLAGS
-	epatch "${FILESDIR}"/${PN}-2007e-ldflags.patch
-	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
-		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
-		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
-		-i src/osdep/unix/Makefile || die "Respecting build flags"
-
-	elibtoolize
-}
-
-src_compile() {
-	local ssltype target
-	use ssl && ssltype="unix" || ssltype="none"
-	if use kernel_linux ; then
-		use pam && target=lnp || target=lnx
-	elif use kernel_FreeBSD ; then
-		target=bsf
-	fi
-	# no parallel builds supported!
-	emake -j1 SSLTYPE=${ssltype} $target EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	if use static-libs; then
-		# Library binary
-		dolib.a c-client/c-client.a
-		dosym c-client.a /usr/$(get_libdir)/libc-client.a
-	fi
-
-	# Now the shared library
-	dolib.so c-client/libc-client.so.1.0.0
-
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
-
-	# Headers
-	insinto /usr/include/imap
-	doins src/osdep/unix/*.h
-	doins src/c-client/*.h
-	doins c-client/linkage.h
-	doins c-client/linkage.c
-	doins c-client/osdep.h
-
-	# Docs
-	dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
-	if use doc; then
-		docinto rfc
-		dodoc docs/rfc/*.txt
-		docinto draft
-		dodoc docs/draft/*
-	fi
-}
diff --git a/net-libs/c-client/c-client-2007f-r3.ebuild b/net-libs/c-client/c-client-2007f-r3.ebuild
deleted file mode 100644
index efa0931b480e..000000000000
--- a/net-libs/c-client/c-client-2007f-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r3.ebuild,v 1.5 2012/12/21 09:05:28 ulm Exp $
-
-EAPI=4
-
-inherit flag-o-matic eutils libtool toolchain-funcs multilib
-
-MY_PN=imap
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW IMAP c-client library"
-HOMEPAGE="http://www.washington.edu/imap/"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	!net-mail/uw-imap
-	kerberos? ( app-crypt/mit-krb5 )"
-DEPEND="${RDEPEND}
-	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
-
-src_prepare() {
-	# Tarball packed with bad file perms
-	chmod -R u+rwX,go-w .
-
-	# lots of things need -fPIC, including various platforms, and this library
-	# generally should be built with it anyway.
-	append-flags -fPIC
-
-	# Modifications so we can build it optimally and correctly
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
-		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
-
-	# Make the build system more multilib aware
-	sed \
-		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
-		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
-		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
-
-	# Targets should use the Gentoo (ie linux) fs
-	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
-		-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
-
-	# Apply a patch to only build the stuff we need for c-client
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch
-
-	# Apply patch to add the compilation of a .so for PHP
-	# This was previously conditional, but is more widely useful.
-	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
-
-	# Remove the pesky checks about SSL stuff
-	sed -e '/read.*exit/d' -i Makefile || die
-
-	# Respect LDFLAGS
-	epatch "${FILESDIR}"/${PN}-2007f-ldflags.patch
-	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
-		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
-		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
-		-i src/osdep/unix/Makefile || die "Respecting build flags"
-
-	elibtoolize
-}
-
-src_compile() {
-	local mymake ipver ssltype target passwdtype
-	ipver='IP=4'
-	use ipv6 && ipver="IP=6" && touch ip6
-	use ssl && ssltype="unix" || ssltype="none"
-	if use kernel_linux ; then
-		use pam && target=lnp passwdtype=pam || target=lnx passwdtype=std
-	elif use kernel_FreeBSD ; then
-		target=bsf passwdtype=pam
-	fi
-	use kerberos \
-		&& mymake="EXTRAAUTHENTICATORS=gss" \
-		&& EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
-	# no parallel builds supported!
-	emake -j1 SSLTYPE=${ssltype} $target \
-		PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \
-		EXTRACFLAGS="${CFLAGS}" \
-		EXTRALDFLAGS="${LDFLAGS}" \
-		EXTRALIBS="${EXTRALIBS}" \
-		GSSDIR=/usr
-}
-
-src_install() {
-	if use static-libs; then
-		# Library binary
-		dolib.a c-client/c-client.a
-		dosym c-client.a /usr/$(get_libdir)/libc-client.a
-	fi
-
-	# Now the shared library
-	dolib.so c-client/libc-client.so.1.0.0
-
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
-
-	# Headers
-	insinto /usr/include/imap
-	doins src/osdep/unix/*.h
-	doins src/c-client/*.h
-	doins c-client/linkage.h
-	doins c-client/linkage.c
-	doins c-client/osdep.h
-
-	# Docs
-	dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
-	if use doc; then
-		docinto rfc
-		dodoc docs/rfc/*.txt
-		docinto draft
-		dodoc docs/draft/*
-	fi
-}
diff --git a/net-libs/c-client/files/2002d-Makefile.patch b/net-libs/c-client/files/2002d-Makefile.patch
deleted file mode 100644
index ce0d0b3701b1..000000000000
--- a/net-libs/c-client/files/2002d-Makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- Makefile~	2003-04-16 17:32:42.000000000 -0700
-+++ Makefile	2003-05-31 19:58:50.000000000 -0700
-@@ -256,7 +256,7 @@
- 
- # Make the IMAP Toolkit
- 
--all:	SPECIALS c-client rebuild bundled
-+all:	SPECIALS c-client rebuild 
- 
- c-client:
- 	@echo Not processed yet.  In a first-time build, you must specify
-@@ -448,16 +448,9 @@
- 	$(TOOLS)/$@ "$(LN)" src/ansilib c-client
- 	$(TOOLS)/$@ "$(LN)" src/charset c-client
- 	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
--	$(TOOLS)/$@ "$(LN)" src/mtest mtest
--	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
--	$(TOOLS)/$@ "$(LN)" src/imapd imapd
--	$(TOOLS)/$@ "$(LN)" src/mailutil mailutil
--	$(TOOLS)/$@ "$(LN)" src/mlock mlock
--	$(TOOLS)/$@ "$(LN)" src/dmail dmail
--	$(TOOLS)/$@ "$(LN)" src/tmail tmail
- 	$(LN) $(TOOLS)/$@ .
- 
--build:	OSTYPE rebuild rebuildclean bundled
-+build:	OSTYPE rebuild rebuildclean
- 
- OSTYPE:
- 	@echo Building c-client for $(BUILDTYPE)...
-@@ -472,8 +465,6 @@
- 	echo $(BUILDTYPE) > OSTYPE
- 	$(TOUCH) rebuild
- 
--rebuild:
--	@$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
- 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
- 	@$(TOUCH) SPECIALS
- 	$(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
-@@ -482,26 +473,6 @@
- rebuildclean:
- 	$(SH) -c '$(RM) rebuild || true'
- 
--bundled:
--	@echo Building bundled tools...
--	$(CD) mtest;$(MAKE)
--	$(CD) ipopd;$(MAKE)
--	$(CD) imapd;$(MAKE)
--	$(CD) mailutil;$(MAKE)
--	@$(SH) -c '(test -f /usr/include/sysexits.h ) || make sysexitwarn'
--	$(CD) mlock;$(MAKE) || true
--	$(CD) dmail;$(MAKE) || true
--	$(CD) tmail;$(MAKE) || true
--
--
--sysexitwarn:
--	@echo Hmm...it does not look like /usr/include/sysexits.h exists.
--	@echo Either your system is too ancient to have the sysexits.h
--	@echo include, or your C compiler gets it from some other location
--	@echo than /usr/include.  If your system is too old to have the
--	@echo sysexits.h include, you will not be able to build the
--	@echo following programs.
--
- clean:
- 	@echo Removing old processed sources and binaries...
- 	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
diff --git a/net-libs/c-client/files/c-client-2007e-ldflags.patch b/net-libs/c-client/files/c-client-2007e-ldflags.patch
deleted file mode 100644
index 7ca0942e3364..000000000000
--- a/net-libs/c-client/files/c-client-2007e-ldflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/osdep/unix/Makefile~	2011-06-07 16:04:29.000000000 +0300
-+++ src/osdep/unix/Makefile	2011-06-07 15:55:31.000000000 +0300
-@@ -954,23 +954,24 @@
- 
- # Once-only environment setup
- 
--once:	onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
-+once:	ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
- 
- onceenv:
- 	@echo Once-only environment setup...
- 	echo $(CC) > CCTYPE
--	echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
--	echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
-+	echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
-+	echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
- 	 -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
- 	 -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
- 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
- 	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
- 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
--	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
-+	echo `$(CAT) LDFLAGS` > LIBS
-+	echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
- 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
--	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
--	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
-+	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
-+	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
- 	 >> ARCHIVE
- 	echo $(OS) > OSTYPE
- 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy