Added fix for bug #112081, and removed gtk2 use flag (bug #106560).

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index 07b04aa1b92b46e0e73933fb957676a91f6380d1..bd611d44e0151b76d9c9e6c87698403e0f2e9b3c 100644 (file)
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,15 @@
 # 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.21 2005/11/22 19:40:00 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.22 2005/11/27 20:23:11 nerdboy Exp $
+
+*rapidsvn-0.9.0-r1 (27 Nov 2005)
+
+  27 Nov 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/nodoc-configure.patch, rapidsvn-0.6.0-r1.ebuild,
+  rapidsvn-0.7.0.ebuild, rapidsvn-0.7.1.ebuild, rapidsvn-0.8.0.ebuild,
+  -rapidsvn-0.9.0.ebuild, +rapidsvn-0.9.0-r1.ebuild:
+  Added fix for bug #112081, and removed gtk2 use flag (bug #106560).  Thanks
+  to Dan Check <check@radicalmedia.com> for the patch.
 
   22 Nov 2005; Luis Medinas <metalgod@gentoo.org> rapidsvn-0.8.0.ebuild:
   Stable on amd64.

diff --git a/dev-util/rapidsvn/files/digest-rapidsvn-0.9.0 b/dev-util/rapidsvn/files/digest-rapidsvn-0.9.0-r1
similarity index 100%
rename from dev-util/rapidsvn/files/digest-rapidsvn-0.9.0
rename to dev-util/rapidsvn/files/digest-rapidsvn-0.9.0-r1

diff --git a/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild b/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild
index 9901db049beac6a50d7685c404d58d9d923abe43..bc1916253ccd990038329fb6dbccbcd968894857 100644 (file)
--- 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.3 2005/10/10 02:53:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild,v 1.4 2005/11/27 20:23:12 nerdboy Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ 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"
 
 DEPEND="~net-misc/neon-0.24.7
        >=dev-util/subversion-1.0.0
