Migrate to EAPI 4. Add missing dependencies. Avoid building useless tests.

(Portage version: 2.1.11.5/cvs/Linux x86_64)

4 files changed, 34 insertions, 44 deletions

diff --git a/dev-vcs/qsvn/ChangeLog b/dev-vcs/qsvn/ChangeLog
index 99ed99d87024..1f3b4338e955 100644
--- a/dev-vcs/qsvn/ChangeLog
+++ b/dev-vcs/qsvn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/qsvn
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qsvn/ChangeLog,v 1.5 2011/06/13 15:05:25 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qsvn/ChangeLog,v 1.6 2012/07/15 14:49:00 kensington Exp $
+
+  15 Jul 2012; Michael Palimaka <kensington@gentoo.org>
+  files/qsvn-0.8.3-tests.patch, metadata.xml, qsvn-0.8.3.ebuild:
+  Migrate to EAPI 4. Add missing dependencies. Avoid building useless tests.
 
   13 Jun 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Remove myself from metadata.xml
@@ -36,4 +40,3 @@
   Toth
   <sim0n@trypill.org>, Thomas Beinicke <merlin@liao.homelinux.org>, Vladimir
   <vovan888@gmail.com> for the initial ebuilds
-
diff --git a/dev-vcs/qsvn/files/qsvn-0.8.3-tests.patch b/dev-vcs/qsvn/files/qsvn-0.8.3-tests.patch
index 1300a82ec484..eb7a45291af6 100644
--- a/dev-vcs/qsvn/files/qsvn-0.8.3-tests.patch
+++ b/dev-vcs/qsvn/files/qsvn-0.8.3-tests.patch
@@ -1,22 +1,12 @@
-diff --git a/src/tests/simpletest.cpp b/src/tests/simpletest.cpp
-index c743682..5918cc4 100644
---- a/src/tests/simpletest.cpp
-+++ b/src/tests/simpletest.cpp
-@@ -14,5 +14,5 @@ void SimpleTest::testOne()
- 	QCOMPARE(str.toUpper(), QString("HELLO"));
- }
- 
--QTEST_MAIN(SimpleTest)
-+QTEST_APPLESS_MAIN(SimpleTest)
- #include "simpletest.moc"
-diff --git a/src/tests/simpletest2.cpp b/src/tests/simpletest2.cpp
-index 5ee13c1..98ac83e 100644
---- a/src/tests/simpletest2.cpp
-+++ b/src/tests/simpletest2.cpp
-@@ -14,5 +14,5 @@ void SimpleTest2::testOne()
- 	QCOMPARE(str.toUpper(), QString("HELLO"));
- }
- 
--QTEST_MAIN(SimpleTest2)
-+QTEST_APPLESS_MAIN(SimpleTest2)
- #include "simpletest2.moc"
+The included tests are simple, "hello world" style tests
+that do not actually test this package.
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -187,7 +187,3 @@
+                             /dVcInstallDir=$ENV{VCINSTALLDIR}
+                        )
+ ENDIF (WIN32)
+-
+-# Unit-Tests
+-ENABLE_TESTING()
+-ADD_SUBDIRECTORY(tests)
diff --git a/dev-vcs/qsvn/metadata.xml b/dev-vcs/qsvn/metadata.xml
index 46f151f3da59..c4db62280a40 100644
--- a/dev-vcs/qsvn/metadata.xml
+++ b/dev-vcs/qsvn/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
 </pkgmetadata>
 
diff --git a/dev-vcs/qsvn/qsvn-0.8.3.ebuild b/dev-vcs/qsvn/qsvn-0.8.3.ebuild
index 4d01ae9f3bec..10b7a3d6a949 100644
--- a/dev-vcs/qsvn/qsvn-0.8.3.ebuild
+++ b/dev-vcs/qsvn/qsvn-0.8.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 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/qsvn/qsvn-0.8.3.ebuild,v 1.4 2010/06/22 18:50:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qsvn/qsvn-0.8.3.ebuild,v 1.5 2012/07/15 14:49:00 kensington Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="GUI frontend to the Subversion revision system"
 HOMEPAGE="http://www.anrichter.net/projects/qsvn/"
@@ -15,23 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/qt-gui:4[qt3support]
+DEPEND="dev-libs/apr
+	dev-libs/apr-util
+	dev-vcs/subversion
+	x11-libs/qt-core:4[qt3support]
+	x11-libs/qt-gui:4[qt3support]
 	x11-libs/qt-sql:4[sqlite]
 	dev-vcs/subversion"
-DEPEND="${RDEPEND}
-	x11-libs/qt-test"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}/src
 
-PATCHES=( "${FILESDIR}/${P}-tests.patch"
-		"${FILESDIR}/${P}-static-lib.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-static-lib.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
 
-#src_prepare() {
-#	epatch "${FILESDIR}/${P}-tests.patch"
-#	epatch "
-#}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ../{ChangeLog,README} || die
-}
+DOCS=( ../ChangeLog ../README )