Bug #313799: clean up old 1.11.x versions which no longer compile. Also clean up older 1.12.x versions.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

12 files changed, 10 insertions, 639 deletions

diff --git a/dev-vcs/cvs/ChangeLog b/dev-vcs/cvs/ChangeLog
index b946581a2b78..a49bea69223d 100644
--- a/dev-vcs/cvs/ChangeLog
+++ b/dev-vcs/cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/cvs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/ChangeLog,v 1.2 2010/10/19 05:38:15 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/ChangeLog,v 1.3 2010/12/06 20:51:39 robbat2 Exp $
+
+  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> -cvs-1.11.20.ebuild,
+  -cvs-1.11.21.ebuild, -cvs-1.11.21-r1.ebuild, -cvs-1.11.22.1.ebuild,
+  -cvs-1.11.22.1-r1.ebuild, -files/cvs-1.11.22.1-hash-nameclash.patch,
+  -cvs-1.12.12-r2.ebuild, -cvs-1.12.12-r3.ebuild, -cvs-1.12.12-r4.ebuild,
+  -cvs-1.12.12-r5.ebuild:
+  Bug #313799: clean up old 1.11.x versions which no longer compile. Also clean
+  up older 1.12.x versions.
 
   19 Oct 2010; Mart Raudsepp <leio@gentoo.org> cvs-1.11.20.ebuild,
   cvs-1.12.12-r2.ebuild, cvs-1.12.12-r4.ebuild:
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 86d73392bf2a..75119e30ef87 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -1,4 +1,3 @@
-AUX cvs-1.11.22.1-hash-nameclash.patch 974 RMD160 c2eb8eaa3cd17273b1b49eb30e33c6afd31f0677 SHA1 f4880b1c7b13533061d2250465226ca70c032ee0 SHA256 2334f94d64e1565535818d6b41c079540acaf19b2320ba06275d78cf5b3e6d43
 AUX cvs-1.12.12-block-requests.patch 4006 RMD160 47be05434e53c25fc6dd1fa6848d25d155dc307a SHA1 a4e77d76457a3047c19945d53f3b2aca572d1da4 SHA256 70bbf745815d1e01582329160a10f5cdd9c11051e4e62d331686dd5124e01294
 AUX cvs-1.12.12-cvs-custom.c 1735 RMD160 c4c1dea5b3656061a2eb0678acaa95c1b58b2e87 SHA1 409184599eb9b311a91066d75b2833ee455bbd4d SHA256 bd288a9484c4c26569a44e71f0935cf310e4b02e25e7e9ba564c9fc3f5121054
 AUX cvs-1.12.12-cvs-gnulib-vasnprintf.patch 1092 RMD160 1ec01dbfca6cbc8b933f1331b1e020430494273d SHA1 9edfd35bff01a05a9b1936f33f4645a57fb818d7 SHA256 f38e6bbb0fd8b783b654ac775183a1cb24e3987698fdbd706a8d5fa59a45f945
@@ -14,40 +13,19 @@ AUX cvs-1.12.13.1-gl-mempcpy.patch 902 RMD160 fa2236cd81a787c4ed856fe5f30f408e9b
 AUX cvs-1.12.13.1-hash-nameclash.patch 1056 RMD160 b5b8ecbb11841fd9eea1802e0ba5e4557eb22627 SHA1 d9ed7325986618082d791053fff9f90b3758cfd6 SHA256 4faeef2d4169799dad63a934f26d90ae9d6d47d1d88d37b0c4b39423b46ce40f
 AUX cvs.pam-include-1.12.12 106 RMD160 8c056262a6cf2b9f94c1762c7cebed02e72ef722 SHA1 2fa6dca77ebab74d519e1373e5c5ea14283ba0ea SHA256 8291f84c2d76269e7be6487ae1db7212e67ee7313d35e6b0cebcd01e30d155af
 AUX cvspserver.xinetd.d 282 RMD160 83fe38b4f55eaf7784d1672c73415410b389479b SHA1 4f29028cd8b41d5934b59e7f41e7c3b385b83d54 SHA256 71b62c4f278ed17bf3cac8eacb2bfb17b6125bfe77f83b46fa5742395b74ef5f
