Removed old.

Package-Manager: portage-2.2.0_alpha149_p11/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 10 insertions, 170 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 86b7f39667c1..616b30d58427 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/haddock
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.95 2012/11/18 13:42:07 gienah Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.96 2013/01/01 18:49:17 slyfox Exp $
+
+  01 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/haddock-2.4.2-Setup.hs, -haddock-2.4.2.ebuild:
+  Removed old.
 
 *haddock-2.13.1 (18 Nov 2012)
 
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index deae4f9538bd..ea6f9d14108c 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -6,27 +6,23 @@ AUX haddock-2.10.0-dont-crash-on-unicode-strings-in-doc-comments.patch 942 SHA25
 AUX haddock-2.10.0-drop-tools.patch 744 SHA256 905de70488ee2ce800b541fe97b7f906b5a7d239f275aaf914a1b39483718b10 SHA512 9e4f3216f4bd5c0b5b84c16967cc0c1f132b6c92ceeb087914f076aebb97d466e671aa28281f2a4750ad9d479b0edd6ae5f1505fbef4c18bc14ecc2234d6dc71 WHIRLPOOL 7e4441793388a1ccbf52634587586d049348f029495db18691056b3745f848148ffad871a9192a127809b6bddb39e5ba035375c1a39db7e32fb2d2aa30f8863f
 AUX haddock-2.10.0-ticket-202.patch 1097 SHA256 16b53d90ba70e8e31e6d76396aaa0cd3bd6e024e0d38210976a69601f54b94c5 SHA512 4a47182f61ac3f590c8b4b255d704f20b6755fca4a716ff1ad5562000d7ca0e811b261134d67ff3a8f22a2dacaeb9ab866dfd9dc0c2f1ec0cca1515c70348f11 WHIRLPOOL 4ecaa44ee3c8a04bc70546360e0f124c61fc3ffde4425c52f35eb8222c767e2d0ae1b5389c3ba5881081910e7826b381e72ea5866ae2b5d90ff64dcaa744da3c
 AUX haddock-2.13.1-drop-tools.patch 438 SHA256 1e7793379ff7f2b3aedc22ee133af38cc43dacf55a5efcd795fb7da3a4d0e42b SHA512 20ddff14af8e977728dfde6b6e3f5922e3805b4b216bf0aff25ceffcc06ba6b7de5049b0ee957e0ef223888c814e46555d5f059a3023805e249fadfad541bdc7 WHIRLPOOL f75ba9209968f1e71ac03da056bd9e1a00cf4c529c899431e9b872c18fbfdcbbaf6b612940cac682f320afd375a3e877ba3e871e99482749e4a7bdc1c91e775e
-AUX haddock-2.4.2-Setup.hs 3200 SHA256 a9dd6ebc855781897d0357450859202ce553574f9cec0c5cda381c343ce1eb09 SHA512 b44b9866eafe2b779f42ceaa22901caf02150a75069d4a7a94fa11a1c74a62ac08a8338c622cceaa6ad061eb6b163bb1f503f09650f517df1a4326bdb14d30d2 WHIRLPOOL 3f2f67942728d8f4780023b48cf91b515870d8d646a6caf2ccf7118e9943b98983d618d4977c80033f76ac8b7889758005678d4b7f1688491e370da96f51ee34
 AUX haddock-2.6.1-cabal-1.8.patch 292 SHA256 a7bb8cf4c4b41e9be8efc0ad870cb29932ab7cfef6a1011d2c72d4f342b87fd8 SHA512 cddd28187aac863244b6d651e6dfdcdade61cf45473c98ee50f8f9c1f667fa2a4bd0d22056fab62f0fa512296477529b61f6eadd194b55729c6e1c3b215f7bcc WHIRLPOOL 7918a3eaf0055532abf1aff8e3c0812d0522b69106995657e168f9807224fde82630d23168d0563831fa8f457e1ba34e07a5af2a4bab8c3662becb9e6c0f6211
 AUX haddock-2.9.2-cabal-1.10.patch 305 SHA256 31eaf2bbaf838ca8e8b98bc52c26282bb689fbbecab4d8064338aafc1b500f55 SHA512 d620d386d5e417a46b4dc370723a89f26234bc2319ef51f661ac83ed57b72fe921b1deec65a3c723bff788ac7d64712c0272ed3b2d76291f05295061f285923a WHIRLPOOL ab33f13cc4e579c967458b43051e45bbeab948526f3f803076fe7b188224f9ac74b680a9d3d9adbd68547d7558664a1f2926b81d5c9d3f49b32d501e303e683f
