From ef203c2f79d85f66f00cdffb22d488aa266bdf24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 18 Feb 2013 17:02:40 +0100
Subject: [PATCH 1/2] EAPI 5 / cleanup.

---
 gx86/dev-vcs/subversion/subversion-1.7.7-r1.ebuild | 33 +++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/gx86/dev-vcs/subversion/subversion-1.7.7-r1.ebuild b/gx86/dev-vcs/subversion/subversion-1.7.7-r1.ebuild
index 8e12c2a..eeac3e0 100644
--- a/gx86/dev-vcs/subversion/subversion-1.7.7-r1.ebuild
+++ b/gx86/dev-vcs/subversion/subversion-1.7.7-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.12 2013/01/26 17:44:46 grobian Exp $
 
-EAPI="3"
+EAPI=5
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 WANT_AUTOMAKE="none"
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
 
-CDEPEND=">=dev-db/sqlite-3.4
+COMMON_DEPEND=">=dev-db/sqlite-3.4
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
@@ -35,13 +35,13 @@ CDEPEND=">=dev-db/sqlite-3.4
 	sasl? ( dev-libs/cyrus-sasl )
 	webdav-neon? ( >=net-libs/neon-0.28 )
 	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
 	kde? ( kde-base/kwalletd )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	!!<sys-apps/sandbox-1.6
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
@@ -110,6 +110,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
 		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
 		"${FILESDIR}"/${PN}-1.7.6-kwallet.patch
+	epatch_user
 
 	fperms +x build/transform_libtool_scripts.sh
 
@@ -205,7 +206,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake local-all || die "Building of core of Subversion failed"
+	emake local-all
 
 	if use ctypes-python; then
 		python_copy_sources subversion/bindings/ctypes-python
@@ -241,32 +242,32 @@ src_compile() {
 	fi
 
 	if use perl; then
-		emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
+		emake swig-pl
 	fi
 
 	if use ruby; then
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
+		emake swig-rb
 	fi
 
 	if use java; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
 	fi
 
 	if use extras; then
-		emake tools || die "Building of tools failed"
+		emake tools
 	fi
 
 	if use doc; then
 		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
 
 		if use java; then
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
+			emake doc-javahl
 		fi
 	fi
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
+	emake -j1 DESTDIR="${D}" local-install
 
 	if use ctypes-python; then
 		ctypes_python_bindings_installation() {
@@ -302,17 +303,17 @@ src_install() {
 	fi
 
 	if use perl; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
 		fixlocalpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
+		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
 	fi
 
 	if use ruby; then
-		emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
+		emake DESTDIR="${D}" install-swig-rb
 	fi
 
 	if use java; then
-		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
+		emake DESTDIR="${D}" install-javahl
 		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
 		java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
 		rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
@@ -373,7 +374,7 @@ EOF
 	fi
 
 	if use doc; then
-		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
+		dohtml -r doc/doxygen/html/*
 
 		if use java; then
 			java-pkg_dojavadoc doc/javadoc
-- 
1.8.1.2