Version bump. Drop sparc keyword. Drop old.

(Portage version: 2.1.9.48/cvs/Linux x86_64)

6 files changed, 21 insertions, 132 deletions

diff --git a/x11-wm/xmonad-contrib/ChangeLog b/x11-wm/xmonad-contrib/ChangeLog
index c29c55e93c08..636c76b7a8b9 100644
--- a/x11-wm/xmonad-contrib/ChangeLog
+++ b/x11-wm/xmonad-contrib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/xmonad-contrib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.11 2011/04/19 13:22:16 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.12 2011/05/11 21:40:13 slyfox Exp $
+
+*xmonad-contrib-0.9.2 (11 May 2011)
+
+  11 May 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -xmonad-contrib-0.5.ebuild, -xmonad-contrib-0.6.ebuild,
+  -xmonad-contrib-0.7.ebuild, -xmonad-contrib-0.8.ebuild,
+  -xmonad-contrib-0.8.1.ebuild, +xmonad-contrib-0.9.2.ebuild:
+  Version bump. Drop sparc keyword. Drop old.
 
   19 Apr 2011; Thomas Kahle <tomka@gentoo.org> xmonad-contrib-0.9.ebuild:
   x86 stable per bug 359843
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.5.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.5.ebuild
deleted file mode 100644
index a83824cd81d5..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.5.ebuild,v 1.2 2009/08/03 10:42:27 ssuominen Exp $
-
-CABAL_FEATURES="lib profile haddock"
-CABAL_MIN_VERSION=1.2
-
-inherit haskell-cabal
-
-DESCRIPTION="Third party extentions for xmonad"
-HOMEPAGE="http://www.xmonad.org/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-haskell/mtl
-	~x11-wm/xmonad-${PV}
-	>=dev-lang/ghc-6.6"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	# -Werror is really fragile, what if ghc adds new warnings?
-	sed -i -e 's/-Werror//' "${S}/xmonad-contrib.cabal"
-}
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--flags=-use_xft"
-	cabal_src_compile
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.6.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.6.ebuild
deleted file mode 100644
index 9fb9a1f7d428..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.6.ebuild,v 1.2 2009/08/03 10:42:27 ssuominen Exp $
-
-CABAL_FEATURES="lib profile haddock"
-
-inherit haskell-cabal
-
-DESCRIPTION="Third party extentions for xmonad"
-HOMEPAGE="http://www.xmonad.org/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-haskell/mtl
-	~x11-wm/xmonad-${PV}
-	>=dev-lang/ghc-6.6
-	>=dev-haskell/x11-1.4.1
-	>=dev-haskell/cabal-1.2.1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--flags=-use_xft"
-	cabal_src_compile
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.7.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.7.ebuild
deleted file mode 100644
index 3458ade80e36..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.7.ebuild,v 1.1 2008/04/11 15:29:23 kolmodin Exp $
-
-CABAL_FEATURES="lib profile haddock"
-
-inherit haskell-cabal
-
-DESCRIPTION="Third party extentions for xmonad"
-HOMEPAGE="http://www.xmonad.org/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-IUSE=""
-
-DEPEND="dev-haskell/mtl
-	~x11-wm/xmonad-${PV}
-	>=dev-lang/ghc-6.6
-	>=dev-haskell/x11-1.4.1
-	>=dev-haskell/cabal-1.2.1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--flags=-use_xft --flags=-with_utf8"
-	cabal_src_compile
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.8.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.8.ebuild
deleted file mode 100644
index 445c04ad0e57..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.8.ebuild,v 1.1 2008/09/06 19:39:35 kolmodin Exp $
-
-CABAL_FEATURES="lib profile haddock"
-
-inherit haskell-cabal
-
-DESCRIPTION="Third party extentions for xmonad"
-HOMEPAGE="http://www.xmonad.org/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-IUSE=""
-
-DEPEND="dev-haskell/mtl
-	~x11-wm/xmonad-${PV}
-	>=dev-lang/ghc-6.6
-	>=dev-haskell/x11-1.4.1
-	>=dev-haskell/cabal-1.2.1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--flags=-use_xft --flags=-with_utf8"
-	cabal_src_compile
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.8.1.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.9.2.ebuild
index 424198f54988..040cfb56fb23 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.8.1.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.9.2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.8.1.ebuild,v 1.4 2010/02/24 17:34:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.9.2.ebuild,v 1.1 2011/05/11 21:40:13 slyfox Exp $
+
+EAPI="3"
 
 CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
+inherit haskell-cabal eutils
 
 DESCRIPTION="Third party extensions for xmonad"
 HOMEPAGE="http://xmonad.org/"
@@ -11,19 +13,18 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="xft"
 
 RDEPEND=">=dev-lang/ghc-6.6.1
 		dev-haskell/mtl
-		>=dev-haskell/x11-1.4.3
+		>=dev-haskell/x11-1.5
+		dev-haskell/utf8-string
+		xft? ( >=dev-haskell/x11-xft-0.2 )
 		~x11-wm/xmonad-${PV}"
-
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2.1"
 
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="${CABAL_CONFIGURE_FLAGS} --flags=-use_xft"
-	CABAL_CONFIGURE_FLAGS="${CABAL_CONFIGURE_FLAGS} --flags=-with_utf8"
-	cabal_src_compile
+src_configure() {
+	cabal_src_configure --flags=-testing $(cabal_flag xft use_xft)
 }