cvs pserver fixes, removed old versions

10 files changed, 21 insertions, 83 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index df0e0b7be4aa..2b729a738924 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cvs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.21 2003/12/06 21:18:19 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.22 2003/12/09 19:25:40 scandium Exp $
+
+*cvs-1.11.10-r1 (09 Dec 2003)
+                                                                                                                             
+  09 Dec 2003; Rainer Groesslinger <scandium@gentoo.org> cvs-1.11.10-r1.ebuild:
+  minor fixes to xinet.d file,
+  cvs user/group is automatically added (bug #25313)
 
 *cvs-1.11.10 (06 Dec 2003)
 
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 1c0765d54fb7..bb6d5644982a 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -1,10 +1,6 @@
-MD5 a90578c2627b8c3b88598de4d2cd0212 cvs-1.11.8.ebuild 903
 MD5 d94b4b7fda338f3b27241bfd64b5a6ed cvs-1.11.10.ebuild 1045
-MD5 973873ccaa0c81eee660f94c45ac2b5e cvs-1.11.9.ebuild 1044
-MD5 2da821f7b4a1382a1eefb9b296007b0c ChangeLog 2389
-MD5 fb9c51abf0e81f9f1db242fb7e0aa614 cvs-1.11.6.ebuild 958
-MD5 e3c512ff757174542b10d0953db0446b files/digest-cvs-1.11.6 64
-MD5 761a2a5a5a99b9167f670834c4798e64 files/digest-cvs-1.11.8 64
-MD5 312de72f942a2bf7309408e21089c503 files/digest-cvs-1.11.9 64
-MD5 e26992c938e0f0b12a882167a73ed271 files/cvspserver.xinetd.d 300
+MD5 592fad8a8f3fb24531ca5e7c9f8c42b8 cvs-1.11.10-r1.ebuild 1150
+MD5 fa6b758a9d0092ac810a8582a13e681a ChangeLog 2710
+MD5 3af5ca24e7e103ac0724dfe10e7fc04a files/digest-cvs-1.11.10-r1 65
+MD5 4a9f7880c910789492e9413425e15556 files/cvspserver.xinetd.d 297
 MD5 3af5ca24e7e103ac0724dfe10e7fc04a files/digest-cvs-1.11.10 65
diff --git a/dev-util/cvs/cvs-1.11.9.ebuild b/dev-util/cvs/cvs-1.11.10-r1.ebuild
index 5d867055fe96..a60e31b32464 100644
--- a/dev-util/cvs/cvs-1.11.9.ebuild
+++ b/dev-util/cvs/cvs-1.11.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.9.ebuild,v 1.6 2003/11/16 12:50:11 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.10-r1.ebuild,v 1.1 2003/12/09 19:25:40 scandium Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.cvshome.org/"
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.cvshome.org/release/stable/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
 
 IUSE=""
 
@@ -26,7 +26,12 @@ src_compile() {
 }
 
 src_install() {
+	enewgroup cvs
+	enewuser cvs -1 /bin/false /home/cvsroot cvs
+
 	einstall || die
+
+	keepdir /home/cvsroot
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
 
diff --git a/dev-util/cvs/cvs-1.11.6.ebuild b/dev-util/cvs/cvs-1.11.6.ebuild
deleted file mode 100644
index 19f72498761b..000000000000
--- a/dev-util/cvs/cvs-1.11.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.6.ebuild,v 1.7 2003/11/01 22:09:05 scandium Exp $
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-SRC_URI="http://ftp.cvshome.org/release/stable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips amd64 ia64"
-
-IUSE=""
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	econf --with-tmpdir=/tmp || die
-	make || die
-}
-
-src_install() {
-	einstall || die
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver
-
-	dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING
-	dodoc MINOR* NEWS PROJECTS README* TESTS TODO
-	mv ${D}/usr/lib/cvs/contrib ${D}/usr/doc/${P}/contrib
-	insinto /usr/share/emacs/site-lisp
-	doins cvs-format.el
-}
diff --git a/dev-util/cvs/cvs-1.11.8.ebuild b/dev-util/cvs/cvs-1.11.8.ebuild
deleted file mode 100644
index 85352f3bd1dd..000000000000
--- a/dev-util/cvs/cvs-1.11.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.8.ebuild,v 1.3 2003/11/16 12:50:11 scandium Exp $
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.cvshome.org/"
-SRC_URI="http://ftp.cvshome.org/release/stable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64"
-
-IUSE=""
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	econf --with-tmpdir=/tmp || die
-	make || die
-}
-
-src_install() {
-	einstall || die
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver
-
-	dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING
-	dodoc MINOR* NEWS PROJECTS README* TESTS TODO
-	insinto /usr/share/emacs/site-lisp
-	doins cvs-format.el
-}
diff --git a/dev-util/cvs/files/cvspserver.xinetd.d b/dev-util/cvs/files/cvspserver.xinetd.d
index df7a51484941..6c34eedfde08 100644
--- a/dev-util/cvs/files/cvspserver.xinetd.d
+++ b/dev-util/cvs/files/cvspserver.xinetd.d
@@ -7,7 +7,7 @@ service cvspserver
 	group		= cvs
 	log_type	= FILE /var/log/cvspserver
 	protocol	= tcp
-	env		= '$HOME=/home/cvsroot'
+	env		= HOME=/home/cvsroot
 	log_on_failure	+= USERID
 	port		= 2401
 	server		= /usr/bin/cvs
diff --git a/dev-util/cvs/files/digest-cvs-1.11.10-r1 b/dev-util/cvs/files/digest-cvs-1.11.10-r1
new file mode 100644
index 000000000000..684f8fc6e2bf
--- /dev/null
+++ b/dev-util/cvs/files/digest-cvs-1.11.10-r1
@@ -0,0 +1 @@
+MD5 14cccf6230a16a02ac4037c785cd171c cvs-1.11.10.tar.bz2 2224086
diff --git a/dev-util/cvs/files/digest-cvs-1.11.6 b/dev-util/cvs/files/digest-cvs-1.11.6
deleted file mode 100644
index 623e7e835fa7..000000000000
--- a/dev-util/cvs/files/digest-cvs-1.11.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06a5bbcd93a780a3bbec788deb1cf35b cvs-1.11.6.tar.bz2 2182557
diff --git a/dev-util/cvs/files/digest-cvs-1.11.8 b/dev-util/cvs/files/digest-cvs-1.11.8
deleted file mode 100644
index 02f33dc69177..000000000000
--- a/dev-util/cvs/files/digest-cvs-1.11.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e878928d534d7bd9e60e4d97807dd888 cvs-1.11.8.tar.bz2 2194914
diff --git a/dev-util/cvs/files/digest-cvs-1.11.9 b/dev-util/cvs/files/digest-cvs-1.11.9
deleted file mode 100644
index 42e262821db1..000000000000
--- a/dev-util/cvs/files/digest-cvs-1.11.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e72f5de87f66c5fcd27d58b53fcbf43 cvs-1.11.9.tar.bz2 2196529