Tests only work when the package is already installed (bug #319571)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 28 insertions, 17 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index 6361507a889e..a54cf793e1b7 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/fish
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.63 2014/02/11 12:28:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.64 2014/02/11 12:40:06 polynomial-c Exp $
+
+  11 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> fish-2.1.0-r2.ebuild:
+  Tests only work when the package is already installed (bug #319571).
 
 *fish-2.1.0-r2 (11 Feb 2014)
 
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index f62b1ee1ff04..16a522bf230b 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -11,23 +11,23 @@ DIST fish-2.0.0.tar.gz 1540652 SHA256 7e4c4a0b3c518769a3d31b235e743de7a8d52f851a
 DIST fish-2.1.0-docdir.patch 1925 SHA256 9a6ed852cd58a9d8a24ac2c222026f1e6f6aa7bb8e515b5a1aa64414dedb81b5 SHA512 724120855bbb4cd6c9db440ff9b001a92c01a67f75c86be95fc890c52d3802f6857c27ee989f183a39aa5aace576fce72e9e36c6b7f0457f1ba4c9d6f54efb6f WHIRLPOOL ca31e6560bd36147184443b84ad96987003cfb486d14fccb74f19a88489f355814ed2ac136b4fcc14e5fb9986b069a395ef4e60aa0a30a0ce55d893499711003
 DIST fish-2.1.0.tar.gz 1707921 SHA256 af527af9d145df5675ca3031c1a87007d4f4753a1cde49da88f4eb883a1cf044 SHA512 cd8a678df948baefafbf54a14ece7b52fff6620939d82ba0d0f4cd8ad1ae59842a847231de8465a4471e48fb86866f1113bba4ec9cd6433851bb538b1f965075 WHIRLPOOL 45cf56f2711380764065963a374f7613d83f07c8c2bc7e9724c5f2bfb55720989d52dad2bba85354013de98af58c10dad64a2cbc2b6f409f997f2ed8a2720881
 EBUILD fish-2.0.0.ebuild 1666 SHA256 1d2ed69ba2580d69c1234b43505fe776bf17ad94613dac9898eb81f191cd61f0 SHA512 bb6c538042d3b23084e7688dcb469dbada3b8e60b8c29b26bd4a7f7156913e895b9f77421010cfabcd994e35ac0869f2e03f2bcb818d5022172c1b731ba65392 WHIRLPOOL f219a0f29d4ce98f9d3b91057638d84b006ad8d7acd02768bf2b1d871b8bf98d714963be4f037163029e4122f81eac55845f60c1681b4a1e57adf418e83a454a
-EBUILD fish-2.1.0-r2.ebuild 2205 SHA256 3572bdf6ef7e88f2290fcca2dfd75e7566a0e58234d41929eb63cba53d2d9ae3 SHA512 3d5de2695c6957d5730d7f744984636f2d36cad79f0f666fb1e131a7fe5809925475ffe569df3dae8f36b14d9ffa135102d4068dd641934bb693b7413ed0148e WHIRLPOOL 91c5a6eb72b9bd38dac03785a26ea3122a80188dddf22dec938796ea30e22dbb6070b40563570dd0d80f3192dbcaac8a13c7392f9b416b487259c4c634f688aa
-MISC ChangeLog 11136 SHA256 cab8a174594bf31ea967b2ace1e8dcef7be8bd430505d8f98e35c82fcdf311a7 SHA512 e82e15524fd1257b88773b4f505616f8f334eb29d85c42087fd58a772e0496d4cc4fdf2a6bdadb02fe765a9069e4bf06d58a91cb377a0b1e886802a67379623a WHIRLPOOL a5cd42b824da1cad758bf115196c54edf5bba97a6f2394f76d783c6868f041da35b11f589710e48ed6635ff1283e83f4ddabb0a1035ad3221ecffda8fb53a662
+EBUILD fish-2.1.0-r2.ebuild 2359 SHA256 0a3407a5b283ee7fb8cbdfbdf3d93dd216d8c3bc5783b2a7b33b5e0ff74195a5 SHA512 5a13f86c45bcc74027a2188235782f6794c8c8350e5160d56d9728cb5caea38c724dc13fb8d0cbb57901a6ab0b04437fc9c5e642c026da68d66d20276e8ea773 WHIRLPOOL 49b44803509e6a3fa8ecb4ce11c7f11dd4b09f3f6296b2ce02becf9e723acf6302f31463f9eb1d78dedc6b1960877c96d868ee8772a9a90bd7caf78c3cc35ec0
+MISC ChangeLog 11284 SHA256 fc0738c78616a103ab27a001fa4dd740477ab086f7052f4fb88273c3cdf15c23 SHA512 8ea5f8dfd332fc81bf931ea52c0492ea63c1c6cae002c0829e38bb755a9c4f0280129b9fd868ebb1a37def5c2e1bbccceadcf28c146705d8d16d8b88d27f2c49 WHIRLPOOL e8c5c88ec89f7f2943e47b78471b8f47033da34a7ca4a886ef8ad8caa25b82ddd50fa3083a9410ac7341b931f2f8e2f80f1be442e3353372046503f67e1c68f4
 MISC metadata.xml 237 SHA256 97e2852866e146fd242be6cddceb93aebc2b28056cdafa3ff688a0cfc97a5065 SHA512 d21eed02cc15021ad5f18c4c932afdf4d6cfbb64a243764b61914aac9e57f6089ebb9e3a37e136e5bb7bf4f28d29bba49279d52a75acc3a6f921c770213758a5 WHIRLPOOL 92462bf73803127a88d9e2a02503d36efd2b8f1c938f3f2c00145db02871ea9ce241eba371138b6ab80c4774f858250b5eba08886ff355c0f212bfbc2cda3d9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIbBAEBCAAGBQJS+hdfAAoJEPiazRVxLXTFiNEP930+NGKi9uxoI6qBQLLXg2EP
-3bdn9XLQqlVUWUPIlYtKWbXUfHP/5nq0nwqMLGFQuM9CY/ZM8XAQ4BRsDu+OpW9x
-eDZnqHDBiGjcgl4k5sqTpv0Y/l5V2AF/2ZA2TKUVAx2mWHKx7Bbhug2W8CUIuA74
-rsIOK39EpFc2xH+qZGQUpuIUDaR5THbSp9o1csK7/yn+jJ3pZQvC7rZwqZ7H+alZ
-EA4mEKg9OV76uIw8a+pm6CjCeDUkBHDPNZTgAeoXx5enGKEIyn8rYInjbHowl6hf
-2b9pOKhYSGWJ2eH18WQLeb6C3vpb14XNgZjXG3XBIgeTXwDkOTg+X/LbnUD5zc45
-wnOGkEvNa3yn2iIzOJMJWm8eDZydacWnRX8fT4pVHS9BYPe3hSgqI4943obfKAyQ
-h6kQdfyPoG/m+1wU0RZpGdPQ4cou6IRt+NYiTK7MH/WoFc3Mk9F6AxEHEmNR0A5l
-9Zl5wxBcQxG42zwPekOxDyz2v/+l4mS/MkCh17uU+Q8FnRShZI31ES/fZjWxkxg+
-xCJKE5RSJyB0Jtq5X2xRAssJAc0OKGrQaH3sitGDjRW/vhrZ3Qvdv9ge2tvlmYi0
-a7eKUL+rzLvHiCSu+XOwDYnXPKZC9bElGOfjJwcYZIoo6xh4fmQ2C5kh8Dx6GiG/
-7sHYFSzMN8UlaIfKxxk=
-=g4TT
+iQIcBAEBCAAGBQJS+honAAoJEPiazRVxLXTFVnsQAJ0dlWOK6fJOYQxO+T29VySG
++bi3Tki1KWMtul6f8m2JNR4TMPC2fpL+vRjsnf4heKRN+0ui5AaSJdQuoovaCQlF
+cfgnS/JOMBFxFV5c1Mmd7PPb6RMSRAZvysJAdYB5n2+9IrhHY0I5mJBo8/N3fnSH
+pzhoQoHBFhYJUf1y4QSxQPBe86jW4yPFFBQ4NH8KD4OiuSCTBQ7cYKgBOv55moZg
+pgx6T3dk3S/uXiMWGBXLMbrgDukvnJIzwsbc4ypR5xjs0HnSpw/g+JASO9JYdyun
+B1cTzu2oHlD8pu5wPEq3JqOPGzzI7Pf7NWYnwfJ1yX23LZe0HhS+CrgJImClZyK1
+VwE7oPtZALFG/0HQqjpmjaH7SsL0kRopMWLbkofjP5tOMKWdGpPUUpOSeepX5nHS
+qG37NolKKC/PXOEmJDqSJ98ZH+1BtBHVxUhcSb4X3hw4vuSKxBNqv2XhISSarfcS
+mUbEOF2kcU9M7UMvWQmhkGGT9rGGcCT3THitR/wyFytNWdYl1a888gDIIN+oz64+
+uLdeEcde8dmj1RSSrUivNy6X86X1fiswGL1WSf1TU+34iiFcEV2CXs3xw0QLy3eK
+hVygEbwSp9crCRPB+SJZOxUvPMKuUzTa5Whq1vh4x/3FUhYPmJ2ZJImEJ9tULlIx
+VfkmjHgw4z8fMmQJkWPa
+=+RX3
 -----END PGP SIGNATURE-----
diff --git a/app-shells/fish/fish-2.1.0-r2.ebuild b/app-shells/fish/fish-2.1.0-r2.ebuild
index 085f757a6f25..654644d265a1 100644
--- a/app-shells/fish/fish-2.1.0-r2.ebuild
+++ b/app-shells/fish/fish-2.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r2.ebuild,v 1.1 2014/02/11 12:28:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r2.ebuild,v 1.2 2014/02/11 12:40:06 polynomial-c Exp $
 
 EAPI=5
 
@@ -42,6 +42,14 @@ src_configure() {
 		--bindir="${EPREFIX}"/bin
 }
 
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		emake test
+	else
+		ewarn "The test suite only works when the package is already installed"
+	fi
+}
+
 pkg_postinst() {
 	elog "fish is now installed on your system."
 	elog "To run fish, type 'fish' in your terminal."