-DIST ghc-paths-0.1.0.5.tar.gz 2304 SHA256 ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10 SHA512 3b80f8bff371c1354bc8b48c7b2b170d2862be7688481d38a76b43508be5e1c4fe6c3aa027e5315573214663568bce00857ea8375561717ae04b355e9c9bcc83 WHIRLPOOL a3364739e01567e07b29b048612ef4101b6509cc5ac0d39b22d6a7506262e1e23c4c541e75e3ce634db22efc5f0b5b1d02b2561e27cc12fa74be25f0cccc6f4b
 DIST haddock-2.10.0.tar.gz 159750 SHA256 d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410 SHA512 0680ffafce7a2e6a24ae85869694ea5c590305007da07cdffd6adb8a837164452cdf2de159c9fdcba059f76fc01f30771237dbcd71dd44d04afc0d2317e28563 WHIRLPOOL b584452acbe6e1c3474c97a62b17621e1ce0ef31574845499ca8b6ebdcf54559fed2b37d1890b80b1d526cc9b45d52b51a9acf6ae0d9472e15f93c1a7ff7ef3f
 DIST haddock-2.13.1.tar.gz 176831 SHA256 6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f SHA512 2cff54f4a3676c605327a6ad926df51976e7ec2bd512e464d0bf84d24f29fa3078dd5f8006329a4a6913607717c2c45f1db2b63d9e9f655d64cbbe92e0fe35fc WHIRLPOOL d1d9202767f4d5ee68ed100f3b95c9be6bff5024b3155b3dbaf3d1d690ac9dc0be2841ef1ea960c095a30005dc2bbb16046dbc4827c6047ee50ad6b1671ae38f
