Add a new feature-version of cvs

Package-Manager: portage-2.1_pre4-r1

6 files changed, 150 insertions, 4 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index d1d66708a51e..79621ad0fdef 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.100 2006/03/01 16:03:53 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.101 2006/03/01 16:44:36 pylon Exp $
+
+*cvs-1.12.13 (01 Mar 2006)
+
+  01 Mar 2006; Lars Weiler <pylon@gentoo.org>
+  +files/cvs-1.12.13-cvsbug-tmpfix.patch, +files/cvs-1.12.13-openat.patch,
+  +cvs-1.12.13.ebuild:
+  Add a new feature-version of cvs
 
 *cvs-1.12.12-r3 (01 Mar 2006)
 
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 63e5977d4c69..8c033ad5e39a 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -1,6 +1,6 @@
-MD5 f6ec072d7a81764fb7ad957a5b6f89f4 ChangeLog 12193
-RMD160 f88e6c3adc0df16a06470a7bca34eae6e5c28814 ChangeLog 12193
-SHA256 9f592098c5ff87003bf2ebeca7ad3e48e14693ff9c57d06d243ba18d7e8bf27a ChangeLog 12193
+MD5 b8e9eb7ccf9e9936e31a570624184b6d ChangeLog 12401
+RMD160 8bfab44f9fa96cbc6c40a3d8a92dd4f46ae0459f ChangeLog 12401
+SHA256 f5564aa914ceb5ed28ab3ed613c5c2ecb24f28940635ef8cdcb0deb6b2ecf9a8 ChangeLog 12401
 MD5 a3e041898daf24fb40cce19270eed884 cvs-1.11.17.ebuild 1533
 RMD160 d707044e8ba034690bbd35b2a15c4d7badf1e701 cvs-1.11.17.ebuild 1533
 SHA256 045e19ad67af8dd06cfd9da2824ed9c5f9bfe3d6de9baafd31a165238ebec9ec cvs-1.11.17.ebuild 1533
@@ -37,6 +37,9 @@ SHA256 a776f71fad6ca8e946b968df580b60135975776b958553c716c75dd05b2d0ee2 cvs-1.12
 MD5 50f1e42f28ed65dba7d2f7d1f37c1b65 cvs-1.12.12.ebuild 1813
 RMD160 e983969920331286fa6c07ef5a5375aad19b242a cvs-1.12.12.ebuild 1813
 SHA256 5435a6b483ed18ed406cffe056861d2dccd593211dd6494bb88afeaab00c3133 cvs-1.12.12.ebuild 1813
+MD5 f47f668390beeb9c0b35b40585dc4288 cvs-1.12.13.ebuild 2016
+RMD160 89619b4743440ca859d614fb98b6cd39cbbf9a3c cvs-1.12.13.ebuild 2016
+SHA256 abdcb4d05f9c36f6777b77c142eecc030df541176a8b70d3582badd64dd2f5bc cvs-1.12.13.ebuild 2016
 MD5 a87570259fad7192265d4bb554a87280 cvs-1.12.9.ebuild 1814
 RMD160 04edd18f986a50898580cb475cff0dad51b91fa9 cvs-1.12.9.ebuild 1814
 SHA256 9d27d5a73e907e919b1c87f3f6722cb5e5b57544d1e689f288fe54f016a51a48 cvs-1.12.9.ebuild 1814
@@ -52,6 +55,12 @@ SHA256 061c26d140e1195200f1cc76217b2e7c2ff7f0c4dcbbb31124b386e8e756938e files/cv
 MD5 b26ebb506de6b402dd35deb6bb946c36 files/cvs-1.12.12-openat.patch 761
 RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a files/cvs-1.12.12-openat.patch 761
 SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f files/cvs-1.12.12-openat.patch 761
+MD5 6ac29ac374de27b88faafe10e8e7da9f files/cvs-1.12.13-cvsbug-tmpfix.patch 624
+RMD160 050b34543db08e3fc3633e897d0ebc8c4c900578 files/cvs-1.12.13-cvsbug-tmpfix.patch 624
+SHA256 508605dfa23bc141165931e843e3d0d4472ad23b84546d830dc5ce6bfed686e7 files/cvs-1.12.13-cvsbug-tmpfix.patch 624
+MD5 c63b8b6f63f7ee3ba9462f5f7e21e006 files/cvs-1.12.13-openat.patch 761
+RMD160 060652b7ef0e43f8dcdb84f11f4e51fbefff2549 files/cvs-1.12.13-openat.patch 761
+SHA256 9edfd8671fce137462c4fb22366f4c6f8fec04b7073e3c3b8381e5b0211ab4b8 files/cvs-1.12.13-openat.patch 761
 MD5 2d50778e9aededb1c08b84c8e8b62ad3 files/cvs.pam 124
 RMD160 877aa7e1f52ab40254e1f6d9a87ee162e3a3bc49 files/cvs.pam 124
 SHA256 c34322946c6712fe54e8c4b14550f06948e7ed06493e9f14800675de412e9e14 files/cvs.pam 124
@@ -100,6 +109,9 @@ SHA256 d4fb393ba1dbdd4e1c89b8885ddca2d68b3eaab3018842b6fbb1db3a5c0889dd files/di
 MD5 e96995d8fd572022d1c89868163a901a files/digest-cvs-1.12.12-r3 1012
 RMD160 c5b3a89dce9319a981e2a07f55e9df095ebea7a1 files/digest-cvs-1.12.12-r3 1012
 SHA256 688739cfb729212f81a739675ceb1be468c3a19ed19ce6b1c1d20d59f9e47872 files/digest-cvs-1.12.12-r3 1012
