added fix for bug #103676 (made neon a hard dep)

(Portage version: 2.0.51.22-r2)

5 files changed, 34 insertions, 16 deletions

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index d7ae059845a3..289eeb6b4f7d 100644
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for dev-util/rapidsvn
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.16 2005/05/31 06:28:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.17 2005/09/16 06:26:20 nerdboy Exp $
+
+  16 Sep 2005; Steve Arnold <nerdboy@gentoo.org> rapidsvn-0.6.0-r1.ebuild,
+  rapidsvn-0.7.0.ebuild, rapidsvn-0.7.1.ebuild, rapidsvn-0.8.0.ebuild:
+  Added fix for bug #103676 (made neon a hard dep, since with subversion
+  it depends on webdav support).  Also stblized older (non-bugged) versions.
 
 *rapidsvn-0.8.0 (31 May 2005)
 
   31 May 2005; Steve Arnold <nerdboy@gentoo.org> rapidsvn-0.7.0.ebuild,
   rapidsvn-0.7.1.ebuild, +rapidsvn-0.8.0.ebuild:
-  all newer versions fixed (really fixes bug 62724) and version bump (bug 90895)
+  All newer versions fixed (really fixes bug 62724) and version bump (bug 90895)
   time to start stablizin'!
 
 *rapidsvn-0.6.0-r1 (31 May 2005)
@@ -14,7 +19,7 @@
   31 May 2005; Steve Arnold <nerdboy@gentoo.org>
   +files/svncpp_0.6.1_link.patch, metadata.xml, -rapidsvn-0.6.0.ebuild,
   +rapidsvn-0.6.0-r1.ebuild:
-  stable x86 was broken and this fixes it (closes bug 55569)
+  sStable x86 was broken and this fixes it (closes bug 55569)
   dev-tools herd is also adopting this package (but feel free to keep
   working on stuff or assign bugs to me)
 
diff --git a/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild b/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild
index e990ea3cd4b3..b2390de0ea4c 100644
--- a/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild,v 1.1 2005/05/31 03:55:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild,v 1.2 2005/09/16 06:26:20 nerdboy Exp $
 
 inherit eutils
 
@@ -9,10 +9,11 @@ HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="doc gtk2"
 
-DEPEND=">=dev-util/subversion-1.0.0
+DEPEND="~net-misc/neon-0.24.7
+	>=dev-util/subversion-1.0.0
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets )"
 
@@ -51,6 +52,7 @@ src_compile() {
 
 	econf	--with-svn-lib=/usr/lib \
 		--with-svn-include=/usr/include \
+		--with-neon-config=/usr/bin/neon-config \
 		${myconf} || die "./configure failed"
 	emake  || die
 }
diff --git a/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild b/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild
index 73ac7d687beb..d273d87151d6 100644
--- a/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild,v 1.3 2005/05/31 06:28:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild,v 1.4 2005/09/16 06:26:20 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -9,10 +9,11 @@ HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="doc gtk2"
 
-DEPEND=">=dev-util/subversion-1.0.0
+DEPEND="~net-misc/neon-0.24.7
+	>=dev-util/subversion-1.0.0
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets )"
 
@@ -51,6 +52,7 @@ src_compile() {
 
 	econf	--with-svn-lib=/usr/lib \
 		--with-svn-include=/usr/include \
+		--with-neon-config=/usr/bin/neon-config \
 		${myconf} || die "./configure failed"
 	emake  || die
 }
diff --git a/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild b/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild
index b010fc76da0c..b0e8697d2b35 100644
--- a/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild,v 1.2 2005/05/31 06:28:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild,v 1.3 2005/09/16 06:26:20 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -9,10 +9,11 @@ HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="doc gtk2"
 
-DEPEND=">=dev-util/subversion-1.0.0
+DEPEND="~net-misc/neon-0.24.7
+	>=dev-util/subversion-1.0.0
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets )"
 
@@ -51,6 +52,7 @@ src_compile() {
 
 	econf	--with-svn-lib=/usr/lib \
 		--with-svn-include=/usr/include \
+		--with-neon-config=/usr/bin/neon-config \
 		${myconf} || die "./configure failed"
 	emake  || die
 }
diff --git a/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild b/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild
index 439aeb2666bf..07ad271318f0 100644
--- a/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild,v 1.1 2005/05/31 06:28:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild,v 1.2 2005/09/16 06:26:20 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -10,9 +10,10 @@ SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="doc gtk2"
+IUSE="doc gtk2 static"
 
-DEPEND=">=dev-util/subversion-1.0.0
+DEPEND="~net-misc/neon-0.24.7
+	>=dev-util/subversion-1.0.0
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets )"
 
@@ -36,6 +37,11 @@ src_compile() {
 		myconf="--without-xsltproc --without-docbook-xsl --without-doxygen \
 			--without-dot"
 	fi
+	if use static; then
+		myconf="${myconf} --enable-static"
+	else
+		myconf="${myconf} --disable-static --enable-shared"
+	fi
 	if use gtk2; then
 		if test -x /usr/bin/wxgtk2-2.4-config; then
 			myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
@@ -49,8 +55,9 @@ src_compile() {
 	fi
 	elibtoolize --portage
 
-	econf	--with-svn-lib=/usr/lib \
+	econf	--with-svn-lib=/usr/$(get_libdir) \
 		--with-svn-include=/usr/include \
+		--with-neon-config=/usr/bin/neon-config \
 		${myconf} || die "./configure failed"
 	emake  || die
 }