Added support for gssapi as default with the kerberos-use-flag (thanks to exg for the hint) and build server support only when the server-use-flag is given.

(Portage version: 2.1_pre6)

5 files changed, 34 insertions, 24 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index cac1784bb458..51343fd61344 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.104 2006/03/07 09:25:09 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.105 2006/03/20 17:54:42 pylon Exp $
+
+  20 Mar 2006; Lars Weiler <pylon@gentoo.org> cvs-1.12.12-r3.ebuild,
+  cvs-1.12.13.ebuild:
+  Added support for gssapi as default with the kerberos-use-flag (thanks to
+  exg for the hint) and build server support only when the server-use-flag is
+  given.
 
 *cvs-1.11.21 (07 Mar 2006)
 
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 3a8f4d109a4a..d21f5ed78457 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -10,12 +10,12 @@ SHA256 753226d3b5fe2a17723ee54ed765db4477c8b1ae99d60fd263b67a76a8d34609 cvs-1.11
 MD5 6c8ef40bb324cdbd552f4d400c139b0e cvs-1.12.12-r2.ebuild 1959
 RMD160 478234b15cc73c04ef870728344e08862e8bc9e4 cvs-1.12.12-r2.ebuild 1959
 SHA256 f899e2ab9829e0870124d226d8158861d7544a1c712ac0a30ff7d5f26de64ebd cvs-1.12.12-r2.ebuild 1959
-MD5 196495850a12a57c7f2ad8d47ed685b7 cvs-1.12.12-r3.ebuild 1995
-RMD160 743e0889db5d32f1f2ec2aa3f518c33ca8355f52 cvs-1.12.12-r3.ebuild 1995
-SHA256 e51ff355dc86718e1afcef8838da5ffbaf370ebb4b06ea0a1969968f248e5734 cvs-1.12.12-r3.ebuild 1995
-MD5 857560f42723f14c4328437c22eb0c75 cvs-1.12.13.ebuild 1992
-RMD160 e9330066b9e6ccb26790950f18650d1c771dd7ee cvs-1.12.13.ebuild 1992
-SHA256 dbd72f3235b2d727ff8ad322fc800dde0eddad08c66338554dd659d0244d7826 cvs-1.12.13.ebuild 1992
+MD5 4e03ed737b3d44122e661cb7189599aa cvs-1.12.12-r3.ebuild 2069
+RMD160 a4362776e9356177ed5dcba6607211fb7696fba3 cvs-1.12.12-r3.ebuild 2069
+SHA256 4f50980bc2b165df70c89e30f1895d073aeec5699e4cf8c7af157254a95d6bb9 cvs-1.12.12-r3.ebuild 2069
+MD5 c0e271ac6dd53bee62d63120f6d88b2a cvs-1.12.13.ebuild 2066
+RMD160 11df4a9d3f3e7a561499f1ca0d1436990f6af06e cvs-1.12.13.ebuild 2066
+SHA256 7880aa220aa48d07080a8315be9b3a442873045ab11808bd68eb6991e8b7f474 cvs-1.12.13.ebuild 2066
 MD5 6b8fde892bfbca3d39d848430e5f4012 files/cvs-1.12.12-cvsbug-tmpfix.patch 624
 RMD160 c580f653ef9f294676aa4d766decaac50298b3c5 files/cvs-1.12.12-cvsbug-tmpfix.patch 624
 SHA256 061c26d140e1195200f1cc76217b2e7c2ff7f0c4dcbbb31124b386e8e756938e files/cvs-1.12.12-cvsbug-tmpfix.patch 624
@@ -43,9 +43,9 @@ SHA256 7d08d8dc088c0003995a74ca380e09ae3da5d2bb8e8f4c6612e908ab0a37e5a7 files/di
 MD5 d504b65b8baabd743f81c957fa2666e7 files/digest-cvs-1.12.12-r2 276
 RMD160 52ba109e264182e9dd03f8e5f9319a06537c6ad7 files/digest-cvs-1.12.12-r2 276
 SHA256 d4fb393ba1dbdd4e1c89b8885ddca2d68b3eaab3018842b6fbb1db3a5c0889dd files/digest-cvs-1.12.12-r2 276