-DIST haddock-2.4.2.tar.gz 103033 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547 SHA512 e2fac40070ad7a3bdb94b7f55321cfc9f283f1d281a3315c74790ccb70ada5ef2883e194b34130c2fd0e437a15884703b0f339953216c0499b27621892e05201 WHIRLPOOL f4b723d8610a60a2e7bcb1250ab279dddb9b298731933630b9ac499d0cbc18c9a111f22931786ed9e3f84083426138bd625b4171b11ff0f32009924466306deb
 DIST haddock-2.6.1.tar.gz 128158 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a SHA512 afa2c1166448f313b3031718caa25e4507b3b773dfd3af3b029ce58c3d8e0fde44f823206dac1219f61ac84589ac580cade688470abd7f53fac677caab0abff0 WHIRLPOOL e719061a8f66fec8273e59d4a99f105710d3ff2f150dae4086bac4b8fc9f365a597876669ebffbb975b9b00639bbe4645f743961de26f0b102cf4485fb00c555
 DIST haddock-2.9.2.tar.gz 154040 SHA256 e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1 SHA512 a3f223a11ec8d538d0d35fcb717445c2f532e47e687bb72150040592fe9f99f90d8224fca786891f3a9191cff9b8ce2ad42388cfd46a07abad5734b126891a51 WHIRLPOOL 181707ffd3dae0d329bae77e1a0c3a3f602925e0fe1d3cfaaaf69ac9e3e828dae0f0264291b497f4fc66aff37ec1ddeeee9f0f63170aad0799b064d157f27d3a
 EBUILD haddock-2.10.0-r2.ebuild 2600 SHA256 53ab7de407395e9eb334ed974f55b2c52d0ec1a5ad0de27bfef4031b875948df SHA512 3ce19fd2930f9bb121842366ac777a878a033f00d48f7e2b868b50aa5c353a4e958ad26547b9d79885dd3f1804851aa1e2058bcc790e9cdb049ecdefb17c2333 WHIRLPOOL 539d8b269000b27957c82ad0b5a1790c760e9d668afe92e1d9532cb40c14bfdd8ff900eb9a06267de4d18914c2ad74cbc0bf2891df6601578296ec823d720408
 EBUILD haddock-2.10.0.ebuild 2216 SHA256 ca38c202163d2521081108005b787fdb1f708b9c3e97fc60960feb0ea567f85d SHA512 2968c34604302f73769a9b44e7de14fba80519c5445ccfb0a00e626443192d0ab36a81e763a61024e1617d578e802a6cbfbd59c0d8a044c8a1711db679f4acde WHIRLPOOL f2b9b0f170e309fc8f8192420a268f34fdfaf7e8037fe8a3e358355ae37107a46ce16bffd360f819d94a522d34d6b67b3f6273a31e36a6c9f6003db3041b424a
 EBUILD haddock-2.13.1.ebuild 2060 SHA256 f361aed253c5ac3266d9883866b36a774d3b73032371d506065a8fe39bcdaf8b SHA512 2f5ac474800899f8434cb78bfc37020d0790aafdd12d3901754e703b60f74eaf627ad4ffe51181653336c6a79fd9706b573c61fb750bfdb90be054abe7739a9f WHIRLPOOL 5afb367571d847ee814bd82f9aeb853f01cefa566081a801ce1350326d6cd0769fbfa762e92f7cc981e41cf749e4f82c2a67aa9cca7eb5856dd32f082e5e60bf
-EBUILD haddock-2.4.2.ebuild 2405 SHA256 175f3bf67cb042486e1ec9840f54444181d59af9d9a74a4f87ac4425293191b4 SHA512 f1daf247367dea3053d7a74d2120d8badec91697644156f545ca92ba809d95e714fd6fca5a9d5508d576ff7e0ff9d98a453df9e7bab9c656744e343b82a48576 WHIRLPOOL da285f3ba824d666f1bb23182d96f2f11787ad53cff83ab522b5141af46a4e4f9b9361f99bedc2e5da99a0f5efd3b61ddd457e656774174f41a500ae2c1a5b94
 EBUILD haddock-2.6.1.ebuild 2545 SHA256 387f3e7feeb036716e5432d793061f3c4a9a792818dfcec8c14ba31511456922 SHA512 304b2c50bf77bec262a0cbd69b4d1787871b84562bf34cc1a155ec708558d2d13e1a962f0a6cd50f1db85bba9ce18cab98e239722c0377df8b5041642999d3d9 WHIRLPOOL e7006d55b5f5b75d65d4c0efc881aa1ed4fc7ec7a9d3224ddc53c498f283ba0e085cd60c3fcddd62995034e4ed4ec8bbe539c014fd18eb25229390f05e252066
 EBUILD haddock-2.9.2.ebuild 2721 SHA256 68ccaeecf31796600cb37d76a71512aa0ff32dced59e793a87c48be3e11faa5b SHA512 3d927dee90571785e754a3f98fc7c01b3d7a284805fc219d8076beffee2889c231ad2cda0374b4bc7cde5727ab21a2a34528e340b7ff71555fa3be5e1d1c0b26 WHIRLPOOL 37797efccc6caea7a9eebf31ec564ec21fc739a3e8083dd035ab2220798b5e16b16b866480c370ebd4645aed330f9a74531bfffe918cb2884796ac81e2fcf1ac
