Dropped old, fixes #313713 & 305365

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 14 insertions, 132 deletions

diff --git a/dev-vcs/rapidsvn/ChangeLog b/dev-vcs/rapidsvn/ChangeLog
index 9fc180aaffcb..d4a56665ec04 100644
--- a/dev-vcs/rapidsvn/ChangeLog
+++ b/dev-vcs/rapidsvn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/rapidsvn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.7 2012/03/17 18:07:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.8 2012/03/17 19:42:32 jlec Exp $
+
+  17 Mar 2012; Justin Lecher <jlec@gentoo.org> -rapidsvn-0.9.6-r1.ebuild,
+  rapidsvn-0.12.0.ebuild:
+  Dropped old, fixes #313713 & 305365
 
   17 Mar 2012; Raúl Porcel <armin76@gentoo.org> rapidsvn-0.9.6-r1.ebuild,
   rapidsvn-0.12.0.ebuild:
diff --git a/dev-vcs/rapidsvn/Manifest b/dev-vcs/rapidsvn/Manifest
index 63ad7600ed31..63ca4fc79b7b 100644
--- a/dev-vcs/rapidsvn/Manifest
+++ b/dev-vcs/rapidsvn/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX rapidsvn-0.9.8-sar.patch 955 RMD160 872c2307abee59bc2b2d63866b8d72ec81600e08 SHA1 0682da8f3dcd41019c780f749b1087ba22793311 SHA256 485eca96c9d393baffec28443eb7f32fe577d9a12533c0797ca61f67380c4b0e
 AUX rapidsvn-sar.patch 931 RMD160 ba28d6ccfd86553b4963d611593812db6005ae4c SHA1 175d1609f2e9cfb7f0f6e832ee168869760b442e SHA256 0690d1c3c516e32138225ca60c74a157632eab7358f5d8cbdd374f7b5d1c5782
 AUX rapidsvn-svncpp_link.patch 304 RMD160 3d2b6f48e46e3c5e39a499589043aa09de60d8c6 SHA1 9752592941c10d71f94680ff97e925fee66bc890 SHA256 99a4690987be6f39400a737ca12762495621fc2789fed18c5d9903a8d87ae968
 DIST rapidsvn-0.12.0-1.tar.gz 1246675 RMD160 2c6e28f5b3a6450cfb8a749fc27490877ccdfa40 SHA1 b25820ee98517b2b070c9b5a3a18463607799081 SHA256 ef7d0db528ba5c660f8e8ce4dd7b6d098707b43b04932257e092a6d4ab746ac4
-DIST rapidsvn-0.9.6.tar.gz 1205771 RMD160 060a66d3f268f9a4018f01a9541df2a3394ed7b8 SHA1 266f846437e3bbce1707799ec0d95c2d1be43b4a SHA256 4e026b0e7a56b2a0ba4cd12b1ee224c8d0645e98eb5b682078220f912513b36d
-EBUILD rapidsvn-0.12.0.ebuild 2110 RMD160 0990114b965acf6df707da893c210502ae785b56 SHA1 96835354a6532526146f98d68dc842b4800d5cb8 SHA256 881dcc6c2107d7e81ff736359181282fd30390a04fafe6f7da0c8b060f7a4d6b
-EBUILD rapidsvn-0.9.6-r1.ebuild 3164 RMD160 6592239ddb32ae588bcfdc676e71d22fbf538a76 SHA1 f7f319979faeec6759b345d3e79fdd6990695b50 SHA256 045e322f3420a2647025f4febd77817625b57e6eb89fc2e49cbad3e532c5a346
-MISC ChangeLog 13383 RMD160 618642ccfab26a8d45ebc2f1bb890c8a9ccd3ca8 SHA1 e138e67c2d39d77436281caa55ab042e76979e42 SHA256 73773b3434b047c265161276bec60e1d487ca73e3bb21594518602d9e4175418
+EBUILD rapidsvn-0.12.0.ebuild 2112 RMD160 2bde01844e268edec48e1f5ca1814c479664eeff SHA1 6b5ce5516a49f2cefcd0a679a06025c3dde840f7 SHA256 e48962d9998244b9e0c7dc77c408e8ada118bbf940cbfa5e9b8b359be6290bb7
+MISC ChangeLog 13519 RMD160 e7fa7e669dedbf73a0fba9bf2d8d07edb732527e SHA1 b5de498cf1e109a195d6a2af6283037c67f19705 SHA256 5cb61e6d2bfb023e2c9704dd8a6e0e884302471d84be93368e1e61a8cac389ac
 MISC metadata.xml 613 RMD160 5bca2af37b01e39c021353be496523039f06e57a SHA1 3df23374b306edb2b6ec56c5299af42f0507ec5f SHA256 9f428d703ffd0b092ee13aa5619c2bbc70271da01a9f15cd578feb5a13d02213
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9k0tUACgkQuQc30/atMkCbeACeIhbiYQFg1l2nfseAWXX7N0Mf
-xrkAn3BQ1h9s6UC07c+1e4/iuuzFBmnJ
-=7rRo
+iEYEAREKAAYFAk9k6S0ACgkQgAnW8HDreRbqhQCgxWjvxaAipgZgZoDqM1zCj9sZ
+nTsAn1qjTZbnUX4FpnPThOSlbEY6YYPL
+=QWab
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
index 54dccba28fa1..2f584edbcef0 100644
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2012/03/17 18:07:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.8 2012/03/17 19:42:32 jlec Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ IUSE="doc static-libs"
 COMMON_DEP="
 	dev-libs/apr
 	dev-libs/apr-util
-	dev-vcs/subversion
+	<dev-vcs/subversion-1.7
 	x11-libs/wxGTK:2.8[X]"
 DEPEND="${COMMON_DEP}
 	doc? (
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.9.6-r1.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.9.6-r1.ebuild
deleted file mode 100644
index 39ae7ec76a46..000000000000
--- a/dev-vcs/rapidsvn/rapidsvn-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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.9.6-r1.ebuild,v 1.2 2012/03/17 18:07:10 armin76 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 x86"
-IUSE="doc static"
-
-COMMON_DEP=">=dev-vcs/subversion-1.4.4
-	>=net-libs/neon-0.26
-	=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...
-	epatch "${FILESDIR}/${PN}-svncpp_link.patch"
-	epatch "${FILESDIR}/${PN}-sar.patch"
-	eautoconf
-	elibtoolize
-}
-
-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="--without-xsltproc --without-doxygen --without-dot"
-	fi
-
-	if use static; then
-		myconf="${myconf} --enable-static"
-	else
-		myconf="${myconf} --disable-static --enable-shared"
-	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-neon-config=/usr/bin/neon-config \
-		--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"
-
-	doman doc/manpage/rapidsvn.1 || die "doman 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
-}