+MD5 3a6f27aa076ef6598b6e12fcbaca3a9c files/digest-cvs-1.12.13 1012
+RMD160 978bfb729ec4a8bff0ac851393d2b0d5b161ec8d files/digest-cvs-1.12.13 1012
+SHA256 1e99eefe36659d1e6a9f690003de8ecafd0d9d057e814acf48e57b80cdc999a5 files/digest-cvs-1.12.13 1012
 MD5 cc3afaf974475188ce0d80b0b919f611 files/digest-cvs-1.12.9 272
 RMD160 d77eccd86aa16c6a4f4f9f1a5630353529f30d50 files/digest-cvs-1.12.9 272
 SHA256 e3ffae49a622c252bbf393e16b20810a7153ff82f3f351341f993a2b5465c395 files/digest-cvs-1.12.9 272
diff --git a/dev-util/cvs/cvs-1.12.13.ebuild b/dev-util/cvs/cvs-1.12.13.ebuild
new file mode 100644
index 000000000000..8d6308330933
--- /dev/null
+++ b/dev-util/cvs/cvs-1.12.13.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13.ebuild,v 1.1 2006/03/01 16:44:36 pylon Exp $
+
+inherit eutils pam
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="http://www.nongnu.org/cvs/"
+
+SRC_URI="http://ftp.gnu.org/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+	doc? ( http://ftp.gnu.org/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+		http://ftp.gnu.org/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+		http://ftp.gnu.org/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"
+
+IUSE="crypt doc emacs kerberos pam"
+
+DEPEND="virtual/libc
+	>=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 \
+		--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-util/cvs"
+}
diff --git a/dev-util/cvs/files/cvs-1.12.13-cvsbug-tmpfix.patch b/dev-util/cvs/files/cvs-1.12.13-cvsbug-tmpfix.patch
new file mode 100644
index 000000000000..1286111b95ae
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.13-cvsbug-tmpfix.patch
@@ -0,0 +1,22 @@
+Index: cvs-1.12.13/src/cvsbug.in
+===================================================================
+--- cvs-1.12.13.orig/src/cvsbug.in
++++ cvs-1.12.13/src/cvsbug.in
+@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
+     /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
+       cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+     ORIGINATOR="`cat $TEMP`"
+-    rm -f $TEMP
++    > $TEMP
+   fi
+ fi
+
+ if [ "$ORIGINATOR" = "" ]; then
+   grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+   ORIGINATOR="`cat $TEMP`"
+-  rm -f $TEMP
++  > $TEMP
+ fi
+
+ if [ -n "$ORGANIZATION" ]; then
+
diff --git a/dev-util/cvs/files/cvs-1.12.13-openat.patch b/dev-util/cvs/files/cvs-1.12.13-openat.patch
new file mode 100644
index 000000000000..762924a8c1d5
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.13-openat.patch
@@ -0,0 +1,21 @@
+Index: cvs-1.12.13/lib/openat.c
+===================================================================
+--- cvs-1.12.13.orig/lib/openat.c
++++ cvs-1.12.13/lib/openat.c
+@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename
+       va_list arg;
+       va_start (arg, flags);
+ 
+-      /* Assume that mode_t is passed compatibly with mode_t's type
+-	 after argument promotion.  */
+-      mode = va_arg (arg, mode_t);
++      /* If mode_t is narrower than int, use the promoted type (int),
++         not mode_t.  Use sizeof to guess whether mode_t is nerrower;
++         we don't know of any practical counterexamples.  */
++      if (sizeof (mode_t) < sizeof (int))
++	mode = va_arg (arg, int);
++      else
++	mode = va_arg (arg, mode_t);
+ 
+       va_end (arg);
+     }
diff --git a/dev-util/cvs/files/digest-cvs-1.12.13 b/dev-util/cvs/files/digest-cvs-1.12.13
new file mode 100644
index 000000000000..8c20a76fca3a
--- /dev/null
+++ b/dev-util/cvs/files/digest-cvs-1.12.13
@@ -0,0 +1,12 @@
+MD5 e979c381eefef51833adace57aa609c7 cederqvist-1.12.13.html.tar.bz2 140382
+RMD160 34723707e078e210a2c032e8c98726a7037b05e6 cederqvist-1.12.13.html.tar.bz2 140382
+SHA256 1a9a34e07c00de5102224b48cbc53384992aea197c91c20b6140dd6885b5ae87 cederqvist-1.12.13.html.tar.bz2 140382
+MD5 1a3e7376c485ee38584c3a623c156638 cederqvist-1.12.13.pdf 1297631
+RMD160 8d0520254a964d146d704fe93656415edc146fec cederqvist-1.12.13.pdf 1297631
+SHA256 4f24b2ac3b81c97798cad42cba8ffe6cc65405f13e5a58a4b063aa9fffc4a7bc cederqvist-1.12.13.pdf 1297631
+MD5 c352dc473afb1be9507af7b0e812bed9 cederqvist-1.12.13.ps 1280573
+RMD160 a370346c4ce84e224968181046482f87116a155b cederqvist-1.12.13.ps 1280573
+SHA256 a955722b89155e390635b1220fa67a096c97141d83ac53a7840323c01d13aa91 cederqvist-1.12.13.ps 1280573
+MD5 956ab476ce276c2d19d583e227dbdbea cvs-1.12.13.tar.bz2 3911104
+RMD160 ba3048e3e2d99ae78f6a759889b615acf65dd487 cvs-1.12.13.tar.bz2 3911104
+SHA256 78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e cvs-1.12.13.tar.bz2 3911104