Removed legacy code, moved checks to pkg_setup, and removed addpredict.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

5 files changed, 83 insertions, 80 deletions

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index 28a75682ebc1..cf63efaf0d3c 100644
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/rapidsvn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.68 2010/02/13 21:16:38 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.69 2010/02/16 01:32:40 nerdboy Exp $
+
+  16 Feb 2010; Steve Arnold <nerdboy@gentoo.org> rapidsvn-0.9.6-r1.ebuild,
+  rapidsvn-0.9.8.ebuild, rapidsvn-0.10.0.ebuild, rapidsvn-0.12.0.ebuild:
+  Removed legacy code, moved checks to pkg_setup, and removed addpredict 
+  in 4 latest ebuild versions. Closes bug #305325.
 
 *rapidsvn-0.12.0 (13 Feb 2010)
 
diff --git a/dev-util/rapidsvn/rapidsvn-0.10.0.ebuild b/dev-util/rapidsvn/rapidsvn-0.10.0.ebuild
index 57c36b0d89fa..4b43a2096c25 100644
--- a/dev-util/rapidsvn/rapidsvn-0.10.0.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.10.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.10.0.ebuild,v 1.1 2009/10/12 07:29:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.10.0.ebuild,v 1.2 2010/02/16 01:32:40 nerdboy Exp $
 
 EAPI="2"
+
 WANT_AUTOCONF="2.5"
-inherit versionator eutils libtool autotools wxwidgets flag-o-matic fdo-mime
+WX_GTK_VER=2.8
+inherit versionator confutils libtool autotools wxwidgets flag-o-matic fdo-mime
 
 MY_PV=$(get_version_component_range 1-2)
 MY_RELEASE="1"
@@ -20,7 +22,7 @@ IUSE="doc"
 COMMON_DEP="|| ( >=dev-util/subversion-1.5.0[webdav-serf]
 		>=dev-util/subversion-1.5.0[webdav-neon]
 	)
-	>=x11-libs/wxGTK-2.6
+	x11-libs/wxGTK:2.8[X]
 	>=dev-libs/apr-1.2.10
 	>=dev-libs/apr-util-1.2.10"
 
@@ -34,6 +36,20 @@ RDEPEND="${COMMON_DEP}"
 
 RESTRICT=""
 