-DIST cederqvist-1.11.20.html.tar.bz2 115711 RMD160 0d44ef453f1f98ee7fe006a0d60e0eba92c58598 SHA1 cfc8b233b076b8d9e147b8a890b87e8cd7e3c941 SHA256 2f11179ab25976142b622300a93274df96e6145cd3da7be964a1de33d54f4810
-DIST cederqvist-1.11.20.pdf 1090339 RMD160 3a6c2fe1bd4ce73ca7d7690a599afa15941b02cf SHA1 96b5ecc48a8e7fbb12dfef35fceba62d87732313 SHA256 bcb2579e6c29c36f5e69d0153b07e91db4f72f3ef3d14f1063d5c9670dc3ba7e
-DIST cederqvist-1.11.20.ps 1095795 RMD160 ae6c76bb8b152c2d149d130bd0f25e6bb471bab6 SHA1 9c63bb673cb0ff9886ea9b47eea68cf5003a41aa SHA256 65d6ae199179a9fb7c2d1d766afcf6b2a4535c3524759ae02dc7b9c5c2619c1d
-DIST cederqvist-1.11.21.html.tar.bz2 116435 RMD160 517067247e000136b4c09bc3c15f8cd77bd19f35 SHA1 4c53e0bdbf1f70c17bc0a3cc05ecc610d74d7e09 SHA256 3da66e09a88abd911db578dab85e4881c88cc92045b97c9a1ad2e02465985b0b
-DIST cederqvist-1.11.21.pdf 1109097 RMD160 492c02a92a72986b8e5b3601a7607f1a9697865c SHA1 d315145029dfaeafa9419d782ddc465cfc742116 SHA256 b3e8f23bf8f1f9346a6fb0278603a7163c30ff48e04ee220e874ade70024792d
-DIST cederqvist-1.11.21.ps 1100386 RMD160 5a8500c89cbd9fe04515ee3dce20aba9915591bc SHA1 450d0e0c9e5be6eed52ec43a39826813b6040aba SHA256 53c6d0ad5de8c8d0cfe8c9b4d30d52785498c9f83699f2dec6fc67257b550772
-DIST cederqvist-1.11.22.1.html.bz2 107756 RMD160 71097b684f70da383c0ea304362397c77060f1c9 SHA1 29c921915ab269645943116033f20cf6bf3ed36e SHA256 7341279a3643417730f0459e7ce3af6ffbec483dc497f8823639c741ef4f12c1
-DIST cederqvist-1.11.22.1.pdf 1109762 RMD160 8239082132f6dd21b6e14725eb59ae399dd07788 SHA1 35595936983981835da631615211da654fa0b9fd SHA256 94f42f25366d3d294c9880b1c0ab7d2dc6f03192831f08481aea818a50d1b78b
-DIST cederqvist-1.11.22.1.ps 1102300 RMD160 876b35c99d98cb937146dde6c8efc4d43b183804 SHA1 ba6fcee61788560e098b46084c83cf23a8d8a586 SHA256 01c9707b9a398f82eef2aa5cbc00e7a4f668d2ae6c8e4d8c152f22955b6df9f4
 DIST cederqvist-1.12.12.html.tar.bz2 137581 RMD160 4b98b01dce9554dc5191f82c5df54e784934dd2b SHA1 300e2860b4f3e33bf22e6b426693c78e4d8d6ece SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6
 DIST cederqvist-1.12.12.pdf 1252423 RMD160 61b82c41cc365c03ee3a483cb7200a6dce2c9ffc SHA1 1d09926dd8eedce30d6cfff48f6931ac9cf0575e SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce
 DIST cederqvist-1.12.12.ps 1262208 RMD160 49fc79c627cd4b590381a6b0f609f55495546df8 SHA1 0767bc9f548176d01968ea11a09379426bb63c31 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab
 DIST cederqvist-1.12.13.html.tar.bz2 140382 RMD160 34723707e078e210a2c032e8c98726a7037b05e6 SHA1 b1abf7876d97e509c68692089a5eb368fc65bd0b SHA256 1a9a34e07c00de5102224b48cbc53384992aea197c91c20b6140dd6885b5ae87
 DIST cederqvist-1.12.13.pdf 1297631 RMD160 8d0520254a964d146d704fe93656415edc146fec SHA1 47262bfd3d671acc98d06128c86c863e5e82f7af SHA256 4f24b2ac3b81c97798cad42cba8ffe6cc65405f13e5a58a4b063aa9fffc4a7bc
 DIST cederqvist-1.12.13.ps 1280573 RMD160 a370346c4ce84e224968181046482f87116a155b SHA1 dd85edc53ef3b441374d16df077c5b90d9fee272 SHA256 a955722b89155e390635b1220fa67a096c97141d83ac53a7840323c01d13aa91
