Fixed bug #305853 (-Werror failure). Propagated keywords ~alpha ~amd64-linux ~ia64 ~x86-linux ~x86-macos. Added RESTRICT=test to older ebuilds (to avoid bug #314587 poping up again).

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

6 files changed, 274 insertions, 10 deletions

diff --git a/dev-haskell/time/ChangeLog b/dev-haskell/time/ChangeLog
index bfb092851fed..8fd240e749a3 100644
--- a/dev-haskell/time/ChangeLog
+++ b/dev-haskell/time/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/time
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/ChangeLog,v 1.22 2010/07/01 19:59:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/ChangeLog,v 1.23 2010/07/11 15:45:55 slyfox Exp $
+
+  11 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> time-1.1.2.0.ebuild,
+  +files/time-1.1.2.0-remove-werror.patch, time-1.1.2.4.ebuild,
+  time-1.1.4.ebuild:
+  Fixed bug #305853 reported by Christian Axelsson <smiler@lanil.mine.nu>.
+  Propagated keywords ~alpha ~amd64-linux ~ia64 ~x86-linux ~x86-macos. Added
+  RESTRICT=test to older ebuilds (to avoid bug #314587 poping up again).
 
   01 Jul 2010; Jeroen Roovers <jer@gentoo.org> time-1.1.2.0.ebuild,
   time-1.1.2.4.ebuild:
diff --git a/dev-haskell/time/Manifest b/dev-haskell/time/Manifest
index 52ecffed66fd..874ff58f7d24 100644
--- a/dev-haskell/time/Manifest
+++ b/dev-haskell/time/Manifest
@@ -1,3 +1,4 @@
+AUX time-1.1.2.0-remove-werror.patch 7277 RMD160 fcc8a26910a4b25b69501560cf7be4dc76a1e5e0 SHA1 d3eb33fdb8830ec2a604efcb423344bb7468230c SHA256 a8f539527e2feca75c97392c08a7caadcb94f06d66cbd80fc7b57ed1068dd288
 DIST ghc-6.6-src-extralibs.tar.bz2 2015443 RMD160 63d87d02f42efc032c20de7394f3b29431fd8eed SHA1 b94974e255165703d882bb522ec44c5bdc4b0aec SHA256 1c811695d074c7560ca9bd7773523f817ccb57390044392a1ad92cf0079bea29
 DIST ghc-6.6.1-src-extralibs.tar.bz2 1928527 RMD160 1c18c85d978c4b3369132e247c823aaa90ea8530 SHA1 1398f6c35191d52410a2e066b382635dff0d8d6d SHA256 d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
 DIST time-1.1.2.0.tar.gz 51035 RMD160 8931ed32b9c2463e0f92fa3cea08cd3ffac11c7c SHA1 770dd3f2db6958860475cd765483e901b2fa647b SHA256 09d1fdcab8fb176d0001b7ffd4bee7d4bf1c77b8e5f333aff01f2ffe19c6a47e
@@ -5,8 +6,8 @@ DIST time-1.1.2.4.tar.gz 53062 RMD160 adfbe1644a2f6f67f2715504ddac13fee7299b39 S
 DIST time-1.1.4.tar.gz 53779 RMD160 b586092e23d68bc415d55bd76b569f6f51c192fd SHA1 779c6d75bd36f0c00e93f0acc87bf7e44e5bef5f SHA256 5e3fef3dfba8a6f8a05dcfc3974e1595fb86f5c032dc28fbd2ce7951f0ffac1c
 EBUILD time-1.0.ebuild 640 RMD160 eaf0219e7ec96f00e2448696136936459716a8bc SHA1 2f2ef8b1fe7e9ca97594d9b319bbe20250c7945e SHA256 35a6d6e191e4a9f4bb9dbf8022bacba4399e560a7339732c65bbd3689c7cab2d
 EBUILD time-1.1.1.ebuild 646 RMD160 ba2774059f11384d47fb6be577af8584c27558b9 SHA1 0ed7e4a7cade9f254a5d5a920e85da02b2ab2a82 SHA256 8f677c6f5a047ef7c0e9038d5edcc5d15bb1e61ec8a4daa3371337fdd94581c4
-EBUILD time-1.1.2.0.ebuild 555 RMD160 1f3aa41d759d9b4480acf66cc15790f8a33397fa SHA1 ea0a816691f76dd9587df965ab19248b5c6ac09e SHA256 832bcae1030d3c0d8a0cd6dc637a2875730d9567a3a52ea021384fde9b1d84b5
-EBUILD time-1.1.2.4.ebuild 627 RMD160 0b4c2047eb826a49161547953c202aafbc1e1e73 SHA1 8bf229cbc595d509f91c2b5ec893619905f45215 SHA256 4e13ec185e24d9aace4d95b9139881aa983078627fe9bfab21b93a8111cb482c
-EBUILD time-1.1.4.ebuild 725 RMD160 0833fd786dc75d8058d220bbee36a4b4a0a4f89d SHA1 f7da1b49c6b5dcf9116b2c2b205f4bd5519788fe SHA256 464b435b159122f4339b880f433ea2149882f51195fae868afd9e9bad8b73fc3
-MISC ChangeLog 2900 RMD160 a186d9a441b806f05f6339b6c2fecbc21737a7ab SHA1 4ee3f809ae62a4faebd622b03de33666590031ae SHA256 b8fab8c3c83ff4818c28c5605fb4e7e50443543eaae3c6a0c44ffb68614e8b82
+EBUILD time-1.1.2.0.ebuild 744 RMD160 ed6f5fdd0e7c1b3a524c2fb833d43f96d4c03490 SHA1 c5648ca7bb6659a41d815bf69430baff5042882a SHA256 aa7933c2ba2abf89dbbad5da83fac3ef94f08f3cf97caa293e7864fed463d69c
+EBUILD time-1.1.2.4.ebuild 753 RMD160 4ea76bd49f7b0aac9a04aa7faba853c854cd389c SHA1 86f2ae6099b1eebf8fcfb2a97afc6a22a51b22db SHA256 2cccdd53b119c7822a67965f4a037d53ec47bf7d01c34922304aeb723baefb1a
+EBUILD time-1.1.4.ebuild 771 RMD160 29a60d63a98a6e583f36bdffca9b2cf0c19c8f17 SHA1 bbaabb9756798a84155ea9355d512e43c9e52df1 SHA256 12aad7ded518457b251a342719d1579f25424cb61d119a7991052badfbb61176
+MISC ChangeLog 3289 RMD160 521ad5fd1db318eff59b2c63c9154d2058a02329 SHA1 99ff81a5e817bd94db1eb460de5d619a98c9db22 SHA256 a06091556cb3f64d5917556a5e29d63f578e9ec4c0bd0bbf6047182c3013eb23
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
diff --git a/dev-haskell/time/files/time-1.1.2.0-remove-werror.patch b/dev-haskell/time/files/time-1.1.2.0-remove-werror.patch
new file mode 100644
index 000000000000..8694f06e27ed
--- /dev/null
+++ b/dev-haskell/time/files/time-1.1.2.0-remove-werror.patch
@@ -0,0 +1,246 @@
+Original report: https://bugs.gentoo.org/show_bug.cgi?id=305853
+new ghc hates old '-ffi' style flags:
+> Data/Time/Clock/CTimeval.hs:1:11:
+>     Warning: -ffi is deprecated: use -XForeignFunctionInterface or pragma {-# LANGUAGE ForeignFunctionInterface #-} instead
+> <no location info>:
+> Failing due to -Werror.
+diff --git a/Data/Time.hs b/Data/Time.hs
+index 4167ec6..e55f25a 100644
+--- a/Data/Time.hs
++++ b/Data/Time.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ module Data.Time
+ (
+diff --git a/Data/Time/Calendar.hs b/Data/Time/Calendar.hs
+index 30dd9bf..9d6cf1a 100644
+--- a/Data/Time/Calendar.hs
++++ b/Data/Time/Calendar.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ module Data.Time.Calendar
+ (
+diff --git a/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
+index 4b563bf..8816e80 100644
+--- a/Data/Time/Calendar/Days.hs
++++ b/Data/Time/Calendar/Days.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Calendar.Days
+diff --git a/Data/Time/Calendar/Easter.hs b/Data/Time/Calendar/Easter.hs
+index 66283d2..dd45363 100644
+--- a/Data/Time/Calendar/Easter.hs
++++ b/Data/Time/Calendar/Easter.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ module Data.Time.Calendar.Easter
+ 	(
+diff --git a/Data/Time/Calendar/Gregorian.hs b/Data/Time/Calendar/Gregorian.hs
+index 2d3546c..52a7c43 100644
+--- a/Data/Time/Calendar/Gregorian.hs
++++ b/Data/Time/Calendar/Gregorian.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Calendar.Gregorian
+diff --git a/Data/Time/Calendar/Julian.hs b/Data/Time/Calendar/Julian.hs
+index 5b389fb..7c2ede4 100644
+--- a/Data/Time/Calendar/Julian.hs
++++ b/Data/Time/Calendar/Julian.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ module Data.Time.Calendar.Julian
+ (
+diff --git a/Data/Time/Calendar/JulianYearDay.hs b/Data/Time/Calendar/JulianYearDay.hs
+index ba10c8f..c7f38ae 100644
+--- a/Data/Time/Calendar/JulianYearDay.hs
++++ b/Data/Time/Calendar/JulianYearDay.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Calendar.JulianYearDay
+diff --git a/Data/Time/Calendar/MonthDay.hs b/Data/Time/Calendar/MonthDay.hs
+index ac0c4d3..f823cae 100644
+--- a/Data/Time/Calendar/MonthDay.hs
++++ b/Data/Time/Calendar/MonthDay.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ module Data.Time.Calendar.MonthDay
+ 	(
+diff --git a/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
+index 9dbdd96..139fbd3 100644
+--- a/Data/Time/Calendar/OrdinalDate.hs
++++ b/Data/Time/Calendar/OrdinalDate.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- | ISO 8601 Ordinal Date format
+ module Data.Time.Calendar.OrdinalDate where
+diff --git a/Data/Time/Calendar/Private.hs b/Data/Time/Calendar/Private.hs
+index f57599c..b9a6af1 100644
+--- a/Data/Time/Calendar/Private.hs
++++ b/Data/Time/Calendar/Private.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Calendar.Private where
+diff --git a/Data/Time/Calendar/WeekDate.hs b/Data/Time/Calendar/WeekDate.hs
+index 0568a32..8399cb1 100644
+--- a/Data/Time/Calendar/WeekDate.hs
++++ b/Data/Time/Calendar/WeekDate.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- | ISO 8601 Week Date format
+ module Data.Time.Calendar.WeekDate where
+diff --git a/Data/Time/Clock.hs b/Data/Time/Clock.hs
+index 5adcaaa..ec10d6e 100644
+--- a/Data/Time/Clock.hs
++++ b/Data/Time/Clock.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- | Types and functions for UTC and UT1
+ module Data.Time.Clock
+diff --git a/Data/Time/Clock/CTimeval.hs b/Data/Time/Clock/CTimeval.hs
+index 8025bdb..bc03f2f 100644
+--- a/Data/Time/Clock/CTimeval.hs
++++ b/Data/Time/Clock/CTimeval.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -ffi -Wall -Werror -cpp #-}
++{-# OPTIONS -ffi -Wall -cpp #-}
+ 
+ -- #hide
+ module Data.Time.Clock.CTimeval where
+diff --git a/Data/Time/Clock/POSIX.hs b/Data/Time/Clock/POSIX.hs
+index b877bf7..1809792 100644
+--- a/Data/Time/Clock/POSIX.hs
++++ b/Data/Time/Clock/POSIX.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror -cpp #-}
++{-# OPTIONS -Wall -cpp #-}
+ 
+ -- | POSIX time, if you need to deal with timestamps and the like.
+ -- Most people won't need this module.
+diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
+index 053c515..5fe3fff 100644
+--- a/Data/Time/Clock/Scale.hs
++++ b/Data/Time/Clock/Scale.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Clock.Scale
+diff --git a/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
+index b1c37c1..f03efeb 100644
+--- a/Data/Time/Clock/TAI.hs
++++ b/Data/Time/Clock/TAI.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- | TAI and leap-second tables for converting to UTC: most people won't need this module.
+ module Data.Time.Clock.TAI
+diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
+index 57daa6b..9b2a701 100644
+--- a/Data/Time/Clock/UTC.hs
++++ b/Data/Time/Clock/UTC.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Clock.UTC
+diff --git a/Data/Time/Clock/UTCDiff.hs b/Data/Time/Clock/UTCDiff.hs
+index 66a2a48..6e1d912 100644
+--- a/Data/Time/Clock/UTCDiff.hs
++++ b/Data/Time/Clock/UTCDiff.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Clock.UTCDiff where
+diff --git a/Data/Time/Format.hs b/Data/Time/Format.hs
+index 5e10cd1..0c4fe59 100644
+--- a/Data/Time/Format.hs
++++ b/Data/Time/Format.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ module Data.Time.Format
+ 	(
+diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
+index c4a258d..37055cb 100644
+--- a/Data/Time/Format/Parse.hs
++++ b/Data/Time/Format/Parse.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.Format.Parse 
+diff --git a/Data/Time/LocalTime.hs b/Data/Time/LocalTime.hs
+index 5676b58..9ddf942 100644
+--- a/Data/Time/LocalTime.hs
++++ b/Data/Time/LocalTime.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ module Data.Time.LocalTime
+ (
+diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
+index c902bb6..3d8b7e2 100644
+--- a/Data/Time/LocalTime/LocalTime.hs
++++ b/Data/Time/LocalTime/LocalTime.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.LocalTime.LocalTime
+diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
+index ac2de14..c9da692 100644
+--- a/Data/Time/LocalTime/TimeOfDay.hs
++++ b/Data/Time/LocalTime/TimeOfDay.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -Wall -Werror #-}
++{-# OPTIONS -Wall #-}
+ 
+ -- #hide
+ module Data.Time.LocalTime.TimeOfDay
+diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
+index d80671e..577a658 100644
+--- a/Data/Time/LocalTime/TimeZone.hs
++++ b/Data/Time/LocalTime/TimeZone.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS -ffi -Wall -Werror #-}
++{-# OPTIONS -ffi -Wall #-}
+ 
+ -- #hide
+ module Data.Time.LocalTime.TimeZone
diff --git a/dev-haskell/time/time-1.1.2.0.ebuild b/dev-haskell/time/time-1.1.2.0.ebuild
index f75130455cb5..0712286f70d6 100644
--- a/dev-haskell/time/time-1.1.2.0.ebuild
+++ b/dev-haskell/time/time-1.1.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.2.0.ebuild,v 1.5 2010/07/01 19:59:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.2.0.ebuild,v 1.6 2010/07/11 15:45:55 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 CABAL_MIN_VERSION=1.2
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="A Haskell time library."
 HOMEPAGE="http://haskell.org/ghc/"
@@ -15,4 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
 IUSE=""
 
+# upstream does not implement 'cabal test' yet
+# addresses https://bugs.gentoo.org/show_bug.cgi?id=314587
+RESTRICT="test"
+
 DEPEND=">=dev-lang/ghc-6.6"
+
+PATCHES=("${FILESDIR}/time-1.1.2.0-remove-werror.patch")
diff --git a/dev-haskell/time/time-1.1.2.4.ebuild b/dev-haskell/time/time-1.1.2.4.ebuild
index 5cd66f4be792..be16059b5566 100644
--- a/dev-haskell/time/time-1.1.2.4.ebuild
+++ b/dev-haskell/time/time-1.1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.2.4.ebuild,v 1.3 2010/07/01 19:59:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.2.4.ebuild,v 1.4 2010/07/11 15:45:55 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit haskell-cabal
@@ -14,6 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
+# upstream does not implement 'cabal test' yet
+# addresses https://bugs.gentoo.org/show_bug.cgi?id=314587
+RESTRICT="test"
+
 DEPEND=">=dev-lang/ghc-6.6.1
 		>=dev-haskell/cabal-1.6"
 
diff --git a/dev-haskell/time/time-1.1.4.ebuild b/dev-haskell/time/time-1.1.4.ebuild
index aa2b6d2675c1..23fa931eefd8 100644
--- a/dev-haskell/time/time-1.1.4.ebuild
+++ b/dev-haskell/time/time-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.4.ebuild,v 1.3 2010/06/30 17:50:04 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.4.ebuild,v 1.4 2010/07/11 15:45:55 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit haskell-cabal
@@ -11,7 +11,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 # upstream does not implement 'cabal test' yet