Remove old version fixing bug #207435. Also add dev-util/pkgconfig dep, fixing bug #206023.

Package-Manager: portage-2.1.3.19

5 files changed, 17 insertions, 154 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index dc80ca545e83..a4e81bc17699 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.41 2008/01/20 18:56:57 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.42 2008/01/26 20:14:36 dcoutts Exp $
+
+  26 Jan 2008; Duncan Coutts <dcoutts@gentoo.org> -gtk2hs-0.9.10-r1.ebuild,
+  gtk2hs-0.9.12.1.ebuild:
+  Remove old version fixing bug #207435. Also add dev-util/pkgconfig dep,
+  fixing bug #206023.
 
   20 Jan 2008; Christoph Mende <angelos@gentoo.org> gtk2hs-0.9.12.1.ebuild:
   Stable on amd64 wrt bug #205272
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10-r1 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10-r1
deleted file mode 100644
index 7326ea1f2c69..000000000000
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13d300e07153f37ba5893ac336b078bc gtk2hs-0.9.10.tar.gz 830866
-RMD160 2b0a5275b43c0b22588028ba7944622ff08fbbb6 gtk2hs-0.9.10.tar.gz 830866
-SHA256 da99b248f3674acba43bd636d1c67813851290ed11860f7f99a44a882cdea924 gtk2hs-0.9.10.tar.gz 830866
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
deleted file mode 100644
index 794950d31017..000000000000
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.6 2007/10/31 12:56:42 dcoutts Exp $
-
-inherit base eutils ghc-package multilib autotools
-
-DESCRIPTION="A GUI Library for Haskell based on Gtk+"
-HOMEPAGE="http://haskell.org/gtk2hs/"
-SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-#enable sparc when CFLAGS/-mcpu ebuild bug is fixed
-
-IUSE="doc glade gnome firefox"
-
-RDEPEND="<dev-lang/ghc-6.6
-		!>=dev-lang/ghc-6.6
-		amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
-		>=x11-libs/gtk+-2
-		glade? ( >=gnome-base/libglade-2 )
-		gnome? ( >=gnome-base/libglade-2
-				 =x11-libs/gtksourceview-1*
-				 >=gnome-base/gconf-2 )
-		firefox? ( >=www-client/mozilla-firefox-1.0.4 )"
-DEPEND="${RDEPEND}
-		doc? ( >=dev-haskell/haddock-0.7 )"
-
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.9.10-cflags.patch"
-	epatch "${FILESDIR}/${PN}-0.9.10-ghc622.patch"
-	epatch "${FILESDIR}/${PN}-0.9.10-store.patch"
-}
-
-src_compile() {
-	# only needed because of the cflags patch above.
-	eautoreconf
-
-	econf \
-		--enable-packager-mode \
-		$(has_version '>=x11-libs/gtk+-2.8' && echo --enable-cairo) \
-		$(use glade || use gnome && echo --enable-libglade) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome sourceview) \
-		$(use_enable firefox firefox) \
-		$(use_enable doc docs) \
-		|| die "Configure failed"
-
-	# parallel build doesn't work, so specify -j1
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-
-	make install \
-		DESTDIR="${D}" \
-		htmldir="/usr/share/doc/${PF}/html" \
-		haddockifacedir="/usr/share/doc/${PF}" \
-		|| die "Make install failed"
-
-	# for some reason it creates the doc dir even if it is configured
-	# to not generate docs, so lets remove the empty dirs in that case
-	# (and lets be cautious and only remove them if they're empty)
-	if ! use doc; then
-		rmdir "${D}/usr/share/doc/${PF}/html"
-		rmdir "${D}/usr/share/doc/${PF}"
-		rmdir "${D}/usr/share/doc"
-		rmdir "${D}/usr/share"
-	fi
-
-	# arrange for the packages to be registered
-	if ghc-cabal; then
-		pkgext=package.conf
-	else
-		pkgext=pkg
-	fi
-	ghc-setup-pkg \
-		"${D}/usr/$(get_libdir)/gtk2hs/glib.${pkgext}" \
-		$(has_version '>=x11-libs/gtk+-2.8' && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/cairo.${pkgext}") \
-		"${D}/usr/$(get_libdir)/gtk2hs/gtk.${pkgext}" \
-		"${D}/usr/$(get_libdir)/gtk2hs/mogul.${pkgext}" \
-		$(use glade || use gnome && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}") \
-		$(use gnome && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
-			"${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}") \
-		$(use firefox && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
-	ghc-install-pkg
-
-	# build ghci .o files from .a files
-	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSglib.a"
-	if has_version '>=x11-libs/gtk+-2.8'; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHScairo.a"
-	fi
-	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgtk.a"
-	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmogul.a"
-	if use glade || use gnome; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSglade.a"
-	fi
-	if use gnome; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a"
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a"
-	fi
-	if use firefox; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmozembed.a"
-	fi
-}
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
index 17fa4e3ad651..e67fe9ef8d4c 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.4 2008/01/20 18:56:57 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.5 2008/01/26 20:14:36 dcoutts Exp $
 
 inherit base eutils ghc-package multilib toolchain-funcs versionator
 