-DIST cvs-1.11.20.tar.bz2 2414744 RMD160 4f926d661b35dc1bafb5ee5f98487289a907d34d SHA1 47f51a96b5a73e18c96f431f3c494735aa9c0236 SHA256 05f358bdda8911eb0c558be4098af2da5e1b74269b1e67b7a1b2b9cccd4454ba
-DIST cvs-1.11.21.tar.bz2 2929933 RMD160 bc3f15b506174de6d304e9608a26e80d3e2f0513 SHA1 d114ed2943a4027f1277b04f57867a2e09a1f432 SHA256 4027e80aeddb69a3dd2d73e916ec20c0eadb0b61c3cd86e18fff1eec8b510e18
-DIST cvs-1.11.22.1.tar.bz2 2952428 RMD160 2377c94833ea34edc88ba5e1d1860cac4300e4f0 SHA1 0b4e9e1e27e83efbe156402ccb71343db11cdad2 SHA256 f5244d31176dfd1f8ff29fa1903baee3e1949aa88c348bb37a475a3187354045
 DIST cvs-1.12.12.tar.bz2 3197171 RMD160 7275686576957e016b4f671ad5d52d8961d2d7d2 SHA1 402e81a3d231535a97e4b4f438c0b68920e57d0c SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc
 DIST cvs-1.12.13.1.tar.bz2 4075630 RMD160 7e281fe8f63805c2fa76dad18b2c537e77cea8b2 SHA1 125e8de8162fd67b6a117a8784690105832a4bf0 SHA256 de7f374d8c4ac414c04e8d44ce9a5d3da919825a6a332d747e299dc7a80c2218
 DIST cvs-1.12.13.tar.bz2 3911104 RMD160 ba3048e3e2d99ae78f6a759889b615acf65dd487 SHA1 93a8dacc6ff0e723a130835713235863f1f5ada9 SHA256 78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e
