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

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

5 files changed, 52 insertions, 48 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/Manifest b/dev-vcs/qsvn/Manifest
index 59908e1b94fd..836e8786f8d9 100644
--- a/dev-vcs/qsvn/Manifest
+++ b/dev-vcs/qsvn/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qsvn-0.8.3-static-lib.patch 888 SHA256 2f6f83635846f484a9252aa806d6e25348ee0600c7963537ea3a0b8f62075b0e SHA512 8cfdab7c24c7d5085ee7159b75fa2c8f40e4e44b97124fb8e8a83742967723345fb064513f5864ddbc2f9e824d2d5e6f8ac7ddbe29f31215392ad8bec2f974d9 WHIRLPOOL 7ce05d9f019cd572f44a697d439df6135e830340b77a44040d3a44f7f6a50eaabcd50cfabc3ad89f2f8015fe560468133ec338ee15f4b2a6583dae9097642c6a
-AUX qsvn-0.8.3-tests.patch 678 SHA256 9de94e08215bbb969429b388c47bdc1a2345cd8d396f740a46aff65678d086c0 SHA512 dfd58837dfd16dfb891d11090f35aba04b72d71f7c1bc0673a6d1dbdd1610debda7b4bc68a3c3a09988409388ac1775e9f040ed212e285be8bdfbbe1beacc7d3 WHIRLPOOL 2f795520fe0e6478e4495248785f3433ba2e353e077fc5ced07d65941fb86e749adfd8c8a0f8564d0cb1c27fb2534df323eba4e550336627f949d66138e8982c
+AUX qsvn-0.8.3-tests.patch 318 SHA256 f631715de2cca2b0c199835dccebd2b5d72ad5cc74fa096f80334ae64f1adee5 SHA512 5bb246814320c7c510f6c47440d342a5970e7467edc277d9304a2228276ddc68375b8aef42be5003e9253c550953425b21599f60f5cd8099a7411685497ab222 WHIRLPOOL 8aed43bd0ce0a7b9bfa0e319a4b04296a287e5e8bd450de51c126dd14df389b44a2d012ef813454db6976bfbcf29827649b2934b338eb7318550d77a74b51c7b
 DIST qsvn-0.8.3-src.tar.gz 782750 SHA256 8396f667dc7f09de2eead056608e90febb089fc26529b7fcebe157797c320f73 SHA512 65a636ad5d24302dde30046955f71e5ce494069f268abfbe8e35707ebc6d0454e5727394cf9476d9208bb8a55cbf08d2a131376a8bb900a5c9b316b7012f70e1 WHIRLPOOL a282bfee8b034bbb6ab801262ee1390773914be5dbc582448fa32dab541103be4dc5e2d98c3e6002b98b0e9bae6de7cd9e4dbcb53d2b5846b0d04c267114db0c
-EBUILD qsvn-0.8.3.ebuild 883 SHA256 06eba9b0f458e461c84be4d55c10e5c6dc83761d2c2c65c6ae7bf79f5b7f645b SHA512 66bb74a72a86fd8bb0b5bef57e68d7c69edbc7bac2613a2c831351a5910e77206620cb1d8a9aa13da029089af72f1f4084510e8af7ae9037121b7659b8c1e4b9 WHIRLPOOL 1e0e84047c5ce2948c58a3474da111e5003f91b8b322c6625c729d4ddbd3ca4e443a0ac83c0680c31a120ab83e500a3d7b1df584718115e9ac2c28cb03e1a9fe
-MISC ChangeLog 1559 SHA256 d36028f60c19984e4d92c9cb46b869f5c9eb6ee741e7f4a4539e1222436a62e5 SHA512 03c7106c7147000cda6095cfd0ebfaec769f0bf3c9a97f6d8478a6425d9d722eec8a036dcf1266cc4d5d2a66a92b710cd5d0ba3ebd4da0ef748f6b96880b4e27 WHIRLPOOL 81aec3e4d5272ceb9c79e5ab5752726908fe8fc4b646c6671aac738dae2155c9ddadfce9e1297e3c66709afb5a61766fd5fa7e217848c50812d1340f1b3a9801
-MISC metadata.xml 156 SHA256 abf96a845f58af14cbc6e3dde143c97b5f05ddd9f3f27e6b25833642b98fb96a SHA512 c0db0a589d006ff43f36b35cf242483f8348b4a663756d2c155ffc400c4e2b1f83543628b64237424fc74fc98907f365350fb88f33be8a331c251b0e6fe9402a WHIRLPOOL 9fd6ee842bb9fe4b7485a7ebbc2a496702467a03c52e77f88f4679eadf2c38222e4767ffd4da9682a3f4a4eaf1225f9645ecd048bac35317fab970621701c027
+EBUILD qsvn-0.8.3.ebuild 823 SHA256 e710ba72ac6598f33a0b90a607dab9cba494ce7926534a9701f2399533b2d151 SHA512 5474b3231a6654de18238143fc27d624cd456b13387c0703b0d7056b07f3d116374fcd9536befebb5a24610ba6cea8c3ca2ac046fee5355fd28eed315a8c85ac WHIRLPOOL 3da9afdcb65ae0c1aea8f2a96c9c5354f6a238f15b857b81edae5aef682efe56c683bc5d613070c1b91afa0721b5d7fa67907d04619462510faa2a0a3ac37db4
+MISC ChangeLog 1759 SHA256 9b231d14b9bb2e938652fcb6117af5b67895a421c8ff93ba6e4626b830b1775a SHA512 fbf609805e4ac1923056df481c17d8a281003c344af8b845d2da136d0f0deaea79fd8bd13b4b42aa8f51622011877ee4e8f8c6e3ead1989f68a018f190e28a08 WHIRLPOOL 245539ca07d80f3c7ec88ba52326ed117eaac1223d9bf9cd4c59706f9d41ec767dc6f86aa5a2d77baf09abbeb8a4e3b7684c2ae54735a704438bd3410d7ac71b
+MISC metadata.xml 157 SHA256 94b6a379608ee8b74b175f0dfe5b2312658faf5eca74bba0787fc02c3d6859d6 SHA512 26fc63cee9c56faf4fc05312e73145581c620cb8811634624ce0ef8428b0c7eee81b31c915249395d1c27bf733dd00d149419144937f430a7097cfd9dcbb75c8 WHIRLPOOL 0fe3bed45a2a7cde3f7d0dfa253ff8796b043c6434d0856cd645541320a0d0e3411a28432dda00cff05eb5050df5f2a792fed617fb36797826611f0bc41e7b15
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQAthYAAoJEMbwO6tnXQ0s6EEH/3e/BvhDR0VKvyANr29HtQRD
+19vYPYm+JGuLe7t2KssOi/Q4fjUSuduk08r2/zC4lQTpmyNkbsDq27Fl8mWb5JgA
+8+d88t8Lqmp9/dbgjRikD3IBNTfEdNHwp9t+47nXRAGcgLAS0YUdKQ8rsywJ7kHu
+MLFxsHvtymNs8rDb7J/uEyLuFPGg7mwKrFm5RLy7fbSREvGcnx6J8XEZyLeEYk7f
+cfge1d2MQf6SAMf6BOIrnHHvN1z0PUlEO7NHBvDFUuxRYZzKVZMLYm8h/I9RAePU
+NcOKsLl6i3LQxxhy45gugNpktRBYy1dokuOrJr6irdAsCgJAwa6IHKo0VnVqBTU=
+=nx/4
+-----END PGP SIGNATURE-----
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 )