-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 e240800ff9082680c7851638e8dd6b33 files/digest-cvs-1.12.12-r3 1012
+RMD160 44e8be6ab35ff4e7e00eb86bf59a53319f4bead6 files/digest-cvs-1.12.12-r3 1012
+SHA256 47a57651971dc4c081e8ea30a7d244cc94c5a2386020bf8acf5a1a6906c972db 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
diff --git a/dev-util/cvs/cvs-1.12.12-r3.ebuild b/dev-util/cvs/cvs-1.12.12-r3.ebuild
index 3fdd26435304..f391e7d6a7f5 100644
--- a/dev-util/cvs/cvs-1.12.12-r3.ebuild
+++ b/dev-util/cvs/cvs-1.12.12-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.12-r3.ebuild,v 1.2 2006/03/01 19:50:11 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r3.ebuild,v 1.3 2006/03/20 17:54:42 pylon Exp $
 
 inherit eutils pam
 
@@ -16,7 +16,7 @@ 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"
+IUSE="crypt doc emacs kerberos nls pam server"
 
 DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.4
@@ -34,9 +34,11 @@ src_compile() {
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
-		--disable-nls \
-		`use_enable crypt encryption` \
-		`use_enable pam` \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server) \
 		|| die
 	emake || die "emake failed"
 }
diff --git a/dev-util/cvs/cvs-1.12.13.ebuild b/dev-util/cvs/cvs-1.12.13.ebuild
index c55f61b0eea8..9d16dcca957e 100644
--- a/dev-util/cvs/cvs-1.12.13.ebuild
+++ b/dev-util/cvs/cvs-1.12.13.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2006/03/01 19:50:11 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13.ebuild,v 1.3 2006/03/20 17:54:42 pylon Exp $
 
 inherit eutils pam
 
@@ -16,7 +16,7 @@ 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"
+IUSE="crypt doc emacs kerberos nls pam server"
 
 DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.4
@@ -34,9 +34,11 @@ src_compile() {
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
-		--disable-nls \
-		`use_enable crypt encryption` \
-		`use_enable pam` \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server) \
 		|| die
 	emake || die "emake failed"
 }
diff --git a/dev-util/cvs/files/digest-cvs-1.12.12-r3 b/dev-util/cvs/files/digest-cvs-1.12.12-r3
index 50aa76954e41..681c9128c5b4 100644
--- a/dev-util/cvs/files/digest-cvs-1.12.12-r3
+++ b/dev-util/cvs/files/digest-cvs-1.12.12-r3
@@ -1,12 +1,12 @@
-MD5 320f956b8f079587f938955cc34b03bc cederqvist-1.12.12.html.tar.bz2 137581
 RMD160 4b98b01dce9554dc5191f82c5df54e784934dd2b cederqvist-1.12.12.html.tar.bz2 137581
 SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 cederqvist-1.12.12.html.tar.bz2 137581
-MD5 642cf710f7f57f448a5d92abf1f712f5 cederqvist-1.12.12.pdf 1252423
+MD5 320f956b8f079587f938955cc34b03bc cederqvist-1.12.12.html.tar.bz2 137581
 RMD160 61b82c41cc365c03ee3a483cb7200a6dce2c9ffc cederqvist-1.12.12.pdf 1252423
 SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce cederqvist-1.12.12.pdf 1252423
-MD5 75eca4292b58b711f995386ed1eb4efb cederqvist-1.12.12.ps 1262208
+MD5 642cf710f7f57f448a5d92abf1f712f5 cederqvist-1.12.12.pdf 1252423
 RMD160 49fc79c627cd4b590381a6b0f609f55495546df8 cederqvist-1.12.12.ps 1262208
 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab cederqvist-1.12.12.ps 1262208
-MD5 e930ce9a6e75c06555cadb13796d04c4 cvs-1.12.12.tar.bz2 3197171
+MD5 75eca4292b58b711f995386ed1eb4efb cederqvist-1.12.12.ps 1262208
 RMD160 7275686576957e016b4f671ad5d52d8961d2d7d2 cvs-1.12.12.tar.bz2 3197171
 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc cvs-1.12.12.tar.bz2 3197171
+MD5 e930ce9a6e75c06555cadb13796d04c4 cvs-1.12.12.tar.bz2 3197171