-EBUILD cvs-1.11.20.ebuild 1525 RMD160 71a1f3eccf183d25cf70a96fc23389dda8830f2c SHA1 4aa14870a318e685c8e869c74e007d2a3f7c7d64 SHA256 f0166a2d77f4f29aa850038c900fe2c1e4db58906918afa149f3bc2ab360f6b4
-EBUILD cvs-1.11.21-r1.ebuild 1689 RMD160 8c431074cad5b2f69f6f20b2e24ee203310ea4a8 SHA1 b32ba73ac1a2339e4981788e0eefbfe280a5f92d SHA256 fec1fd1ba3bef20679c10c1087944e62bdfc05da7876ea5cc87aacc6b109e17e
-EBUILD cvs-1.11.21.ebuild 1528 RMD160 9b613090b5b1dff873b3cf4fb3a779f4b3311f1e SHA1 13444dac559706ffc403c95f119cbdf7956a8e57 SHA256 c0917579b598b55b1daacb1c8739323d48025909da810341ee70988a6ed243ac
-EBUILD cvs-1.11.22.1-r1.ebuild 2042 RMD160 5661fc2a33e6f446fe3f46fc56841e168678162c SHA1 253c9040d0a58f08feddc5576ab2ce565c90a740 SHA256 88c41d4b952a08a94e3fbe91b9c365ceeb5f973dfc126cc62329ba221c0e9f9d
-EBUILD cvs-1.11.22.1.ebuild 1719 RMD160 53d386cd5f1b0e0a97ed50930a14b798381d2316 SHA1 9482e38d770e0cd59fdff0f6588f50b9dc628eee SHA256 87192257e1190565e7839ae9602bd63963b140cff2ce88a9d1570944e54143d8
-EBUILD cvs-1.12.12-r2.ebuild 1952 RMD160 b886c31db95bef010cb059a37825fb80d8215406 SHA1 4f920671ac1aa76f0fdd78843a5c98fceabb578c SHA256 f5bcb5cdb730e6aadda2db167a069e145e5ea4ec9e2917a5328a20871520ab9a
-EBUILD cvs-1.12.12-r3.ebuild 2078 RMD160 8f5c0871b9baf3bf9d5895bff5968d5af6de4d05 SHA1 99e1992da25bce8afcffd1c32b16fecc485030af SHA256 772c692341e5bc627461f573e32f851988ba7033478eb9387d8be531aba0c84e
-EBUILD cvs-1.12.12-r4.ebuild 2385 RMD160 1bfd59b27dc05462f1d7c71ad1c82380856abe10 SHA1 04a3cf8937c690b37460cf66b99dd29ae267b46b SHA256 68a1bad00433507ad94b47b7dd7775d890963c4252b6601c2e735eecfa4e1870
-EBUILD cvs-1.12.12-r5.ebuild 2417 RMD160 c0d824addd0bd3466ce76bfbbf4ea788b971c748 SHA1 835961fad747fc2f8e14193c0020b87bebb9909f SHA256 168b3b4294537e6297690d9d5f2f8292b360a2a5339e1299f7d7680ebc36a9f0
 EBUILD cvs-1.12.12-r6.ebuild 2460 RMD160 5bd8b93a8ca315d16abf71edf454a34ffcf3717c SHA1 6203b0f5da46d8d6e457bac777f80e29955204e1 SHA256 7b0b23313aba0167cefb83799375d290c59b61e368e4b06e31aa39d18760d533
 EBUILD cvs-1.12.12-r7.ebuild 2568 RMD160 32c0fa41fc9aefdfacf0578b1f2d77dc1e717d8d SHA1 6520d4a492a36e1424c280e4a249515b698bbf3b SHA256 6b770b5fcb4abbda89d1bea398bf4adb3d024ebfa2886e9d24ed66acdf757cb4
 EBUILD cvs-1.12.12-r8.ebuild 2619 RMD160 05d70221e09aec34086f9011124a3e2549357682 SHA1 21ccdf1190463f5165d29f1fe0e7b72cee30b78c SHA256 7887dece92707a67e247070901dbbe02d1c4054e376ac2a72e2b886e002c86c1
 EBUILD cvs-1.12.13-r1.ebuild 4002 RMD160 9e8a47fc7b71f8a36addb571bdf1d006eb66d4b5 SHA1 cf1d554e8532560305f4b39f574c8c6aff1c49f8 SHA256 554f55d518ba6c67f34646cf1c1bc082f23547ebbc830f517db3ce00821bd663
 EBUILD cvs-1.12.13.1.ebuild 4763 RMD160 6f20888e591b5fe6655374ddd81def46327613cf SHA1 5da7d91b3e3a86f523a98d5e902f6702b707fccb SHA256 8d7ad1d2f9bd3e03190f2a4f917b28956058931176a40b4dde5ecb907f430ce2
-MISC ChangeLog 20735 RMD160 94f31ecfee03cf25ddda9d5c80312f58956e8560 SHA1 751e37b03f80a7545ed476f5bc80745ff72bd0d3 SHA256 9b21c46d706c1e28bd1cd6b59ce0018c46a3bb5021d4299c2dd1995d624f37f8
+MISC ChangeLog 21162 RMD160 0e79feb6f488273d82cf920030f4933ca2ec56c3 SHA1 acfaf97685c41d4fff0a1202e6e0c0f48b07a889 SHA256 18cf3eb8ea15f9acf1f503e2700ed5474f26cb6efa678bd78448efc0ed33bb08
 MISC metadata.xml 234 RMD160 e17a8f89518ebdd332c220104e56f649096be1da SHA1 472e62beb27cdd753a0454194630c916f0600e0b SHA256 ce7beba20d6099be006550fb74bb9e74628a9d6967c7ceb096ab99959df47a02
