Removed intermediate.

(Portage version: 2.2.0_alpha149_p1/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

7 files changed, 7 insertions, 229 deletions

diff --git a/app-admin/haskell-updater/ChangeLog b/app-admin/haskell-updater/ChangeLog
index 05f31652c0bd..ef59b8ed4323 100644
--- a/app-admin/haskell-updater/ChangeLog
+++ b/app-admin/haskell-updater/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/haskell-updater
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.39 2012/10/18 18:36:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.40 2012/12/22 20:56:53 slyfox Exp $
+
+  22 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/haskell-updater-1.2.0.5-ghc-7.5.patch, -haskell-updater-1.1.0.0.ebuild,
+  -haskell-updater-1.1.3.0.ebuild, -haskell-updater-1.2.0.5.ebuild,
+  -haskell-updater-1.2.0.6.ebuild, -haskell-updater-1.2.0.7.ebuild:
+  Removed intermediate.
 
 *haskell-updater-1.2.0.8 (18 Oct 2012)
 
diff --git a/app-admin/haskell-updater/files/haskell-updater-1.2.0.5-ghc-7.5.patch b/app-admin/haskell-updater/files/haskell-updater-1.2.0.5-ghc-7.5.patch
deleted file mode 100644
index adc7e5c72f78..000000000000
--- a/app-admin/haskell-updater/files/haskell-updater-1.2.0.5-ghc-7.5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- haskell-updater-1.2.0.5-orig/Distribution/Gentoo/PkgManager.hs	2012-02-12 07:08:49.000000000 +1100
-+++ haskell-updater-1.2.0.5/Distribution/Gentoo/PkgManager.hs	2012-06-29 22:06:38.858341358 +1000
-@@ -26,7 +26,7 @@
- import Data.Maybe(mapMaybe, fromMaybe)
- import qualified Data.Map as M
- import Data.Map(Map)
--import System.IO.Error(try)
-+import Control.Exception(try, SomeException)
- import System.Environment(getEnv)
- 
- -- -----------------------------------------------------------------------------
-@@ -48,7 +48,7 @@
- --   "portage".  Note that even if that environment variable is
- --   defined, if it is unknown then it won't be used.
- defaultPM :: IO PkgManager
--defaultPM = do eDPM <- try $ getEnv "PACKAGE_MANAGER"
-+defaultPM = do eDPM <- (try $ getEnv "PACKAGE_MANAGER") :: IO (Either SomeException String)
-                let dPM = either (const defaultPMName) id eDPM
-                    mPM = dPM `M.lookup` pmNameMap
-                return $ fromMaybe knownDef mPM
diff --git a/app-admin/haskell-updater/haskell-updater-1.1.0.0.ebuild b/app-admin/haskell-updater/haskell-updater-1.1.0.0.ebuild
deleted file mode 100644
index c65b373ffceb..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.1.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.1.0.0.ebuild,v 1.13 2012/09/12 14:33:00 qnikst Exp $
-
-CABAL_FEATURES="bin nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" # Add keywords as those archs have a binpkg
-IUSE=""
-
-DEPEND="=dev-lang/ghc-6.12*"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--bindir=/usr/sbin"
-
-	cabal_src_compile
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.1.3.0.ebuild b/app-admin/haskell-updater/haskell-updater-1.1.3.0.ebuild
deleted file mode 100644
index 96a99f6d1a9c..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.1.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.1.3.0.ebuild,v 1.2 2012/09/12 14:33:00 qnikst Exp $
-
-CABAL_FEATURES="bin nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # Add keywords as those archs have a binpkg
-IUSE=""
-
-DEPEND="=dev-lang/ghc-6.12*"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--bindir=/usr/sbin"
-
-	cabal_src_compile
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.5.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.5.ebuild
deleted file mode 100644
index e5aca49d9e72..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.5.ebuild,v 1.6 2012/09/12 14:33:00 qnikst Exp $
-
-EAPI="3"
-
-CABAL_FEATURES="bin nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-		    "${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-		    "${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure --bindir="${EPREFIX}/usr/sbin"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild
deleted file mode 100644
index 526e8afc09ca..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild,v 1.3 2012/09/12 14:33:00 qnikst Exp $
-
-EAPI=4
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-	epatch "${FILESDIR}/${PN}-1.2.0.5-ghc-7.5.patch"
-	sed -e 's@Cabal >= 1.8 && < 1.15@Cabal >= 1.8 \&\& < 1.16@' \
-		-e 's@containers < 0.5@containers < 0.6@' \
-		-i "${S}/${PN}.cabal" || die "Could not loosen dependencies"
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.7.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.7.ebuild
deleted file mode 100644
index 798a415f0a2c..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.7.ebuild,v 1.2 2012/09/12 14:33:00 qnikst Exp $
-
-EAPI=4
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}