@@ -37,13 +37,13 @@ src_compile() {
                myconf="--without-xsltproc --without-docbook-xsl --without-doxygen \
                        --without-dot"
        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"
-               else
-                       ewarn "wxgtk2-2.4-config not found. Compiling with default wxGTK."
-               fi
-       elif test -x /usr/bin/wxgtk-2.4-config; then
+       # look for wxgtk config file
+       if test -x /usr/bin/wxgtk2-2.4-config; then
+               myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
+       else
+               ewarn "wxgtk2-2.4-config not found. Compiling with default wxGTK."
+       fi
+       if test -x /usr/bin/wxgtk-2.4-config; then
                myconf="${myconf} --with-wx-config=/usr/bin/wxgtk-2.4-config"
        else
                ewarn "wxgtk-2.4-config not found. Compiling with default wxGTK."

diff --git a/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild b/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild
index f3ec0c5ea4cc43b1a5c57e49510b8c9101e11d6e..f4dd157d33f8e7a171e428284292e97ee3d5b6d2 100644 (file)
--- 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.5 2005/10/10 02:53:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.7.0.ebuild,v 1.6 2005/11/27 20:23:12 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ 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"
 
 DEPEND="~net-misc/neon-0.24.7
        >=dev-util/subversion-1.0.0
@@ -37,13 +37,13 @@ src_compile() {
                myconf="--without-xsltproc --without-docbook-xsl --without-doxygen \
                        --without-dot"
        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"
-               else
-                       ewarn "wxgtk2-2.4-config not found. Compiling with default wxGTK."
-               fi
-       elif test -x /usr/bin/wxgtk-2.4-config; then
+       # look for wxgtk config file
+       if test -x /usr/bin/wxgtk2-2.4-config; then
+               myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
+       else
+               ewarn "wxgtk2-2.4-config not found. Compiling with default wxGTK."
+       fi
+       if test -x /usr/bin/wxgtk-2.4-config; then
                myconf="${myconf} --with-wx-config=/usr/bin/wxgtk-2.4-config"
        else
                ewarn "wxgtk-2.4-config not found. Compiling with default wxGTK."

diff --git a/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild b/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild
index 9f4a9e31d8b01f3b127ef7e15c8810d17cac95c5..6cf43706e6d20c2ea262d3d180118d8f1c1443be 100644 (file)
--- 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.4 2005/10/10 02:53:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.7.1.ebuild,v 1.5 2005/11/27 20:23:12 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ 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"
 
 DEPEND="~net-misc/neon-0.24.7
        >=dev-util/subversion-1.0.0
@@ -37,13 +37,13 @@ src_compile() {
                myconf="--without-xsltproc --without-docbook-xsl --without-doxygen \
                        --without-dot"
        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"
-               else
-                       ewarn "wxgtk2-2.4-config not found. Compiling with default wxGTK."
-               fi
-       elif test -x /usr/bin/wxgtk-2.4-config; then
+       # look for wxgtk config file
+       if test -x /usr/bin/wxgtk2-2.4-config; then
+               myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
+       else
+               ewarn "wxgtk2-2.4-config not found. Compiling with default wxGTK."
+       fi
+       if test -x /usr/bin/wxgtk-2.4-config; then
                myconf="${myconf} --with-wx-config=/usr/bin/wxgtk-2.4-config"
        else
                ewarn "wxgtk-2.4-config not found. Compiling with default wxGTK."

diff --git a/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild b/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild
index bd61f459734d43b06deec7ab3b686074df593d04..ffcc24745ad4a5daac3e85bada5ef670eb425f1b 100644 (file)
--- 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.6 2005/11/22 19:40:00 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.8.0.ebuild,v 1.7 2005/11/27 20:23:12 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -9,8 +9,8 @@ HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="doc gtk2 static"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="doc static"
 
 DEPEND="~net-misc/neon-0.24.7
        >=dev-util/subversion-1.0.0
@@ -42,13 +42,13 @@ src_compile() {
        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"
-               else
-                       ewarn "wxgtk2-2.4-config not found. Trying wxgtk-2.4-config..."
-               fi
-       elif test -x /usr/bin/wxgtk-2.4-config; then
+       # look for wxgtk config file
+       if test -x /usr/bin/wxgtk2-2.4-config; then
+               myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
+       else
+               ewarn "wxgtk2-2.4-config not found. Compiling with default wxGTK."
+       fi
+       if test -x /usr/bin/wxgtk-2.4-config; then
                myconf="${myconf} --with-wx-config=/usr/bin/wxgtk-2.4-config"
        else
                ewarn "wxgtk-2.4-config not found. Compiling with default wxGTK."

diff --git a/dev-util/rapidsvn/rapidsvn-0.9.0.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.0-r1.ebuild
similarity index 76%
rename from dev-util/rapidsvn/rapidsvn-0.9.0.ebuild
rename to dev-util/rapidsvn/rapidsvn-0.9.0-r1.ebuild
index 6ce4524420b344f0d1e1bff3f35d5aebd236d46e..6d9bdc0cf43ec0af8e0242160f9a59dffb8b712f 100644 (file)
--- a/dev-util/rapidsvn/rapidsvn-0.9.0.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.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.9.0.ebuild,v 1.1 2005/11/08 07:11:11 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.0-r1.ebuild,v 1.1 2005/11/27 20:23:12 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="doc gtk2 static"
+IUSE="doc static"
 
 DEPEND="~net-misc/neon-0.24.7
        >=dev-util/subversion-1.2.0
@@ -22,6 +22,7 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        epatch ${FILESDIR}/svncpp_0.6.1_link.patch
+       epatch ${FILESDIR}/nodoc-configure.patch.gz
 }
 
 src_compile() {
@@ -42,28 +43,30 @@ src_compile() {
        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"
-               else
-                       ewarn "wxgtk2-2.4-config not found. Trying wxgtk-2.4-config..."
-               fi
-       elif test -x /usr/bin/wxgtk-2.4-config; then
+       # look for wxgtk config file
+       if test -x /usr/bin/wxgtk2-2.4-config; then
+               myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
+       else
+               ewarn "wxgtk2-2.4-config not found. Trying wxgtk-2.4-config..."
+       fi
+       if test -x /usr/bin/wxgtk-2.4-config; then
                myconf="${myconf} --with-wx-config=/usr/bin/wxgtk-2.4-config"
        else
                ewarn "wxgtk-2.4-config not found. Compiling with default wxGTK."
        fi
        elibtoolize --portage
 
+       libtoolize --copy --force
        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
+               ${myconf} || die "econf failed"
+       emake  || die "emake failed"
 }
 
 src_install() {
-       einstall || die
+       einstall || die "einstall failed"
+       doman doc/manpage/rapidsvn.1 || die "doman failed"
        doicon src/res/bitmaps/svn.xpm
        make_desktop_entry rapidsvn RapidSVN svn.xpm RevisionControl
        if use doc ; then