diff --git a/dev-vcs/cvs/cvs-1.11.20.ebuild b/dev-vcs/cvs/cvs-1.11.20.ebuild
deleted file mode 100644
index 6f5c5b332c09..000000000000
--- a/dev-vcs/cvs/cvs-1.11.20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.20.ebuild,v 1.2 2010/10/19 05:38:15 leio Exp $
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-SRC_URI="http://ccvs.cvshome.org/files/documents/19/861/${P}.tar.bz2
-	doc? ( http://ccvs.cvshome.org/files/documents/19/866/cederqvist-${PV}.html.tar.bz2
-		http://ccvs.cvshome.org/files/documents/19/868/cederqvist-${PV}.pdf
-		http://ccvs.cvshome.org/files/documents/19/869/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc emacs"
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	econf --with-tmpdir=/tmp || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.11.21-r1.ebuild b/dev-vcs/cvs/cvs-1.11.21-r1.ebuild
deleted file mode 100644
index 8b81b6bf0e31..000000000000
--- a/dev-vcs/cvs/cvs-1.11.21-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.21-r1.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
-
-EAPI=3
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-SRC_URI="mirror://gnu/non-gnu/cvs/source/stable/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs"
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_configure() {
-	econf --with-tmpdir=/tmp --without-gssapi || die
-}
-
-src_install() {
-	einstall || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${ED}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.11.21.ebuild b/dev-vcs/cvs/cvs-1.11.21.ebuild
deleted file mode 100644
index 49417601660b..000000000000
--- a/dev-vcs/cvs/cvs-1.11.21.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.21.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-SRC_URI="mirror://gnu/non-gnu/cvs/source/stable/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc emacs"
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	econf --with-tmpdir=/tmp || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.11.22.1-r1.ebuild b/dev-vcs/cvs/cvs-1.11.22.1-r1.ebuild
deleted file mode 100644
index 8b7ecbb3a81a..000000000000
--- a/dev-vcs/cvs/cvs-1.11.22.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.22.1-r1.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-SRC_URI="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/cederqvist-${PV}.html.bz2
-		mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs"
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_unpack() {
-	unpack ${A}
-	# remove a useless binary
-	einfo "Removing a compiled binary"
-	find "${S}" -type f -name getdate -exec rm \{\} \;
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
-}
-
-src_configure() {
-	[[ ${CHOST} == *-interix* ]] && export ac_cv_header_inttypes_h=no
-
-	econf --with-tmpdir=/tmp --without-gssapi || die
-}
-
-src_install() {
-	einstall || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${ED}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.11.22.1.ebuild b/dev-vcs/cvs/cvs-1.11.22.1.ebuild
deleted file mode 100644
index 0c54a525ef0b..000000000000
--- a/dev-vcs/cvs/cvs-1.11.22.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.22.1.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-SRC_URI="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/cederqvist-${PV}.html.bz2
-		mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc emacs"
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_unpack() {
-	unpack ${A}
-	# remove a useless binary
-	einfo "Removing a compiled binary"
-	find "${S}" -type f -name getdate -exec rm \{} \;
-}
-
-src_compile() {
-	econf --with-tmpdir=/tmp || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r2.ebuild b/dev-vcs/cvs/cvs-1.12.12-r2.ebuild
deleted file mode 100644
index c848f51997ab..000000000000
--- a/dev-vcs/cvs/cvs-1.12.12-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r2.ebuild,v 1.2 2010/10/19 05:38:15 leio Exp $
-
-inherit eutils pam
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-
-SRC_URI="http://ccvs.cvshome.org/files/documents/19/872/${P}.tar.bz2
-	doc? ( http://ccvs.cvshome.org/files/documents/19/878/cederqvist-${PV}.html.tar.bz2
-		http://ccvs.cvshome.org/files/documents/19/881/cederqvist-${PV}.pdf
-		http://ccvs.cvshome.org/files/documents/19/880/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-IUSE="crypt doc emacs kerberos pam"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
-}
-
-src_compile() {
-	econf \
-		--with-external-zlib \
-		--with-tmpdir=/tmp \
-		--disable-nls \
-		`use_enable crypt encryption` \
-		`use_enable pam` \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-
-	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r3.ebuild b/dev-vcs/cvs/cvs-1.12.12-r3.ebuild
deleted file mode 100644
index 4ff9517eea57..000000000000
--- a/dev-vcs/cvs/cvs-1.12.12-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r3.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
-
-inherit eutils pam
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE="crypt doc emacs kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
-	epatch "${FILESDIR}"/${P}-openat.patch
-}
-
-src_compile() {
-	econf \
-		--with-external-zlib \
-		--with-tmpdir=/tmp \
-		$(use_enable crypt encryption) \
-		$(use_with kerberos gssapi) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable server) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-
-	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r4.ebuild b/dev-vcs/cvs/cvs-1.12.12-r4.ebuild
deleted file mode 100644
index 8360d2a8bba0..000000000000
--- a/dev-vcs/cvs/cvs-1.12.12-r4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r4.ebuild,v 1.2 2010/10/19 05:38:15 leio Exp $
-
-inherit eutils pam
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-IUSE="crypt doc emacs kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
-	epatch "${FILESDIR}"/${P}-openat.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-block-requests.patch
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install-sh.patch
-	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
-
-src_compile() {
-	econf \
-		--with-external-zlib \
-		--with-tmpdir=/tmp \
-		$(use_enable crypt encryption) \
-		$(use_with kerberos gssapi) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable server) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins cvs-format.el || die "doins failed"
-	fi
-
-	use server && newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-
-	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r5.ebuild b/dev-vcs/cvs/cvs-1.12.12-r5.ebuild
deleted file mode 100644
index 6894e26db638..000000000000
--- a/dev-vcs/cvs/cvs-1.12.12-r5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r5.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
-
-inherit eutils pam
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE="crypt doc kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
-	epatch "${FILESDIR}"/${P}-openat.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-block-requests.patch
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install-sh.patch
-	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
-
-src_compile() {
-	econf \
-		--with-external-zlib \
-		--with-tmpdir=/tmp \
-		$(use_enable crypt encryption) \
-		$(use_with kerberos gssapi) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable server) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	# Not installed into emacs site-lisp because it clobbers the normal C
-	# indentations.
-	dodoc cvs-format.el || die "dodoc failed"
-
-	use server && newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-
-	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/files/cvs-1.11.22.1-hash-nameclash.patch b/dev-vcs/cvs/files/cvs-1.11.22.1-hash-nameclash.patch
deleted file mode 100644
index e6be37cadf94..000000000000
--- a/dev-vcs/cvs/files/cvs-1.11.22.1-hash-nameclash.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
-fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
-
---- src/hash.h.orig	2010-03-10 18:47:20 +0100
-+++ src/hash.h	2010-03-10 18:47:40 +0100
-@@ -27,26 +27,26 @@
- };
- typedef enum ntype Ntype;
- 
--struct node
-+struct hashnode
- {
-     Ntype type;
--    struct node *next;
--    struct node *prev;
--    struct node *hashnext;
--    struct node *hashprev;
-+    struct hashnode *next;
-+    struct hashnode *prev;
-+    struct hashnode *hashnext;
-+    struct hashnode *hashprev;
-     char *key;
-     void *data;
-     void (*delproc) ();
- };
--typedef struct node Node;
-+typedef struct hashnode Node;
- 
--struct list
-+struct hashlist
- {
-     Node *list;
-     Node *hasharray[HASHSIZE];
--    struct list *next;
-+    struct hashlist *next;
- };
--typedef struct list List;
-+typedef struct hashlist List;
- 
- List *getlist PROTO((void));
- Node *findnode PROTO((List * list, const char *key));