+pkg_setup() {
+	einfo "Checking for subversion compiled with WebDAV support..."
+	confutils_require_built_with_any \
+		dev-util/subversion webdav-serf webdav-neon
+	einfo "Found WebDAV support; continuing..."
+
+	# if you compiled subversion without (the) apache2 (flag) and with the
+	# berkdb flag, you may get an error that it can't find the lib db4
+	# Note: this should be fixed in rapidsvn 0.9.3 and later
+
+	# check for the proper wxGTK support
+	need-wxwidgets unicode
+}
+
 src_prepare() {
 	# Apparently we still need the --as-needed link patch...
 	#export EPATCH_OPTS="-F3 -l"
@@ -57,11 +73,6 @@ src_configure() {
 		    --without-doxygen --without-dot"
 	fi
 
-	local INST_WX=$(best_version x11-libs/wxGTK)
-	export WX_GTK_VER=$(get_version_component_range 1-2 \
-		        ${INST_WX/x11-libs\/wxGTK})
-
-	need-wxwidgets ansi
 	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
 
 	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
@@ -74,11 +85,7 @@ src_configure() {
 }
 
 src_compile() {
-	## doxygen made a sandbox error; no bug filed yet
-	if use doc; then
-		addpredict /var/cache/fontconfig
-		emake  || die "emake failed"
-	fi
+	emake  || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-util/rapidsvn/rapidsvn-0.12.0.ebuild b/dev-util/rapidsvn/rapidsvn-0.12.0.ebuild
index 3300e03a4c5c..91bdbdd7ffbf 100644
--- a/dev-util/rapidsvn/rapidsvn-0.12.0.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.12.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.1 2010/02/13 21:16:38 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.2 2010/02/16 01:32:40 nerdboy Exp $
 
 EAPI="2"
 
 WANT_AUTOCONF="2.5"
+WX_GTK_VER=2.8
 inherit versionator confutils libtool autotools wxwidgets flag-o-matic fdo-mime
 
 MY_PV=$(get_version_component_range 1-2)
@@ -19,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 COMMON_DEP=">=dev-util/subversion-1.5.0
-	>=x11-libs/wxGTK-2.6
+	x11-libs/wxGTK:2.8[X]
 	>=dev-libs/apr-1.2.10
 	>=dev-libs/apr-util-1.2.10"
 
@@ -44,13 +45,15 @@ pkg_setup() {
 	# if you compiled subversion without (the) apache2 (flag) and with the
 	# berkdb flag, you may get an error that it can't find the lib db4
 	# Note: this should be fixed in rapidsvn 0.9.3 and later
+
+	# check for the proper wxGTK support
+	need-wxwidgets unicode
 }
 
 src_prepare() {
 	# Apparently we still need the --as-needed link patch...
 	#export EPATCH_OPTS="-F3 -l"
 	epatch "${FILESDIR}/${PN}-svncpp_link.patch"
-	#epatch "${FILESDIR}/${P}-sar.patch"
 	eautoreconf
 }
 
@@ -69,11 +72,6 @@ src_configure() {
 		    --without-doxygen --without-dot"
 	fi
 
-	local INST_WX=$(best_version x11-libs/wxGTK)
-	export WX_GTK_VER=$(get_version_component_range 1-2 \
-		        ${INST_WX/x11-libs\/wxGTK})
-
-	need-wxwidgets ansi
 	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
 
 	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
@@ -86,11 +84,7 @@ src_configure() {
 }
 
 src_compile() {
-	## doxygen made a sandbox error; no bug filed yet
-	if use doc; then
-		addpredict /var/cache/fontconfig
-		emake  || die "emake failed"
-	fi
+	emake  || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.6-r1.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.6-r1.ebuild
index 6d99617f4353..687fc2e528b5 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.6-r1.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.6-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.6-r1.ebuild,v 1.6 2008/09/17 20:46:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.6-r1.ebuild,v 1.7 2010/02/16 01:32:40 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
+WX_GTK_VER=2.8
 inherit versionator eutils libtool autotools wxwidgets flag-o-matic fdo-mime
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
@@ -15,7 +16,7 @@ IUSE="doc static"
 
 COMMON_DEP=">=dev-util/subversion-1.4.4
 	>=net-misc/neon-0.26
-	>=x11-libs/wxGTK-2.6
+	=x11-libs/wxGTK-2.8*
 	>=dev-libs/apr-1.2.10
 	>=dev-libs/apr-util-1.2.10"
 
@@ -29,18 +30,7 @@ RDEPEND="${COMMON_DEP}"
 
 RESTRICT=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apparently we still need the --as-needed link patch...
-	epatch "${FILESDIR}/${PN}-svncpp_link.patch"
-	epatch "${FILESDIR}/${PN}-sar.patch"
-	eautoconf
-	elibtoolize
-}
-
-src_compile() {
+pkg_setup() {
 	einfo "Checking for subversion compiled with WebDAV support..."
 	if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \
 	built_with_use --missing false dev-util/subversion nowebdav; then
@@ -55,18 +45,31 @@ src_compile() {
 	# if you compiled subversion without (the) apache2 (flag) and with the
 	# berkdb flag, you will get an error that it can't find the lib db4
 	# Note: this should be fixed in rapidsvn 0.9.3 and later
+
+	# check for the proper wxGTK support
+	need-wxwidgets unicode
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apparently we still need the --as-needed link patch...
+	epatch "${FILESDIR}/${PN}-svncpp_link.patch"
+	epatch "${FILESDIR}/${PN}-sar.patch"
+	eautoconf
+	elibtoolize
+}
+
+src_compile() {
 	local myconf
-	local xslss_dir
 	local apr_suffix=""
 
 	if has_version ">dev-libs/apr-util-1"; then
 		apr_suffix="-1"
 	fi
 
-	if use doc; then
-		xslss_dir=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets*|head -n1)
-		myconf="--with-docbook-xsl=$xslss_dir"
-	else
+	if ! use doc; then
 		myconf="--without-xsltproc --without-doxygen --without-dot"
 	fi
 
@@ -76,11 +79,6 @@ src_compile() {
 		myconf="${myconf} --disable-static --enable-shared"
 	fi
 
-	local INST_WX=$(best_version x11-libs/wxGTK)
-	export WX_GTK_VER=$(get_version_component_range 1-2 \
-		        ${INST_WX/x11-libs\/wxGTK})
-
-	need-wxwidgets ansi
 	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
 
 	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
@@ -91,6 +89,7 @@ src_compile() {
 		--with-apr-config="/usr/bin/apr${apr_suffix}-config" \
 		--with-apu-config="/usr/bin/apu${apr_suffix}-config" \
 		${myconf} || die "econf failed"
+
 	emake  || die "emake failed"
 }
 
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild
index 2d13e904d8e5..bbc24ea0c3b1 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild,v 1.2 2009/08/01 15:42:52 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild,v 1.3 2010/02/16 01:32:40 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
+WX_GTK_VER=2.8
 inherit versionator eutils libtool autotools wxwidgets flag-o-matic fdo-mime
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
@@ -14,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 COMMON_DEP=">=dev-util/subversion-1.5.0
-	>=x11-libs/wxGTK-2.6
+	=x11-libs/wxGTK-2.8*
 	>=dev-libs/apr-1.2.10
 	>=dev-libs/apr-util-1.2.10"
 
@@ -28,6 +29,26 @@ RDEPEND="${COMMON_DEP}"
 
 RESTRICT=""
 
+pkg_setup() {
+	einfo "Checking for subversion compiled with WebDAV support..."
+	if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \
+	built_with_use --missing false dev-util/subversion nowebdav; then
+		ewarn "SVN (dev-util/subversion) must be compiled with WebDAV support."
+		ewarn "Please re-emerge subversion with webdav-neon or webdav-serf USE flag"
+		ewarn "and without the nowebdav USE flag."
+		die "SVN merged without WebDAV support"
+	else
+		einfo "Found WebDAV support; continuing..."
+	fi
+
+	# if you compiled subversion without (the) apache2 (flag) and with the
+	# berkdb flag, you will get an error that it can't find the lib db4
+	# Note: this should be fixed in rapidsvn 0.9.3 and later
+
+	# check for the proper wxGTK support
+	need-wxwidgets unicode
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -40,20 +61,6 @@ src_unpack() {
 }
 
 src_compile() {
-	einfo "Checking for subversion compiled with WebDAV support..."
-	if ! built_with_use --missing true -o dev-util/subversion webdav-serf || \
-	built_with_use --missing false dev-util/subversion nowebdav; then
-		ewarn "SVN (dev-util/subversion) must be compiled with WebDAV support."
-		ewarn "Please re-emerge subversion with the webdav-serf USE flag and"
-		ewarn "without the nowebdav USE flag."
-		die "SVN merged without WebDAV support"
-	else
-		einfo "Found WebDAV support; continuing..."
-	fi
-
-	# if you compiled subversion without (the) apache2 (flag) and with the
-	# berkdb flag, you will get an error that it can't find the lib db4
-	# Note: this should be fixed in rapidsvn 0.9.3 and later
 	local myconf
 	local apr_suffix=""
 
@@ -68,11 +75,6 @@ src_compile() {
 		    --without-doxygen --without-dot"
 	fi
 
-	local INST_WX=$(best_version x11-libs/wxGTK)
-	export WX_GTK_VER=$(get_version_component_range 1-2 \
-		        ${INST_WX/x11-libs\/wxGTK})
-
-	need-wxwidgets ansi
 	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
 
 	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
@@ -83,11 +85,7 @@ src_compile() {
 		--with-apu-config="/usr/bin/apu${apr_suffix}-config" \
 		${myconf} || die "econf failed"
 
-	## doxygen made a sandbox error; no bug filed yet
-	if use doc; then
-		addpredict /var/cache/fontconfig
-		emake  || die "emake failed"
-	fi
+	emake  || die "emake failed"
 }
 
 src_install() {