@@ -27,7 +27,8 @@ RDEPEND=">=dev-lang/ghc-6.4
 		firefox? ( >=www-client/mozilla-firefox-1.0.4 )
 		xulrunner? ( net-libs/xulrunner )"
 DEPEND="${RDEPEND}
-		doc? ( >=dev-haskell/haddock-0.8 )"
+		doc? ( >=dev-haskell/haddock-0.8 )
+		dev-util/pkgconfig"
 
 src_compile() {
 	econf \
diff --git a/dev-haskell/wash/Manifest b/dev-haskell/wash/Manifest
index f05bf9558ef8..b88ea63960ee 100644
--- a/dev-haskell/wash/Manifest
+++ b/dev-haskell/wash/Manifest
@@ -1,54 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX wash-2.5.6-ghc66.patch 9573 RMD160 43fbf934d048a8bc1e5a61fe16dc245a688c580e SHA1 e09c6ff78bb14fe05231a854cacf0b7f22236e17 SHA256 f6f52bd0af94c8dbc3cf9e2657e9516513c4970a4f6698885273cdc3d3f8ddf6
-MD5 6ad14b581dcac5bc988e976d9c902343 files/wash-2.5.6-ghc66.patch 9573
-RMD160 43fbf934d048a8bc1e5a61fe16dc245a688c580e files/wash-2.5.6-ghc66.patch 9573
-SHA256 f6f52bd0af94c8dbc3cf9e2657e9516513c4970a4f6698885273cdc3d3f8ddf6 files/wash-2.5.6-ghc66.patch 9573
-DIST WashNGo-2.0.6.tgz 425383 RMD160 0b11684dc1eab0c49475a2df7752f693d555b665 SHA1 742494cf7417a3ab7a2b34d61d18cec9ff45d9d5 SHA256 7f14b9b36a4457a4b6052dd2cd1f55a94b0add0387b54c5fae834d6c3b354aef
 DIST WashNGo-2.12.tgz 337362 RMD160 53f0221345ae1de502991f17159cf8ecda84a9f3 SHA1 0a12cfdc6cda2bbb0507ab06aae2864ed6a210ca SHA256 3f3f9724cbab24cbc45816be12c503064020cc9ffd585069eb835e290c10ccb7
-DIST WashNGo-2.3.1.tgz 442770 RMD160 ed4dd10cc76dad54fa28c92750ef72f2a04a9a4f SHA1 5c4cdfce93337b98ddc21ab00bc8b96a4919d4f5 SHA256 a99078ec9187d82792976d3764942adecb2d201f0237df51292122490f78a3ec
-DIST WashNGo-2.5.6.tgz 582358 RMD160 b9ce662cc05f09238de0aa34d3b0bbb627fe84eb SHA1 8957c68de286ed1eed3afb896066127407bde15d SHA256 69759637489fa187c875f8f100c98132d9e329fe004b7ddf37626df41fb03e30
-EBUILD wash-2.0.6.ebuild 1392 RMD160 98ecf1d7acaf4f6abb9cf253b4774872f95ed752 SHA1 a6df2e3141a520df04310039dc30411c35f06878 SHA256 d1f91465b76ba22d2e9ef9e742d2aa7b1f666f4ba351b697f67a17ec20642fc4
-MD5 f41633a54b670a03e4ba00ddf7046540 wash-2.0.6.ebuild 1392
-RMD160 98ecf1d7acaf4f6abb9cf253b4774872f95ed752 wash-2.0.6.ebuild 1392
-SHA256 d1f91465b76ba22d2e9ef9e742d2aa7b1f666f4ba351b697f67a17ec20642fc4 wash-2.0.6.ebuild 1392
 EBUILD wash-2.12.ebuild 1698 RMD160 e991fd43fcdde6bcba0e5e80bc1e6c73009511ef SHA1 aec4475689937f8aab94d9c3cf3f42434305befe SHA256 d5667cfcfce2d2cd52fce1a5188f7b5a0c443987cd53b2035aa494ecc9d6a9ec
 MD5 c1a2e85f265887b88568caa5142be8ef wash-2.12.ebuild 1698
 RMD160 e991fd43fcdde6bcba0e5e80bc1e6c73009511ef wash-2.12.ebuild 1698
 SHA256 d5667cfcfce2d2cd52fce1a5188f7b5a0c443987cd53b2035aa494ecc9d6a9ec wash-2.12.ebuild 1698
-EBUILD wash-2.3.1.ebuild 1391 RMD160 57d58309b15204c0ea96e5ffa98b2f1a7480635e SHA1 3ee05487bd102ab0221b92ddf094b247e80a8118 SHA256 42559bfb9d6c383cc8ba267d8165982bd85908930f7596d38a3976d05b496ce1
-MD5 bed02cd53afae42517ecb6d637d2461c wash-2.3.1.ebuild 1391
-RMD160 57d58309b15204c0ea96e5ffa98b2f1a7480635e wash-2.3.1.ebuild 1391
-SHA256 42559bfb9d6c383cc8ba267d8165982bd85908930f7596d38a3976d05b496ce1 wash-2.3.1.ebuild 1391
-EBUILD wash-2.5.6.ebuild 2254 RMD160 17a93fa978d4976f2340f9de412984de9c28e9de SHA1 1f39bcbe58b53769239e92631800ef920a797b2c SHA256 03712c0934990d1f9bd499a433de97bf607614fdef8fbb50f6ff1d19a6b62675
-MD5 2266e21857f1e9dfc1270d23fb78d5c2 wash-2.5.6.ebuild 2254
-RMD160 17a93fa978d4976f2340f9de412984de9c28e9de wash-2.5.6.ebuild 2254
-SHA256 03712c0934990d1f9bd499a433de97bf607614fdef8fbb50f6ff1d19a6b62675 wash-2.5.6.ebuild 2254
-MISC ChangeLog 2173 RMD160 73ee32b5f9477e71b26c060bae295a633365d324 SHA1 234569c1586bcb6bd0a021e0dca0c713a29c40a4 SHA256 caf7eb55d98a268e369e577c64ae060d666793e69a89888acfde494d7bfb83e1
-MD5 78b997c7064531e56628e887f8106c0c ChangeLog 2173
-RMD160 73ee32b5f9477e71b26c060bae295a633365d324 ChangeLog 2173
-SHA256 caf7eb55d98a268e369e577c64ae060d666793e69a89888acfde494d7bfb83e1 ChangeLog 2173
+MISC ChangeLog 2362 RMD160 6906b6854d816589be44be78fec44f79a93b7d17 SHA1 cd310aca688d74574938cd2a16ec06b912695b94 SHA256 6467d0277a88ecb29f0f02c8be87a5f16f975b62b227cf16dfe4d051ca1704b0
+MD5 73a0b95cb8696a7b66a405cd8eacb878 ChangeLog 2362
+RMD160 6906b6854d816589be44be78fec44f79a93b7d17 ChangeLog 2362
+SHA256 6467d0277a88ecb29f0f02c8be87a5f16f975b62b227cf16dfe4d051ca1704b0 ChangeLog 2362
 MISC metadata.xml 285 RMD160 15988fa26c91d66e822368f192c0ab541dbf1853 SHA1 e2ab5e4901e7d4fd8ad32143b781d8942b4c3dd4 SHA256 7a662b130d6c54436af26de89f516ebb376b381a03cccd2b4e339b86f0d16f7c
 MD5 fb69c7363bd10ec81a9b6c89b2ad3ed9 metadata.xml 285
 RMD160 15988fa26c91d66e822368f192c0ab541dbf1853 metadata.xml 285
 SHA256 7a662b130d6c54436af26de89f516ebb376b381a03cccd2b4e339b86f0d16f7c metadata.xml 285
-MD5 529d3b1b073264da10e1fa00a0cff2df files/digest-wash-2.0.6 232
-RMD160 2dd877ec7dc8427e824b3f1847dbe31cd8beac55 files/digest-wash-2.0.6 232
-SHA256 b51ebd786bf2b17130bda6b9cc725a3920780a0470274aadf03555c1d27afad9 files/digest-wash-2.0.6 232
 MD5 e55c454b5c4957ae22d5237e85f5de6f files/digest-wash-2.12 229
 RMD160 7e7c6ecc10bb1a9b4faaa616a1994ae74ac8c4b5 files/digest-wash-2.12 229
 SHA256 80e5833fa26e312fe065565b112b73a6bf6a8744f27aee2f383ada48cc22ece3 files/digest-wash-2.12 229
-MD5 9865dce1ee487e306231b958af5dcccc files/digest-wash-2.3.1 232
-RMD160 df29ab79b7118202823aaf75c675e2124cfc3919 files/digest-wash-2.3.1 232
-SHA256 98d21d5f64cfa73e80109a3bad8c7ffedbf89f978300d97628ba9dd3fc5c6759 files/digest-wash-2.3.1 232
-MD5 cc12bbad344ae6c847eb57ad17012d84 files/digest-wash-2.5.6 232
-RMD160 7904699e4957c142aa5200b9cc6c112b2f5ae0d5 files/digest-wash-2.5.6 232
-SHA256 f6c7a5480e10bf42d959dc1a9ada803a38e4a4772a00af3ba99e19f7b737fecd files/digest-wash-2.5.6 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHYWzvnUVyUObPUL4RAnHGAJ0bAy5hUBTHQxVg3xsjiLrf902NRgCfU9We
-R43Y6VPhb91c6V3q4EY1ZQ4=
-=8mMk
+iD8DBQFHm5VSnUVyUObPUL4RAj66AJ9J/X7eLJpez6jtq0MmZxhkmbxmIgCdEZ0H
+Aztn8homEfqu/p0jboPkdJ0=
+=FkRx
 -----END PGP SIGNATURE-----