From d2921a91934895d49878b018a43bab675d939b0e Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Fri, 16 Sep 2005 06:26:20 +0000 Subject: [PATCH] added fix for bug #103676 (made neon a hard dep) Package-Manager: portage-2.0.51.22-r2 --- dev-util/monodevelop/Manifest | 4 +--- dev-util/rapidsvn/ChangeLog | 11 ++++++++--- dev-util/rapidsvn/Manifest | 10 +++++----- dev-util/rapidsvn/rapidsvn-0.6.0-r1.ebuild | 8 +++++--- dev-util/rapidsvn/rapidsvn-0.7.0.ebuild | 8 +++++--- dev-util/rapidsvn/rapidsvn-0.7.1.ebuild | 8 +++++--- dev-util/rapidsvn/rapidsvn-0.8.0.ebuild | 15 +++++++++++---- 7 files changed, 40 insertions(+), 24 deletions(-) diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest index e1e97ee00713..3d3428bac251 100644 --- a/dev-util/monodevelop/Manifest +++ b/dev-util/monodevelop/Manifest @@ -1,12 +1,10 @@ MD5 35c17e64aed292e7a7f6aeb5915787a3 monodevelop-0.5.1-r4.ebuild 1559 -MD5 ce64f8726eadf694a85c135f454b65d5 ChangeLog 5875 +MD5 e544a30a7e2b39773bf5a7b12c4abdbd ChangeLog 5980 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159 MD5 9cf588769f67de01bdb230e64b451ac5 monodevelop-0.7-r1.ebuild 1800 -MD5 13904679a3ded9ecacaa67f19771c483 monodevelop-0.7.ebuild 1647 MD5 f36ce806f3552f974021d1a56021f67c files/monodevelop-0.5.1-iconloader.diff 1255 MD5 9e3ea3908c299c9240a5f7689f83909a files/monodevelop-0.5.1-nemerle-gtk-sharp.diff 1874 MD5 48b44fa7ba76c3b567d260ecff9e7aea files/digest-monodevelop-0.7-r1 68 MD5 8c9f33855ebcc0bd8100baec6a00fb50 files/digest-monodevelop-0.5.1-r4 157 -MD5 48b44fa7ba76c3b567d260ecff9e7aea files/digest-monodevelop-0.7 68 MD5 cff7e9d967516c14789c6d0246791c9d files/monodevelop-0.7-boo-0.6.0-compat.diff 1576 MD5 31886624cd9fce60d5c7346c2b22960e files/monodevelop-0.7-gtksharp-update.diff 8260 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 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 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 +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/Manifest b/dev-util/rapidsvn/Manifest index 44ed288ea64a..27937c73de41 100644 --- a/dev-util/rapidsvn/Manifest +++ b/dev-util/rapidsvn/Manifest @@ -1,9 +1,9 @@ -MD5 900dddf504e8f014218f65706275fcf4 ChangeLog 2648 +MD5 5d429a001c46ca6effc07f7562c14865 ChangeLog 2946 MD5 35d9a0711821962697d1e9a351f7ea58 metadata.xml 518 -MD5 ee92a16d9b9a2465e095272a5eb12c7a rapidsvn-0.6.0-r1.ebuild 1897 -MD5 be8a7e9d58b00611eaebddc98dad3faa rapidsvn-0.8.0.ebuild 1999 -MD5 82ee1f161a94792b36f19dc6ba4542c3 rapidsvn-0.7.0.ebuild 1999 -MD5 8e57b4f380f6f9c3226361423ce34cb2 rapidsvn-0.7.1.ebuild 1999 +MD5 0b5ce9ee18473c0b9c80cf92110b5191 rapidsvn-0.6.0-r1.ebuild 1961 +MD5 52ceb4d3b15bf036f39fa78ec89d35ca rapidsvn-0.8.0.ebuild 2205 +MD5 efa8e4d2108a1cd74dd3c0704c93f703 rapidsvn-0.7.0.ebuild 2062 +MD5 58a01f2270da47bfd29e227051820ad7 rapidsvn-0.7.1.ebuild 2062 MD5 42cbed2e361c2977189f54e6ccd1c2de files/digest-rapidsvn-0.7.0 66 MD5 33b2f551a1f5109276382650f2bb1e6f files/digest-rapidsvn-0.6.0-r1 66 MD5 700515264c7cf5aa0b3bf855fad68369 files/digest-rapidsvn-0.7.1 66 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 } -- 2.26.2