Make layman check that nowebdav is not set on subversion since it needs webdav

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index ee899ad4235be1658439181b8027ef3eb746dd2c..9f8fc369338e0c689a99bd10ccde00f64505a09b 100644 (file)
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.30 2006/10/15 09:19:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.31 2006/12/29 17:26:03 cardoe Exp $
+
+  29 Dec 2006; <doug@gentoo.org> layman-1.0.8.ebuild:
+  Make layman check that nowebdav is not set on subversion since it needs webdav
 
   15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> layman-1.0.6.ebuild:
   Stable on ia64.

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 6957ffbc10b160618c730af324d30651fb0bec25..66f6c5394885e776f79147d22195fa14e5d74541 100644 (file)
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -4,14 +4,14 @@ EBUILD layman-1.0.6.ebuild 1369 RMD160 18cfe34eabdfdcb25d0b682feb9537eec42d3d8b
 MD5 f37d0dd46d0931d79d5f97d1dbbefd79 layman-1.0.6.ebuild 1369
 RMD160 18cfe34eabdfdcb25d0b682feb9537eec42d3d8b layman-1.0.6.ebuild 1369
 SHA256 283c99d78f81a0a92c93e9922089a2612fb2538b750008a1cb5706c1836876b2 layman-1.0.6.ebuild 1369
-EBUILD layman-1.0.8.ebuild 1389 RMD160 faacae00abe8af70b116da254b0d4465427160ab SHA1 daa5c76844db5c13690f15ed88ff918912ff3e91 SHA256 daff27308931cfcc41549b22ad6a876848177ca7cfd10bb84e4668a9bce20772
-MD5 09a7c3922e0b7f775f82d562c62eebea layman-1.0.8.ebuild 1389
-RMD160 faacae00abe8af70b116da254b0d4465427160ab layman-1.0.8.ebuild 1389
-SHA256 daff27308931cfcc41549b22ad6a876848177ca7cfd10bb84e4668a9bce20772 layman-1.0.8.ebuild 1389
-MISC ChangeLog 4187 RMD160 ea4e79783af806e9a5837df7816b1b4013d9fd37 SHA1 4b6057026c8be6dd9074ef15a97c9ae128d699c1 SHA256 7ffbe23dbe8b038601595354d935cfd0e533124e38780c94b582f038cf85c5f2
-MD5 72852bc8adb4c5ef56317a92c892eeca ChangeLog 4187
-RMD160 ea4e79783af806e9a5837df7816b1b4013d9fd37 ChangeLog 4187
-SHA256 7ffbe23dbe8b038601595354d935cfd0e533124e38780c94b582f038cf85c5f2 ChangeLog 4187
+EBUILD layman-1.0.8.ebuild 1606 RMD160 78ed200ddbb7a7ece4644e468be3007b3ad0de2d SHA1 0bfaaab946984e8225e52adbe7ed09639526b5be SHA256 18909cf461461358119b6d7674af719586e0e1bdceac3b640429af64c2e24000
+MD5 040232d6f73ccde83240da1e5072bc2b layman-1.0.8.ebuild 1606
+RMD160 78ed200ddbb7a7ece4644e468be3007b3ad0de2d layman-1.0.8.ebuild 1606
+SHA256 18909cf461461358119b6d7674af719586e0e1bdceac3b640429af64c2e24000 layman-1.0.8.ebuild 1606
+MISC ChangeLog 4323 RMD160 4b373987adda907155c39a3b88b347ffb6922f84 SHA1 98d583a36fc39f6e43c5d7260574d40d44806705 SHA256 53df59add2ce15d3f9feac62ebda0e9520499fe910779acc1fb9da568b21f626
+MD5 e88639e0683f0c36eefc7ad5102abc9e ChangeLog 4323
+RMD160 4b373987adda907155c39a3b88b347ffb6922f84 ChangeLog 4323
+SHA256 53df59add2ce15d3f9feac62ebda0e9520499fe910779acc1fb9da568b21f626 ChangeLog 4323
 MISC metadata.xml 278 RMD160 2c07a8b6d5169cfa7f53c523678662516e69168d SHA1 cb01839ea8cf8b34bad6e411ef0a8f4fe20c9e04 SHA256 e482a8d220d2dd788da85e4b2b38e8a1cdec590f47948abb419ec7befce5be55
 MD5 5568eb8481535148d54846ecf2301ea9 metadata.xml 278
 RMD160 2c07a8b6d5169cfa7f53c523678662516e69168d metadata.xml 278

diff --git a/app-portage/layman/layman-1.0.8.ebuild b/app-portage/layman/layman-1.0.8.ebuild
index 0d2173887111e9ce730b7259193d7354fa7857f4..902a453fc85126a97c458dfb65b7c385f3b1bba4 100644 (file)
--- a/app-portage/layman/layman-1.0.8.ebuild
+++ b/app-portage/layman/layman-1.0.8.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/app-portage/layman/layman-1.0.8.ebuild,v 1.2 2006/10/03 11:15:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.0.8.ebuild,v 1.3 2006/12/29 17:26:03 cardoe Exp $
 
 inherit eutils distutils
 
@@ -16,6 +16,13 @@ S=${WORKDIR}/${PF}
 
 DEPEND="dev-util/subversion"
 
+pkg_setup() {
+       if built_with_use dev-util/subversion nowebdav; then
+               eerror "You must rebuild your subversion without the nowebdav USE flag"
+               die "You must rebuild your subversion without the nowebdav USE flag"
+       fi
+}
+
 src_install() {
 
        distutils_src_install