dev-vcs/git-cola: Block test if domain name is unset, #497876

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 44 insertions, 23 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 20366110f08c..9cb3259aae17 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.18 2014/01/15 12:00:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.19 2014/01/19 19:04:32 jlec Exp $
+
+  19 Jan 2014; Justin Lecher <jlec@gentoo.org> git-cola-1.9.1.ebuild,
+  git-cola-1.9.3.ebuild:
+  Block test if domain name is unset, #497876
 
 *git-cola-1.9.3 (15 Jan 2014)
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index f334109752d7..4b6e7f69b9e3 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -15,24 +15,24 @@ DIST git-cola-1.9.3.tar.gz 424299 SHA256 cdfa27bf46bcb53e566cc1eebb205ddd287b7c4
 EBUILD git-cola-1.8.2.ebuild 2198 SHA256 ad11298dfad2ed771e138db229315b7e1e9fbc5c3ef47e5fb44f6f1d741da28c SHA512 c8edde9f4c6ed8eece606ac2106a1bc61812a3aba742763e6174fba90bdac611a00c85df30602b7fe52ea4cc07f57eed9d4cd19502e21fc50a7b6a6c3a135dda WHIRLPOOL c6679a20d7c2c99d5f58fd2dd30b2803ae5bdaf0e43224ea7f14c5ae605b7179fad4b22a3f0ec43b6b847474306ab582b2b79d73d8233b7108ec3b055394aaf2
 EBUILD git-cola-1.8.3.ebuild 2201 SHA256 a5c2744d4b8c368a1fe13034e6280ff86b55d6cffb36cceec008702d9c84ffad SHA512 8a2e166e8c2069d3110955b4c7064bad72280392bcc032aaf7a3f7871537fe3d61746b9734ac23d2bd27064adbe5e9335756c9af0bbff5ab64977c1a3a99401d WHIRLPOOL 1436b87c29057066c3812932d3a23172b853e4d828a1940e2f5f7fc848bd0b178eb85ffb73d010d5c35e48f94a0aed7b80fd296abcd8ae92e0fefc8fe562abff
 EBUILD git-cola-1.8.5.ebuild 2247 SHA256 952a9e2d7a101410b75e14405503bbe84da1662f933d8b577d2d43ff49a0e63e SHA512 635d833bc4fd06d76108dd382683a0ff11b04f1fc17f18c8ef379eb47eb135c9b043df321219d14e266fec68ce9b0540e7ae0aeaaf1836bd7e87014fe362f848 WHIRLPOOL 1146720c543e29a03be3e4ed3cbe43c58f34a4f74e2778fdbfe5341409a857c159de502b903e133bbbb020775e5dea56644e2822dba8f4df3195d414ff93dbd0
