Bug #144114: Fix options for sort to use non-obsolete options. Bug #296823: Install env.d file for CVS_RSH setting.

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

5 files changed, 114 insertions, 3 deletions

diff --git a/dev-vcs/cvs/ChangeLog b/dev-vcs/cvs/ChangeLog
index a49bea69223d..616457a53512 100644
--- a/dev-vcs/cvs/ChangeLog
+++ b/dev-vcs/cvs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2010/12/06 20:51:39 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/ChangeLog,v 1.4 2011/01/05 04:50:41 robbat2 Exp $
+
+*cvs-1.12.12-r9 (05 Jan 2011)
+
+  05 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +files/01-cvs-env.d,
+  +cvs-1.12.12-r9.ebuild, +files/cvs-1.12.12-rcs2log-coreutils.patch:
+  Bug #144114: Fix options for sort to use non-obsolete options. Bug #296823:
+  Install env.d file for CVS_RSH setting.
 
   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,
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 75119e30ef87..aed0d1251181 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -1,3 +1,4 @@
+AUX 01-cvs-env.d 14 RMD160 13e53ce14a71118ac1f5ac87377a8e363566ade0 SHA1 bc920035619e5abec7898891d820d40c0745c735 SHA256 dd2e8db836e3879e56cba5df8f0700c1c0581df7e2201f9196650936278a0d15
 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
@@ -6,6 +7,7 @@ AUX cvs-1.12.12-getdelim.patch 559 RMD160 404b5775c3267158dd064c48ce130f08217653
 AUX cvs-1.12.12-hash-nameclash.patch 1015 RMD160 616f50fc9e7faa7c0b2ac34f5d526b40db433517 SHA1 43675b3334a7343db2fd213c9c1f1673f9e193c4 SHA256 3a6a5bf6bd419bb8a4440f3f4f5dba770db1d06e33e0ab6d249ace490010edb4
 AUX cvs-1.12.12-install-sh.patch 495 RMD160 f5ada20250b2dea6979feb609077f57462aa0a21 SHA1 a6201f8d4f2343fe20214d0862fe0e710b61a4af SHA256 9c2fc03b42804f8edb3a5a6f9c9e80bd68924f265ce52d196c3b5c759ba42f8a
 AUX cvs-1.12.12-openat.patch 761 RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a SHA1 23a3941ce449fb105c7b8cce1147a5d525a7753e SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f
+AUX cvs-1.12.12-rcs2log-coreutils.patch 561 RMD160 544c08c233e58045d134d3a3de7386c6a7d33329 SHA1 368f61f543777f83acd6afb820bff254abcccbc9 SHA256 0df8b6ad74b344edc7c353c4dd2cc3825db14dfb1fed20bb007f09c58f1063c8
 AUX cvs-1.12.13-openat.patch 761 RMD160 060652b7ef0e43f8dcdb84f11f4e51fbefff2549 SHA1 96bcc6b44a89475cb97d65707056c797115cc88a SHA256 9edfd8671fce137462c4fb22366f4c6f8fec04b7073e3c3b8381e5b0211ab4b8
 AUX cvs-1.12.13-zlib.patch 1304 RMD160 2fba6c94b68a331b621e457f54826af98cf70958 SHA1 b5b44a1166ece7be9ca14a661f75544638a96b4e SHA256 07b3e411282ee8f218447bc862144a67144df71beaa842761012899ff5452f19
 AUX cvs-1.12.13.1-block-requests.patch 2869 RMD160 eb29149d89845c8e523725b421323e21b364dabe SHA1 36bf47339d391a3d75e86f34e464daab35c79cc8 SHA256 0aaba805beb3f5a9271f907ae0e5933b110156fbcca15f843a07a1bf4c72a7f3
@@ -25,7 +27,8 @@ DIST cvs-1.12.13.tar.bz2 3911104 RMD160 ba3048e3e2d99ae78f6a759889b615acf65dd487
 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.12-r9.ebuild 2759 RMD160 6fa59641cc1830d2509d4e61046c8348997e3317 SHA1 8e244d5955531f1ecbe2a0af21290232181b35ac SHA256 374473bc624b0536af000435bf91c6eb3965d6293e3164b7c9a4902bff4bfbb9
 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 21162 RMD160 0e79feb6f488273d82cf920030f4933ca2ec56c3 SHA1 acfaf97685c41d4fff0a1202e6e0c0f48b07a889 SHA256 18cf3eb8ea15f9acf1f503e2700ed5474f26cb6efa678bd78448efc0ed33bb08
+MISC ChangeLog 21458 RMD160 7193735c6e50ac6791579e6a2ce12fcb35eeca62 SHA1 166a700906573e410f8eee38c854b73a547a7007 SHA256 95301484db8d030664c9edcee6afff5c7b47877bc460216477714ef58e591ee1
 MISC metadata.xml 234 RMD160 e17a8f89518ebdd332c220104e56f649096be1da SHA1 472e62beb27cdd753a0454194630c916f0600e0b SHA256 ce7beba20d6099be006550fb74bb9e74628a9d6967c7ceb096ab99959df47a02
diff --git a/dev-vcs/cvs/cvs-1.12.12-r9.ebuild b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
new file mode 100644
index 000000000000..c6ea18c30174
--- /dev/null
+++ b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 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-r9.ebuild,v 1.1 2011/01/05 04:50:41 robbat2 Exp $
+
+EAPI=3
+
+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 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	epatch "${FILESDIR}"/${P}-openat.patch
+	epatch "${FILESDIR}"/${P}-block-requests.patch
+	epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+	epatch "${FILESDIR}"/${P}-install-sh.patch
+	epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+	epatch "${FILESDIR}"/${P}-getdelim.patch # 314791
+	epatch "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
+	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
+}
+
+src_configure() {
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=/tmp \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	insinto /etc/xinetd.d
+	if use server; then
+		newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
+	fi
+	newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
+
+	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/*
+		dosym cvs.html /usr/share/doc/${PF}/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/01-cvs-env.d b/dev-vcs/cvs/files/01-cvs-env.d
new file mode 100644
index 000000000000..5c89358b9554
--- /dev/null
+++ b/dev-vcs/cvs/files/01-cvs-env.d
@@ -0,0 +1 @@
+CVS_RSH="ssh"
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
new file mode 100644
index 000000000000..0fb4c6c6d73d
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
@@ -0,0 +1,14 @@
+X-Gentoo-bug: 144114
+
+diff -Nuar cvs-1.12.12.orig//contrib/rcs2log.sh cvs-1.12.12//contrib/rcs2log.sh
+--- cvs-1.12.12.orig//contrib/rcs2log.sh	2003-02-25 21:32:51.000000000 +0000
++++ cvs-1.12.12//contrib/rcs2log.sh	2010-12-06 21:14:33.831532212 +0000
+@@ -620,7 +620,7 @@
+ # Sort the log entries, first by date+time (in reverse order),
+ # then by author, then by log entry, and finally by file name and revision
+ # (just in case).
+-sort -t"$SOH" +2 -4r +4 +0 |
++sort -t"$SOH" -k 3,4r -k 5 -k 1,2 |
+ 
+ # Finally, reformat the sorted log entries.
+ $AWK -F"$SOH" '