Added myself as maintainer, upgraded to EAPI=4 to drop built_with_use (#305365), thanks agostino for the patch #390469; dropped old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 61 insertions, 296 deletions

diff --git a/dev-vcs/rapidsvn/ChangeLog b/dev-vcs/rapidsvn/ChangeLog
index 96d7757763af..4bb23ce9d998 100644
--- a/dev-vcs/rapidsvn/ChangeLog
+++ b/dev-vcs/rapidsvn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/rapidsvn
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.4 2011/12/04 16:41:54 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.5 2012/01/31 16:20:08 jlec Exp $
+
+  31 Jan 2012; Justin Lecher <jlec@gentoo.org> -rapidsvn-0.9.8.ebuild,
+  -rapidsvn-0.10.0.ebuild, rapidsvn-0.12.0.ebuild, metadata.xml:
+  Added myself as maintainer, upgraded to EAPI=4 to drop built_with_use
+  (#305365), thanks agostino for the patch #390469; dropped old
 
   04 Dec 2011; Markos Chandras <hwoarang@gentoo.org> rapidsvn-0.12.0.ebuild:
   Stable on amd64 wrt bug #377737
diff --git a/dev-vcs/rapidsvn/metadata.xml b/dev-vcs/rapidsvn/metadata.xml
index 2aae4d1bc863..e3bb7ca21257 100644
--- a/dev-vcs/rapidsvn/metadata.xml
+++ b/dev-vcs/rapidsvn/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-tools</herd>
-<maintainer>
-  <email>nerdboy@gentoo.org</email>
-  <name>Steve Arnold</name>
-  <description>Primary Maintainer</description>
-</maintainer>
-<longdescription>
+	<herd>dev-tools</herd>
+	<maintainer>
+		<email>nerdboy@gentoo.org</email>
+		<name>Steve Arnold</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<longdescription>
 RapidSVN is a cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework. This project also includes a Subversion client C++ API.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.10.0.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.10.0.ebuild
deleted file mode 100644
index 3a8c29c05ee6..000000000000
--- a/dev-vcs/rapidsvn/rapidsvn-0.10.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.10.0.ebuild,v 1.1 2011/02/10 21:35:45 ulm 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)
-MY_RELEASE="1"
-
-DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
-HOMEPAGE="http://rapidsvn.tigris.org/"
-SRC_URI="http://www.rapidsvn.org/download/release/${MY_PV}/${P}-${MY_RELEASE}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-COMMON_DEP="|| ( >=dev-vcs/subversion-1.5.0[webdav-serf]
-		>=dev-vcs/subversion-1.5.0[webdav-neon]
-	)
-	x11-libs/wxGTK:2.8[X]
-	>=dev-libs/apr-1.2.10
-	>=dev-libs/apr-util-1.2.10"
-
-DEPEND="${COMMON_DEP}
-	doc? ( dev-libs/libxslt
-		app-text/docbook-sgml-utils
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets )"
-
-RDEPEND="${COMMON_DEP}"
-
-RESTRICT=""
-
-pkg_setup() {
-	einfo "Checking for subversion compiled with WebDAV support..."
-	confutils_require_built_with_any \
-		dev-vcs/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"
-	epatch "${FILESDIR}/${PN}-svncpp_link.patch"
-	epatch "${FILESDIR}/${PN}-0.9.8-sar.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local apr_suffix=""
-
-	if has_version ">dev-libs/apr-util-1"; then
-		apr_suffix="-1"
-	fi
-
-	if use doc; then
-		myconf="--with-manpage=yes"
-	else
-		myconf="--without-xsltproc --with-manpage=no \
-		    --without-doxygen --without-dot"
-	fi
-
-	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-
-	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
-
-	econf	--with-svn-lib=/usr/$(get_libdir) \
-		--with-svn-include=/usr/include \
-		--with-apr-config="/usr/bin/apr${apr_suffix}-config" \
-		--with-apu-config="/usr/bin/apu${apr_suffix}-config" \
-		${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake  || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	doicon src/res/rapidsvn.ico
-	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
-		"/usr/share/pixmaps/rapidsvn.ico" \
-		"RevisionControl;Development"
-
-	dodoc HACKING.txt TRANSLATIONS
-
-	if use doc ; then
-		dodoc AUTHORS CHANGES NEWS README
-		dohtml "${S}"/doc/svncpp/html/*
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
index bf7aabdf85de..15b8d61960e8 100644
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
@@ -1,104 +1,86 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.4 2011/12/04 16:41:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.5 2012/01/31 16:20:08 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 WANT_AUTOCONF="2.5"
 WX_GTK_VER=2.8
-inherit versionator confutils libtool autotools wxwidgets flag-o-matic fdo-mime
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils fdo-mime flag-o-matic libtool versionator wxwidgets
 
 MY_PV=$(get_version_component_range 1-2)
 MY_REL="1"
 
-DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
+DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
 HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="http://www.rapidsvn.org/download/release/${MY_PV}/${P}-${MY_REL}.tar.gz"
+
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-COMMON_DEP=">=dev-vcs/subversion-1.5.0
-	x11-libs/wxGTK:2.8[X]
-	>=dev-libs/apr-1.2.10
-	>=dev-libs/apr-util-1.2.10"
-
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+COMMON_DEP="
+	dev-libs/apr
+	dev-libs/apr-util
+	|| (
+		dev-vcs/subversion[webdav-neon]
+		dev-vcs/subversion[webdav-serf] )
+	x11-libs/wxGTK:2.8[X]"
 DEPEND="${COMMON_DEP}
-	doc? ( dev-libs/libxslt
+	doc? (
+		dev-libs/libxslt
 		app-text/docbook-sgml-utils
 		app-doc/doxygen
 		app-text/docbook-xsl-stylesheets )"
-
 RDEPEND="${COMMON_DEP}"
 
-RESTRICT=""
-
 S="${WORKDIR}/${P}-${MY_REL}"
 
-pkg_setup() {
-	einfo "Checking for subversion compiled with WebDAV support..."
-	confutils_require_built_with_any \
-		dev-vcs/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
+PATCHES=( "${FILESDIR}/${PN}-svncpp_link.patch" )
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( HACKING.txt TRANSLATIONS )
 
-	# 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"
-	eautoreconf
+pkg_setup() {
+	wxwidgets_pkg_setup
 }
 
 src_configure() {
-	local myconf
-	local apr_suffix=""
-
-	if has_version ">dev-libs/apr-util-1"; then
-		apr_suffix="-1"
-	fi
+	local myeconfargs=( --with-wx-config=${WX_CONFIG} )
 
 	if use doc; then
-		myconf="--with-manpage=yes"
+		myeconfargs+=( --with-manpage=yes )
 	else
-		myconf="--without-xsltproc --with-manpage=no \
-		    --without-doxygen --without-dot"
+		myeconfargs+=(
+				--without-xsltproc
+				--with-manpage=no
+				--without-doxygen
+				--without-dot )
 	fi
 
-	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+	append-flags $( "${EPREFIX}"/usr/bin/apr-1-config --cppflags )
 
-	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
-
-	econf	--with-svn-lib=/usr/$(get_libdir) \
-		--with-svn-include=/usr/include \
-		--with-apr-config="/usr/bin/apr${apr_suffix}-config" \
-		--with-apu-config="/usr/bin/apu${apr_suffix}-config" \
-		${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake  || die "emake failed"
+	myeconfargs+=(
+		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
+		--with-svn-include="${EPREFIX}"/usr/include
+		--with-apr-config="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
+		)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	autotools-utils_src_install
 
 	doicon src/res/rapidsvn.ico
 	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
-		"/usr/share/pixmaps/rapidsvn.ico" \
+		"${EPREFIX}/usr/share/pixmaps/rapidsvn.ico" \
 		"RevisionControl;Development"
 
-	dodoc HACKING.txt TRANSLATIONS
-
 	if use doc ; then
-		dodoc AUTHORS CHANGES NEWS README
 		dohtml "${S}"/doc/svncpp/html/*
 	fi
 }
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.9.8.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.9.8.ebuild
deleted file mode 100644
index a9f854b62fed..000000000000
--- a/dev-vcs/rapidsvn/rapidsvn-0.9.8.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.9.8.ebuild,v 1.1 2011/02/10 21:35:45 ulm 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."
-HOMEPAGE="http://rapidsvn.tigris.org/"
-SRC_URI="http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-COMMON_DEP=">=dev-vcs/subversion-1.5.0
-	=x11-libs/wxGTK-2.8*
-	>=dev-libs/apr-1.2.10
-	>=dev-libs/apr-util-1.2.10"
-
-DEPEND="${COMMON_DEP}
-	doc? ( dev-libs/libxslt
-		app-text/docbook-sgml-utils
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets )"
-
-RDEPEND="${COMMON_DEP}"
-
-RESTRICT=""
-
-pkg_setup() {
-	einfo "Checking for subversion compiled with WebDAV support..."
-	if ! built_with_use --missing true -o dev-vcs/subversion webdav-neon webdav-serf || \
-	built_with_use --missing false dev-vcs/subversion nowebdav; then
-		ewarn "SVN (dev-vcs/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}"
-
-	# 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
-}
-
-src_compile() {
-	local myconf
-	local apr_suffix=""
-
-	if has_version ">dev-libs/apr-util-1"; then
-		apr_suffix="-1"
-	fi
-
-	if use doc; then
-		myconf="--with-manpage=yes"
-	else
-		myconf="--without-xsltproc --with-manpage=no \
-		    --without-doxygen --without-dot"
-	fi
-
-	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-
-	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
-
-	econf	--with-svn-lib=/usr/$(get_libdir) \
-		--with-svn-include=/usr/include \
-		--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"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	doicon src/res/rapidsvn.ico
-	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
-		"/usr/share/pixmaps/rapidsvn.ico" \
-		"RevisionControl;Development"
-
-	dodoc HACKING.txt TRANSLATIONS
-
-	if use doc ; then
-		dodoc AUTHORS CHANGES NEWS README
-		dohtml "${S}"/doc/svncpp/html/*
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}