-EBUILD git-cola-1.9.1.ebuild 2285 SHA256 97bb6950da15e9aa26f50aebd638e2ea535feff6beb79df79807f0a9e33c3c0d SHA512 093cc81c1073adcc05e26d73e3d14394dda42d7fd8f16db9ab330a192001f7d3b0bc2b8a3208972c992762269f7c1ddccb01fd19b01b2bc3eedfbbc7cf90a7de WHIRLPOOL bd7e8e8d674f028844f8ec842a44ee938a2e3560992adae1280bad07a37a1f40b7bc937a4663c44f4632cc6fc1792b153c30dbdc2e2df0c91533e8fcdd5102a0
-EBUILD git-cola-1.9.3.ebuild 2286 SHA256 bc6a3e64ad9c6f6ebc90cb57e351d5c50d10c862153014d1c77673cbe0675b0e SHA512 364b72cfc71e374a7da894fb633a37c98fba92a8e1079b657269d2bb25cec7f2943e4b47ee8869820aaf71be1080b78a8b04573c66474560d9e624fe3f32d6a5 WHIRLPOOL 58adb580cec938b65ab9e429e321ac729c09ea2e3bf946919eb06712b824adb9d14c3c2bc33adf54ac68248d7f1956291c3b28f7288a2adf5c3492af4e0956a5
-MISC ChangeLog 6259 SHA256 cf6760c7197e1d5d51e416c804159f666745d307913677ccf7501c229adf2b97 SHA512 7e510207b571cb1555f28ed20e96f0888f7e1714c1a0d752703ba225fa3cefbad1723c00333a166f42d697fec8f20d234137a7c050e073a80c7490c6323e1751 WHIRLPOOL 9b0ec9c95105ee927a7bc2ca5ee6f8b5ddf0f29394c910023a24f95b176786950048eec67ab1eeb4f827a505f6bf725ccb96db88f870ca52407dbe6e4c0709ca
+EBUILD git-cola-1.9.1.ebuild 2424 SHA256 9d6b15f099047bc093305b3bf9aee8cb8eb2cbb3655da613e5d58a9658b47480 SHA512 e2ed343d10e44dab9cd6b3ec6dd3879fc42af748e2b75ffb114f4ff33d8db76eb4460846522bd5f8fa4221ff749f809aa0704f8c2683eacc61a564814f8af3cf WHIRLPOOL 9cda07fb5540cc341de3c89cf5b76341751d83c7f42af33ec5e6afffcedc044b6ddef8e6fd6decfc82447d44f64307e1ef448abdb163637fc0333e5f0107a6be
+EBUILD git-cola-1.9.3.ebuild 2426 SHA256 88210656f2cbfd39a181e3de43bf1d0a44238c08b9a9b6f2fc61bbc594499d76 SHA512 916a82a2c7ec354589d80ef7a418efae6e702ea3c881a39edb6a8ba8f82b7d188bda295b294e5810e30792cb83e2e560ed7b91c5fc034e24f4a7484b164cdd30 WHIRLPOOL 1841250c33dd151f01e8b317dd7e59a791e88b170fd13e523237971821891a00c59c1c31d12ffccc8f5849adb8c64c22ec6beb3e8ab4cb845211def081a2b78c
+MISC ChangeLog 6401 SHA256 2428538128dfdb28fbb696c3d4e546a63bdf43a31f3c2e657b6651224dbddf5a SHA512 e7dd85f3c5f91a5b9c3e1ed2b3d99d084bd73948c22d68afe398c313b6643b9d39c52ca1c043539a4d2f4c5f91b86e684dc90be5230ea83bb7081187221f2b34 WHIRLPOOL 4fee55cd0ad21f39162bd6e8eedb978bba8dde80635126141fd76418a3bd07df9b2809fafa904c81f854948de69b26be27a568471c7b79d8721ac5b9e489fe74
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS1nhUAAoJELnU8jG9FVirMr0P/R2Xmao2AHX7rWrFie2xWsg1
-8mdq7W7vtYa6oBPmTm117AeH7Hz3hPe0NpjLX4qu2qckgXZuGMysBlo3abkxIzij
-uFP7cfX1mDp62AhyST9/konGiqF009NKlh4EkeSpGz6yqOXEbGf40WXmNECAGrtB
-QghZ2DrDssq7kzqTe6BeKkSgnO8jtHxxFqzByP80eVa1wQ87l7Gk9RQb7OfSssYu
-GYeAzX3Bh4HBrXHvAOZOhxuFt2LL7nw3UkLB5ykF60KIoUTt4QptvIRfomRXfn+l
-ATVjqxd3aZ9MQGWmKBTEvMKj4zUZpXJHGR2Pj3+EgaKelaX0E+QxWo3mrE/POAi7
-M3bmNQ1lccHb3OJhyivbyVHZ0hCO4CDTlboHH1I1gxgY61djxqug5rtq5l5OBigS
-NQG7OHOw8JElS/lFCnpqtbVdOWsUfV/VfhirKdp9n+vw4SHAhai1koCQp1Q5aPqE
-tLkrOZgLRdnCq+uVk67CKKNPU+U+3bzDIwqhWBXldlXuPIMtANKgAEg/fOHLKp5l
-2F8TGfj/u2l+9MXToR1bySw4RFAHo4pifOopZxw9GL70dx7eIm/grld08aPZLDeC
-LXFrQSmYNBwbKkDHDYqAoKDNsWkgGivmyfAiP/yAEodB9EMtPSNDSsixkVLZUG9G
-lBvPpHXloGf0UkyIDbS+
-=V1Y5
+iQIcBAEBCgAGBQJS3CG/AAoJELnU8jG9FVirM+kQAJkzsn30Q9ToJ3fKwBkANp2S
+OzZRbvp9BBgIeOOhZbYOgF7sAV8iBDZDwVm9wAiL+LRmA18meWUu6JbbdxxELiu1
+l1NdRkNpM93xgLyMlF2T6V1cY4nOdxuaFMDErfhqVwkcAETnHQCV7fpXVcsH7c3P
+V11V3R60vK5vH6avRleayI9mYRHnOFaLav0mf8hSDSzkewyrCcN37pSg3fkkm+b0
+nW3CrtmCablLpaphUo9z7VFgQ2D1MznFFbqoQuY0Ah7p0T9z/iw4hNnk5fHcZmBg
+xMku4/TO8Kh0ZA0K09yk9jWb/axiuQLS5d4UAPZMlX1T8oc8+qNRTKoNQ5AqvkIW
+hQl4MXbp8Huu/0zwl3iqf2MUL+EE+au+fFkgGeZa4VKuK+/Pv/EguV26mniQh9gi
+YI4QHbsPH/QLtLxYnkH9TGJUUCvyF24UB3s+tfTiEfP9NNmVZcsElcpbkPDcwEKx
+Oy6If0eAKK28YfVHo9mr8S+B3MU81p2jFf5Pgr6vKQUQgfSTkOjHoojZkBYFbKc5
+qo1FYyyp1tYD3GJsiscNGk6ip8KFTA/h/I/Iycpj8LWNnay9CEd619AwtUn3Wv5r
+HoApmQQ/fzEFicEUIqMCFc57zVYynYVQKBm6d8X2hUcYM1amMZ2ahayvO1154VYP
+zADIt2vkD1mSxDzSDeka
+=R7Oi
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-1.9.1.ebuild b/dev-vcs/git-cola/git-cola-1.9.1.ebuild
index 3f36e758109b..b6a42c0f8436 100644
--- a/dev-vcs/git-cola/git-cola-1.9.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-1.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.9.1.ebuild,v 1.1 2013/11/07 16:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.9.1.ebuild,v 1.2 2014/01/19 19:04:32 jlec Exp $
 
 EAPI=5
 