-MISC ChangeLog 14029 SHA256 6713bccd839eaf4ecf5876b5a26b488dd705296c3bc0fd62b487d8b0a9a368e1 SHA512 4f348ddf24a706092b81943ded4cb679578c85af949488a36a86a56f259c29e8ea2d035e4d4423cfbcc2c79723c490102f800d65ea1b2889637511d9128de985 WHIRLPOOL c003ff59e0d98b1c7c71bcb1de60bdef86ef0abf0e57256e2295b96b22040727974aadd8d9d56fc722bbbc37ed40795e6f82faa88539f7bec0f6456df88ae7df
+MISC ChangeLog 14155 SHA256 242ea29a4ce91e8f0cb66445fcd5fc2d8f9b0d5c935e5ceebac248f4ccc42080 SHA512 331593265846e887e0792abec736a26621a4790a69454d943577fe69049499f289b88f3ceea94a8e92bbd2e54d54706e5893437832aa1d24a75eb1d5743cf30c WHIRLPOOL e65c86f89d6b07c0518721b605e0102dbb936245d971d995f80f32d01762b7117b09a9fdcc5a06df64ba3d77f0eca9617557958c95c670184a4a51b13f3efa86
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCo5dIACgkQoBEVQmGOlx8GZQD/QJMKAJr4NFrl4WiFBEGX5ME6
-VheJJLo1t1lyoCFF3wEBAIQQ8BaNN22qSPcojAxCFljteRRs7RXcP/cp0WJuPdAv
-=G30T
+iEYEAREIAAYFAlDjL5oACgkQcaHudmEf86rIDgCfT6KKUVK79adaxdxNFWAkE08b
+uiYAnimyRnMBb0I3p0BSMmG1lb5p7N0H
+=goe9
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs b/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs
deleted file mode 100644
index 19b2c5ba3a5e..000000000000
--- a/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs
+++ /dev/null
@@ -1,80 +0,0 @@
-{-
-Setup.hs: based on code from ghc-paths of Simon Marlow
-Fixed to not use the .buildinfo, and use -Dfoo flags for both libraries and executables
-
-Modified 2010-03-30 to work with both cabal-1.6 and cabal-1.8. See bug #302489.
--}
-import Distribution.Simple
-import Distribution.Simple.Setup
-import Distribution.PackageDescription
-import Distribution.Simple.LocalBuildInfo
-import Distribution.InstalledPackageInfo
-import Distribution.Simple.Program
-import Distribution.Simple.PackageIndex as Pkg
-
-import System.Exit
-import System.IO
-import Data.IORef
-import Data.Char
-import Data.Maybe
-
-main = defaultMainWithHooks simpleUserHooks {
-                      confHook    = myCustomConfHook
-                     }
-  where
-{- With cabal-1.6, myCustomConfHook has this type
-    myCustomConfHook :: (Either GenericPackageDescription PackageDescription, HookedBuildInfo)
-                     -> ConfigFlags
-                     -> IO LocalBuildInfo
-   With cabal-1.8, myCustomConfHook has this type
-    myCustomConfHook :: (GenericPackageDescription, HookedBuildInfo)
-
-So, better to not specify the type at all as we're not required to...
--}
-    myCustomConfHook gpd flags = do
-      -- get the default LBI
-      lbi <- confHook simpleUserHooks gpd flags
-      let programs = withPrograms lbi
-
-      libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags))
-                     ghcProgram programs ["--print-libdir"]
-      let libdir = reverse $ dropWhile isSpace $ reverse libdir_
-
-          ghc_pkg = case lookupProgram ghcPkgProgram programs of
-                          Just p  -> programPath p
-                          Nothing -> error "ghc-pkg was not found"
-          ghc     = case lookupProgram ghcProgram programs of
-                          Just p  -> programPath p
-                          Nothing -> error "ghc was not found"
-
-          -- figure out docdir from base's haddock-html field
-          base_pkg = case searchByName (installedPkgs lbi) "base" of
-                        None -> error "no base package"
-                        Unambiguous (x:_) -> x
-                        _ -> error "base ambiguous"
-          base_html = case haddockHTMLs base_pkg of
-                        [] -> ""
-                        (x:_) -> x
-          docdir = fromMaybe base_html $
-                        fmap reverse (stripPrefix (reverse "/libraries/base")
-                                                  (reverse base_html))
-
-      let programs' = userSpecifyArgs "ghc" ["-DGHC_PATHS_GHC_PKG=" ++ show ghc_pkg,
-                                             "-DGHC_PATHS_GHC=" ++ show ghc,
-                                             "-DGHC_PATHS_LIBDIR=" ++ show libdir,
-                                             "-DGHC_PATHS_DOCDIR=" ++ show docdir
-                                            ] programs
-      -- returning our modified LBI that includes the -D definitions
-      return lbi { withPrograms = programs' }
-
-die :: String -> IO a
-die msg = do
-  hFlush stdout
-  hPutStr stderr msg
-  exitWith (ExitFailure 1)
-
-stripPrefix :: Eq a => [a] -> [a] -> Maybe [a]
-stripPrefix [] ys = Just ys
-stripPrefix (x:xs) (y:ys)
- | x == y = stripPrefix xs ys
-stripPrefix _ _ = Nothing
diff --git a/dev-haskell/haddock/haddock-2.4.2.ebuild b/dev-haskell/haddock/haddock-2.4.2.ebuild
deleted file mode 100644
index eafd64f17c03..000000000000
--- a/dev-haskell/haddock/haddock-2.4.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.11 2012/09/14 07:03:20 qnikst Exp $
-
-CABAL_FEATURES="bin lib"
-# don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools pax-utils
-
-GHCPATHS_PN="ghc-paths"
-GHCPATHS_PV="0.1.0.5"
-GHCPATHS_P="${GHCPATHS_PN}-${GHCPATHS_PV}"
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
-	mirror://hackage/packages/archive/${GHCPATHS_PN}/${GHCPATHS_PV}/${GHCPATHS_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-# haddock-2.4.2 also deps on the upgradeable package dev-haskell/filepath.
-# however, it's included in >=ghc-6.10, so we use the core package without
-# stating the dependency in DEPEND.
-
-# we bundle the dep on ghc-paths to reduce the dependencies on this critical
-# package. ghc-paths would like to be compiled with USE=doc, which pulls in
-# haddock, which requires ghc-paths, which pulls in haddock...
-
-# doesn't build with ghc-6.10.1, but that has never been in portage
-RDEPEND="=dev-lang/ghc-6.10*"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		doc? (  ~app-text/docbook-xml-dtd-4.2
-				app-text/docbook-xsl-stylesheets
-				>=dev-libs/libxslt-1.1.2 )"
-
-src_unpack() {
-	unpack ${A}
-
-	# use ghc-paths directly, not as a library
-	sed -e "s|build-depends: ghc-paths|hs-source-dirs: ../${GHCPATHS_P}|" \
-		-e "s|Simple|Custom|" \
-		-i "${S}/${PN}.cabal"
-
-	# ghc-paths has a custom Setup.hs, haddock has the default Setup.lhs.
-	# we use a somewhat modified ghc-paths Setup.hs that works better for our
-	# purposes.
-	rm "${S}/Setup.lhs"
-	cp "${FILESDIR}/${P}-Setup.hs" "${S}/Setup.hs"
-
-	if use doc; then
-	  cd "${S}/doc"
-	  eautoreconf
-	fi
-
-}
-
-src_compile () {
-	cabal_src_compile
-	if use doc; then
-		cd "${S}/doc"
-		./configure --prefix="${D}/usr/" \
-			|| die 'error configuring documentation.'
-		emake html || die 'error building documentation.'
-	fi
-}
-
-src_install () {
-	cabal_src_install
-	# haddock uses GHC-api to process TH source.
-	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${D}/usr/bin/${PN}"
-
-	if use doc; then
-		dohtml -r "${S}/doc/haddock/"*
-	fi
-	dodoc CHANGES README
-}