Fixed USE=test to use QuickCheck-1.* (fixes bug #316629 by Diego Elio Pettenò and others). Added package to haskell herd as well.

Package-Manager: portage-2.2.0_alpha89_p3/cvs/Linux x86_64

7 files changed, 51 insertions, 23 deletions

diff --git a/app-emulation/ganeti-htools/ChangeLog b/app-emulation/ganeti-htools/ChangeLog
index 0961fe300af3..6e4f161b94e0 100644
--- a/app-emulation/ganeti-htools/ChangeLog
+++ b/app-emulation/ganeti-htools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/ganeti-htools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ChangeLog,v 1.9 2011/03/12 19:11:19 ramereth Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ChangeLog,v 1.10 2012/03/07 17:56:06 slyfox Exp $
+
+  07 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/ganeti-htools-0.2.8-use-QC-1.patch, ganeti-htools-0.2.8.ebuild,
+  ganeti-htools-0.3.0.ebuild, ganeti-htools-0.3.1.ebuild, metadata.xml:
+  Fixed USE=test to use QuickCheck-1.* (fixes bug #316629 by Diego Elio Pettenò
+  and others). Added package to haskell herd as well.
 
 *ganeti-htools-0.3.1 (12 Mar 2011)
 
diff --git a/app-emulation/ganeti-htools/Manifest b/app-emulation/ganeti-htools/Manifest
index 2c77dd508fff..2ce215862878 100644
--- a/app-emulation/ganeti-htools/Manifest
+++ b/app-emulation/ganeti-htools/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ganeti-htools-0.2.8-use-QC-1.patch 526 RMD160 98e10beddd250b105519fea273623dc46ca45c39 SHA1 e1a901870cf27fc8e222a84f329bf5d34bea5712 SHA256 58710cc2db801194efa59ad34995584177a4476ee89b6efa51a3e5a34dfbf33c
 DIST ganeti-htools-0.2.8.tar.gz 236904 RMD160 6a074ecb3fad96370be9acf6d7f7e7841ec49c67 SHA1 04bd3785ad5ff712826f7b114031168c51f92ef9 SHA256 40574419e07353144e75211b5b524c38cd8e5335589a60ef774851f8e028596d
 DIST ganeti-htools-0.3.0.tar.gz 284839 RMD160 ea4f896bc4bf6480c9829dd3852267c0f3b1aba3 SHA1 5bc7950bb99738ca77e6e564fcf6b5ec40408cd2 SHA256 80fcd138cd21f662db226cd30b1efcc08fdaa197c56822809c1c2b58be04a32c
 DIST ganeti-htools-0.3.1.tar.gz 300261 RMD160 f2ffcbaab1c8a2984789c67ad16ef9217e073651 SHA1 6fba97ed8cdc40eb323f4eeafd9b9e33fd46ca50 SHA256 c28f3f78594e9dddd8fdc21bc37ce1f1b697d7e9d5d29f1de212705eadea1d7b
-EBUILD ganeti-htools-0.2.8.ebuild 1011 RMD160 0f0bb07d3afb3d3b236d8cd577946d19d2edfa7e SHA1 45e4f5b523a527333615b934fe904d97cdfbe4e0 SHA256 e0e7f8c1db0b7366b7b05910e8818e3ff2702d085331d09a3c5104a69a69644c
-EBUILD ganeti-htools-0.3.0.ebuild 1100 RMD160 aaba9e131f9d05d507d6b35cc925e29119c38f13 SHA1 8dcb9511675747120ece7a54fc719d62a08343d4 SHA256 dcfa1f4c13139d003ff12f84c7db864a18807e1a7084345b2ad8b300df01f0e6
-EBUILD ganeti-htools-0.3.1.ebuild 1100 RMD160 07177073bde5ccc63a52e3cfafd1e582eee16352 SHA1 2280eaad52d14da2fbe5410ef877e113bf467aef SHA256 76bceb74b398acf734fd9b798f79223adfca7b2f3ae792e5eb42362d9f67a34c
-MISC ChangeLog 1621 RMD160 28301f9496c4d2ba719b2ecd7e6105f41a1a18dd SHA1 4abe9fed6465fb2388b14eeba03fc388f569682f SHA256 e72e1fd370e8b0d5f6614a08e550cad5c9d7bfe83c33ec8c1dd7f9ff8452e540
-MISC metadata.xml 976 RMD160 68370778be364a77047e5df0399cb36eb542fca4 SHA1 e98ddb23b2e1764825505eeb7b02d3e7096f1511 SHA256 2937ca96523baef7708d2ab300a5a8cc5ceaa5c4dda69d1c61a95e5bfa064b0d
+EBUILD ganeti-htools-0.2.8.ebuild 1117 RMD160 6781464a79a114be681900521174843f1deb939e SHA1 8d05175bbd9be623595e0d1e6ea28bb04d246f22 SHA256 8047cd23787751da744a14ef49688d8fcb1a7e0629e0c8569a36b7957c2418a3
+EBUILD ganeti-htools-0.3.0.ebuild 1213 RMD160 0a47bd5bb9b22a6af646768681bb1acb0aa0cad8 SHA1 0f90f6795786c155ba01fb0451c40c175b3dc137 SHA256 b74eed07c864f9fb8b19bede1e737edaacd88e861e419ae3e1d84d453aceb429
+EBUILD ganeti-htools-0.3.1.ebuild 1213 RMD160 e84427250e8aa966deb3dd792eced177ceef42b0 SHA1 edd5553859e595f18641aafa34f4613069766948 SHA256 3abc7ee01ba43aff1b0d3b0ec54a966a93547102f5a18f871421f8b60346290a
+MISC ChangeLog 1955 RMD160 c3c96a4273440dd691efe12a5ac0449fb0297c66 SHA1 50abeb79ecc8523b0c586a9a8468a43931a2557f SHA256 8f8d24c70bd4c7cd153fd84e05c8138564451c7cec6201d392fb1101c0680ed3
+MISC metadata.xml 998 RMD160 121343f5cbac2aa4dd8ea83221b33050dc92a633 SHA1 5a20780915c98553ec60287f7ce4e04e7c2c7ca5 SHA256 4948fc22330f83a8f58fa9e857b6aa6c8ece9d45d7e96c7758dc41050f3df095
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFNe8VSQW+hXSf0t0IRApXhAKDsv3ordZ6H2qdkPL8HDJKeaRu3vwCdFZLR
-/1WExthWtDAiwNeJ8BPafCM=
-=Khk+
+iEYEARECAAYFAk9XolIACgkQcaHudmEf86p4uQCfdYnWTCEGKaKPyRwJ1nwvYA20
+iGEAn3dufaIkRz4tfwZjydjkNQX67Qht
+=v9FM
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch
new file mode 100644
index 000000000000..fd7943fe7057
--- /dev/null
+++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index 5e189fc..bfdf175 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,8 @@ $(HALLPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
+ 
+ test live-test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
+ 	-fno-warn-monomorphism-restriction -fno-warn-orphans \
+-	-fno-warn-missing-methods -fno-warn-unused-imports
++	-fno-warn-missing-methods -fno-warn-unused-imports \
++	-package $(shell ghc-pkg list | sed -n '/ QuickCheck-1./p')
+ 
+ $(DOCS) : %.html : %
+ 	rst2html -v --strict $< $@
diff --git a/app-emulation/ganeti-htools/ganeti-htools-0.2.8.ebuild b/app-emulation/ganeti-htools/ganeti-htools-0.2.8.ebuild
index 792bc8b5a336..3fbf21065f05 100644
--- a/app-emulation/ganeti-htools/ganeti-htools-0.2.8.ebuild
+++ b/app-emulation/ganeti-htools/ganeti-htools-0.2.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.2.8.ebuild,v 1.3 2011/03/07 19:00:05 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.2.8.ebuild,v 1.4 2012/03/07 17:56:06 slyfox Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="Cluster tools for fixing common allocation problems on Ganeti 2.0
 clusters."
@@ -14,7 +14,7 @@ SRC_URI="http://ganeti.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc"
+IUSE="doc test"
 
 DEPEND="dev-lang/ghc
 	dev-haskell/json
@@ -22,11 +22,13 @@ DEPEND="dev-lang/ghc
 	dev-haskell/network"
 RDEPEND="${DEPEND}
 	!>=app-emulation/ganeti-2.4"
+DEPEND+=" test? ( dev-haskell/quickcheck:1 )"
 
 src_prepare() {
 	# htools does not currently compile cleanly with ghc-6.12+, so remove this
 	# for now
 	sed -i -e "s:-Werror ::" Makefile
+	epatch "${FILESDIR}"/${P}-use-QC-1.patch #316629
 }
 
 src_compile() {
diff --git a/app-emulation/ganeti-htools/ganeti-htools-0.3.0.ebuild b/app-emulation/ganeti-htools/ganeti-htools-0.3.0.ebuild
index 1842b0430b77..f3afc23a16d9 100644
--- a/app-emulation/ganeti-htools/ganeti-htools-0.3.0.ebuild
+++ b/app-emulation/ganeti-htools/ganeti-htools-0.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.3.0.ebuild,v 1.1 2011/02/10 20:54:09 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.3.0.ebuild,v 1.2 2012/03/07 17:56:06 slyfox Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="Cluster tools for fixing common allocation problems on Ganeti 2.0
 clusters."
@@ -14,7 +14,7 @@ SRC_URI="http://ganeti.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc test"
 
 DEPEND="dev-lang/ghc
 	dev-haskell/json
@@ -23,6 +23,7 @@ DEPEND="dev-lang/ghc
 	dev-haskell/parallel"
 RDEPEND="${DEPEND}
 	!<app-emulation/ganeti-2.4"
+DEPEND+=" test? ( dev-haskell/quickcheck:1 )"
 
 src_prepare() {
 	# htools does not currently compile cleanly with ghc-6.12+, so remove this
@@ -30,6 +31,7 @@ src_prepare() {
 	sed -i -e "s:-Werror ::" Makefile
 	# Workaround to skip pandoc
 	sed -i -e "s:) man:):" Makefile
+	epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629
 }
 
 src_compile() {
diff --git a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
index 819c0a998e9e..6d66164340ae 100644
--- a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
+++ b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild,v 1.1 2011/03/12 19:11:19 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild,v 1.2 2012/03/07 17:56:06 slyfox Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="Cluster tools for fixing common allocation problems on Ganeti 2.0
 clusters."
@@ -14,7 +14,7 @@ SRC_URI="http://ganeti.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc test"
 
 DEPEND="dev-lang/ghc
 	dev-haskell/json
@@ -23,6 +23,7 @@ DEPEND="dev-lang/ghc
 	dev-haskell/parallel"
 RDEPEND="${DEPEND}
 	!<app-emulation/ganeti-2.4"
+DEPEND+=" test? ( dev-haskell/quickcheck:1 )"
 
 src_prepare() {
 	# htools does not currently compile cleanly with ghc-6.12+, so remove this
@@ -30,6 +31,7 @@ src_prepare() {
 	sed -i -e "s:-Werror ::" Makefile
 	# Workaround to skip pandoc
 	sed -i -e "s:) man:):" Makefile
+	epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629
 }
 
 src_compile() {
diff --git a/app-emulation/ganeti-htools/metadata.xml b/app-emulation/ganeti-htools/metadata.xml
index 1f2b3ed14d10..1f4a7724d89e 100644
--- a/app-emulation/ganeti-htools/metadata.xml
+++ b/app-emulation/ganeti-htools/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>virtualization</herd>
+	<herd>haskell</herd>
 	<maintainer>
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>