@@ -26,15 +26,23 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-text/asciidoc
 	app-text/xmlto
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	sys-devel/gettext
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		sys-apps/net-tools
+		)"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-disable-tests.patch
 	"${FILESDIR}"/${P}-system-ssh-askpass.patch
 	)
 
+pkg_pretend() {
+	if use test && [[ -z "$(hostname -d)" ]] ; then
+		die "Test will fail if no domain is set"
+	fi
+}
 python_prepare_all() {
 	rm share/git-cola/bin/*askpass* || die
 
diff --git a/dev-vcs/git-cola/git-cola-1.9.3.ebuild b/dev-vcs/git-cola/git-cola-1.9.3.ebuild
index fca042ad2977..c707607c28b6 100644
--- a/dev-vcs/git-cola/git-cola-1.9.3.ebuild
+++ b/dev-vcs/git-cola/git-cola-1.9.3.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/dev-vcs/git-cola/git-cola-1.9.3.ebuild,v 1.1 2014/01/15 12:00:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.9.3.ebuild,v 1.2 2014/01/19 19:04:32 jlec Exp $
 
 EAPI=5
 
@@ -28,13 +28,22 @@ DEPEND="${RDEPEND}
 	app-text/xmlto
 	sys-devel/gettext
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		sys-apps/net-tools
+		)"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-tests.patch
 	"${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch
 	)
 
+pkg_pretend() {
+	if use test && [[ -z "$(hostname -d)" ]] ; then
+		die "Test will fail if no domain is set"
+	fi
+}
+
 python_prepare_all() {
 	rm share/git-cola/bin/*askpass* || die