pserver fixes (bug #49879); added doc USE flag (suggested by jmglov@gentoo.org); removed older versions

10 files changed, 68 insertions, 113 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index 64d536f5ef3b..49468ec11ebf 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cvs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.49 2004/05/21 01:03:41 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.50 2004/05/23 00:43:39 scandium Exp $
+
+*cvs-1.11.16-r1 (23 May 2004)
+
+  23 May 2004; Rainer Groesslinger <scandium@gentoo.org> cvs-1.11.13.ebuild,
+  cvs-1.11.14.ebuild, cvs-1.11.15.ebuild, cvs-1.11.16-r1.ebuild,
+  cvs-1.11.16.ebuild, files/cvspserver.xinetd.d:
+  pserver fixes (bug #49879)
+  added doc USE flag (suggested by jmglov@gentoo.org)
 
   20 May 2004; Michael McCabe <randy@gentoo.org> cvs-1.11.16.ebuild:
   Stable on s390
diff --git a/dev-util/cvs/cvs-1.11.13.ebuild b/dev-util/cvs/cvs-1.11.13.ebuild
deleted file mode 100644
index 5d6c1a79a00e..000000000000
--- a/dev-util/cvs/cvs-1.11.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 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.13.ebuild,v 1.7 2004/03/11 17:29:57 scandium Exp $
-
-inherit eutils flag-o-matic
-
-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 hppa amd64 ia64 ppc64"
-
-IUSE=""
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.4"
-
-pkg_setup() {
-	enewgroup cvs
-	enewuser cvs -1 /bin/false /var/cvsroot cvs
-}
-
-src_compile() {
-	use alpha && append-flags -fPIC
-
-	econf --with-tmpdir=/tmp || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-
-	keepdir /var/cvsroot
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO || \
-			die "dodoc failed"
-	insinto /usr/share/emacs/site-lisp
-	doins cvs-format.el || die "doins failed"
-}
diff --git a/dev-util/cvs/cvs-1.11.14.ebuild b/dev-util/cvs/cvs-1.11.14.ebuild
deleted file mode 100644
index 4b6180dd333f..000000000000
--- a/dev-util/cvs/cvs-1.11.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 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.14.ebuild,v 1.9 2004/04/14 18:46:01 scandium Exp $
-
-inherit eutils flag-o-matic
-
-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 hppa amd64 ia64 ppc64"
-
-IUSE=""
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.4"
-
-pkg_setup() {
-	enewgroup cvs
-	enewuser cvs -1 /bin/false /var/cvsroot cvs
-}
-
-src_compile() {
-	use alpha && append-flags -fPIC
-
-	econf --with-tmpdir=/tmp || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-
-	keepdir /var/cvsroot
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO || \
-			die "dodoc failed"
-	insinto /usr/share/emacs/site-lisp
-	doins cvs-format.el || die "doins failed"
-}
diff --git a/dev-util/cvs/cvs-1.11.15.ebuild b/dev-util/cvs/cvs-1.11.15.ebuild
index 2d8d32bbf7a1..6dc4a78e3b2c 100644
--- a/dev-util/cvs/cvs-1.11.15.ebuild
+++ b/dev-util/cvs/cvs-1.11.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.15.ebuild,v 1.5 2004/05/08 15:22:08 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.15.ebuild,v 1.6 2004/05/23 00:43:39 scandium Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,11 +18,6 @@ DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.4"
 
-pkg_setup() {
-	enewgroup cvs
-	enewuser cvs -1 /bin/false /var/cvsroot cvs
-}
-
 src_compile() {
 	use alpha && append-flags -fPIC
 
@@ -33,8 +28,6 @@ src_compile() {
 src_install() {
 	einstall || die
 
-	keepdir /var/cvsroot
-
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
 
diff --git a/dev-util/cvs/cvs-1.11.16-r1.ebuild b/dev-util/cvs/cvs-1.11.16-r1.ebuild
new file mode 100644
index 000000000000..c294e93ce658
--- /dev/null
+++ b/dev-util/cvs/cvs-1.11.16-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 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.16-r1.ebuild,v 1.1 2004/05/23 00:43:39 scandium Exp $
+
+inherit eutils flag-o-matic
+
+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
+	doc? ( http://ftp.cvshome.org/release/stable/${P}/cederqvist-${PV}.html.tar.bz2
+		http://ftp.cvshome.org/release/stable/${P}/cederqvist-${PV}.pdf
+		http://ftp.cvshome.org/release/stable/${P}/cederqvist-${PV}.ps )"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+
+IUSE="doc emacs"
+
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/zlib-1.1.4"
+
+src_compile() {
+	use alpha && append-flags -fPIC
+
+	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
+}
diff --git a/dev-util/cvs/cvs-1.11.16.ebuild b/dev-util/cvs/cvs-1.11.16.ebuild
index 4886fde236fe..ab2cbab619dc 100644
--- a/dev-util/cvs/cvs-1.11.16.ebuild
+++ b/dev-util/cvs/cvs-1.11.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.16.ebuild,v 1.7 2004/05/21 01:03:41 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.16.ebuild,v 1.8 2004/05/23 00:43:39 scandium Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,11 +18,6 @@ DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.4"
 
-pkg_setup() {
-	enewgroup cvs
-	enewuser cvs -1 /bin/false /var/cvsroot cvs
-}
-
 src_compile() {
 	use alpha && append-flags -fPIC
 
@@ -33,8 +28,6 @@ src_compile() {
 src_install() {
 	einstall || die
 
-	keepdir /var/cvsroot
-
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
 
diff --git a/dev-util/cvs/files/cvspserver.xinetd.d b/dev-util/cvs/files/cvspserver.xinetd.d
index a5ea39801dd2..0f2edb09cba0 100644
--- a/dev-util/cvs/files/cvspserver.xinetd.d
+++ b/dev-util/cvs/files/cvspserver.xinetd.d
@@ -3,8 +3,7 @@ service cvspserver
 	disable		= yes
 	socket_type	= stream
 	wait		= no
-	user		= cvs
-	group		= cvs
+	user		= root
 	log_type	= FILE /var/log/cvspserver
 	protocol	= tcp
 	env		= HOME=/var/cvsroot
diff --git a/dev-util/cvs/files/digest-cvs-1.11.13 b/dev-util/cvs/files/digest-cvs-1.11.13
deleted file mode 100644
index 5ec96ace8f5d..000000000000
--- a/dev-util/cvs/files/digest-cvs-1.11.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 048abb979dd2317c9cde5a8d30d7f0c9 cvs-1.11.13.tar.bz2 2232892
diff --git a/dev-util/cvs/files/digest-cvs-1.11.14 b/dev-util/cvs/files/digest-cvs-1.11.14
deleted file mode 100644
index 7ec6606d86e1..000000000000
--- a/dev-util/cvs/files/digest-cvs-1.11.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2212213fec91821ae4443662068d573 cvs-1.11.14.tar.bz2 2233782
diff --git a/dev-util/cvs/files/digest-cvs-1.11.16-r1 b/dev-util/cvs/files/digest-cvs-1.11.16-r1
new file mode 100644
index 000000000000..5106a8015750
--- /dev/null
+++ b/dev-util/cvs/files/digest-cvs-1.11.16-r1
@@ -0,0 +1,4 @@
+MD5 dd1914374f95ac1f846505e590b106e6 cvs-1.11.16.tar.bz2 2268160
+MD5 4b814a9c4478651cd42ad76bf9fce897 cederqvist-1.11.16.html.tar.bz2 114226
+MD5 74b7f43850350063c579e53dbdad027f cederqvist-1.11.16.pdf 1050875
+MD5 92042775dacce1ab93c8cb38b829a6f4 cederqvist-1.11.16.ps 997124