Remove old versions and fix deps for 0.9.10-r1

Package-Manager: portage-2.1.2.2

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index afb828381a0336e014282bfe8830b85a95880dec..350e6d4aa67b4be5b691f66551fe6b0bd2b1b83b 100644 (file)
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.29 2007/04/29 15:09:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.30 2007/04/29 19:33:47 dcoutts Exp $
+
+  29 Apr 2007; Duncan Coutts <dcoutts@gentoo.org> -gtk2hs-0.9.9.ebuild,
+  -gtk2hs-0.9.10.ebuild, gtk2hs-0.9.10-r1.ebuild:
+  Remove old versions and fix deps for 0.9.10-r1
 
 *gtk2hs-0.9.11 (29 Apr 2007)
 

diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 631223ac2b1e7f3f802b0bac34a0ebd943bb9bba..91654e57314e7e406eb8b52cb918e2d68fce9095 100644 (file)
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -15,47 +15,32 @@ RMD160 9369b99cfca278e252ea6b5c25ba23bcb53603e8 files/gtk2hs-0.9.10-store.patch
 SHA256 e47de4d759ff4e68ef9d278ddb5d8db77c463a87ac964578fe929db0ba1cf06f files/gtk2hs-0.9.10-store.patch 678
 DIST gtk2hs-0.9.10.tar.gz 830866 RMD160 2b0a5275b43c0b22588028ba7944622ff08fbbb6 SHA1 7f1632923e18af7cbbd0b6fe566841658960dfd0 SHA256 da99b248f3674acba43bd636d1c67813851290ed11860f7f99a44a882cdea924
 DIST gtk2hs-0.9.11.tar.gz 980618 RMD160 c745020329fab493752d9055c4c8bca798b5d3e1 SHA1 6150312809e99ca3bcfc9f1f851d48a5253022ce SHA256 5da4c1fd7f0b66834e2aaf919d243928f63c15411e6289b2f31dfafb50848691
-DIST gtk2hs-0.9.9.tar.gz 765222 RMD160 f048076a02bf4dabd0279c5311e7b79bed84287e SHA1 af307de49b6ad5cd9a397bb99a175a2913a3e061 SHA256 e62fa9795fd952826e1eab5b74ad125a72a38ce5c4cecb727f20da4a16c2d6f0
-EBUILD gtk2hs-0.9.10-r1.ebuild 3525 RMD160 2b1530490d11aae5d05482e93610de23a2726b8a SHA1 3bdf6bf5d26138e23f4d7aa9998dec8f70074616 SHA256 56a03176b63fab9ab605bffe8ee52f4e948cdd0f632ec03aae1f6229f239eed1
-MD5 e71265dc1b63050c300eecccae03deef gtk2hs-0.9.10-r1.ebuild 3525
-RMD160 2b1530490d11aae5d05482e93610de23a2726b8a gtk2hs-0.9.10-r1.ebuild 3525
-SHA256 56a03176b63fab9ab605bffe8ee52f4e948cdd0f632ec03aae1f6229f239eed1 gtk2hs-0.9.10-r1.ebuild 3525
-EBUILD gtk2hs-0.9.10.ebuild 3475 RMD160 b1495d1693c5fbcd747ae379957e0e67fccf4405 SHA1 53be29b1371ed324b5d1a5f48c1bae836a6762de SHA256 e7e6e9036d429fafc7904be196d6947ec2619e4737e8140a3e7ef3c1f26b5458
-MD5 8bea0cfb09ee4924d6016d414e03854f gtk2hs-0.9.10.ebuild 3475
-RMD160 b1495d1693c5fbcd747ae379957e0e67fccf4405 gtk2hs-0.9.10.ebuild 3475
-SHA256 e7e6e9036d429fafc7904be196d6947ec2619e4737e8140a3e7ef3c1f26b5458 gtk2hs-0.9.10.ebuild 3475
+EBUILD gtk2hs-0.9.10-r1.ebuild 3521 RMD160 affef7965b3e4958ba67db288d71a9abf8cbd5e4 SHA1 d5f00d1618a128a2b5afe1d8216bf711459d1870 SHA256 a0975ee3eebf738b5de9f38020311b6d9d4ac45735e1a52b6e04952702530589
+MD5 3d64382caf8d86eb975a29c7b91e2979 gtk2hs-0.9.10-r1.ebuild 3521
+RMD160 affef7965b3e4958ba67db288d71a9abf8cbd5e4 gtk2hs-0.9.10-r1.ebuild 3521
+SHA256 a0975ee3eebf738b5de9f38020311b6d9d4ac45735e1a52b6e04952702530589 gtk2hs-0.9.10-r1.ebuild 3521
 EBUILD gtk2hs-0.9.11.ebuild 2863 RMD160 49a5799ece51da8ff888be01da2c11d45ca71dd1 SHA1 1797b5fc4ab087ae3c77d6195f41791403c456e6 SHA256 5e2f20f9d414d58595e8c24e0f2b88841b8a8eb03e4579088d36e0c361376b83
 MD5 35d72cda1a0778eb5f108bc1ef1d1dd4 gtk2hs-0.9.11.ebuild 2863
 RMD160 49a5799ece51da8ff888be01da2c11d45ca71dd1 gtk2hs-0.9.11.ebuild 2863
 SHA256 5e2f20f9d414d58595e8c24e0f2b88841b8a8eb03e4579088d36e0c361376b83 gtk2hs-0.9.11.ebuild 2863
-EBUILD gtk2hs-0.9.9.ebuild 2464 RMD160 0bcaf58181001e9d47228d5c0dcec23c893db7f6 SHA1 fa6eeb6d962731bb3364a02f1a361e54ceeb2bb4 SHA256 81e781adbd51e1661c67a4d8d9f390c22d692fa14998b02aa1d141fe0008f93e
-MD5 8f475b8e9dd21e97b6e871a4b1ae24b4 gtk2hs-0.9.9.ebuild 2464
-RMD160 0bcaf58181001e9d47228d5c0dcec23c893db7f6 gtk2hs-0.9.9.ebuild 2464
-SHA256 81e781adbd51e1661c67a4d8d9f390c22d692fa14998b02aa1d141fe0008f93e gtk2hs-0.9.9.ebuild 2464
-MISC ChangeLog 3894 RMD160 1ed681ff32a5f108edb4b3d21923a8ffcf635127 SHA1 f2d4969d0eadae7bd31e1251049f662660c49c83 SHA256 ec53b304d09a552769afafb37eb35744c4299176f5f88a14bf07480dee7bfa02
-MD5 b31f77fc1e475e93761589de2c54bcfd ChangeLog 3894
-RMD160 1ed681ff32a5f108edb4b3d21923a8ffcf635127 ChangeLog 3894
-SHA256 ec53b304d09a552769afafb37eb35744c4299176f5f88a14bf07480dee7bfa02 ChangeLog 3894
+MISC ChangeLog 4066 RMD160 8603873ed25c8ea4bdc11eb35d64e823f4cbb5c7 SHA1 8fae3e919825385adef8e3ed1e09ee529c8996f5 SHA256 6f9c5b414fdccb823dddf209e291663363bb37d7fe9c1567b45d1695aa4033c4
+MD5 25515ffbb2a9fa19e5300d9b7d983467 ChangeLog 4066
+RMD160 8603873ed25c8ea4bdc11eb35d64e823f4cbb5c7 ChangeLog 4066
+SHA256 6f9c5b414fdccb823dddf209e291663363bb37d7fe9c1567b45d1695aa4033c4 ChangeLog 4066
 MISC metadata.xml 223 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be SHA1 3be3a7139f7e71b712959fb7465f73d1bcb6ba07 SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be metadata.xml 223
 SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792 metadata.xml 223
-MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10 241
-RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10 241
-SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10 241
 MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10-r1 241
 RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10-r1 241
 SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10-r1 241
 MD5 8b3ded610a96da688cb8f673048b7bad files/digest-gtk2hs-0.9.11 241
 RMD160 21f2fa5e08ead39b2292fe2a0ca0f74fedbb1fab files/digest-gtk2hs-0.9.11 241
 SHA256 7eab83713a72a347386048baa114234bd534649f3922e492185a866a994aa970 files/digest-gtk2hs-0.9.11 241
-MD5 3637e0eeadfe2f6a0778a6256cb4a4f3 files/digest-gtk2hs-0.9.9 238
-RMD160 62a6c8c2be2d04e99a6fd66bfdf9bab64fa0412f files/digest-gtk2hs-0.9.9 238
-SHA256 07e2288414b25f678d9185d91ebb329615be28e2d10edd6790c8f4e804ac0ae6 files/digest-gtk2hs-0.9.9 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGNLJWnUVyUObPUL4RAhpxAJwMsQVz7t7Mcthbo4LZxsMNXf5qsgCfeJK1
-CoN992GGN3BlvVNh1Syv0c0=
-=Uq8L
+iD8DBQFGNPAqnUVyUObPUL4RAms4AJ9s1Z/KLefcmOoLmTK/Us1G1kZ2WACfWWgI
+Vk4pbbNTCVgbQgfDkHu4yXE=
+=fXsI
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10
deleted file mode 100644 (file)
index 7326ea1..0000000
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10
+++ /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/files/digest-gtk2hs-0.9.9 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
deleted file mode 100644 (file)
index 3530192..0000000
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3276545190248d40c683cd42f51a1b6e gtk2hs-0.9.9.tar.gz 765222
-RMD160 f048076a02bf4dabd0279c5311e7b79bed84287e gtk2hs-0.9.9.tar.gz 765222
-SHA256 e62fa9795fd952826e1eab5b74ad125a72a38ce5c4cecb727f20da4a16c2d6f0 gtk2hs-0.9.9.tar.gz 765222

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
index 304c93a6362445ad0c0b1f39a8df0dd5771dd2cb..46ac134128c4a6c20731425ac3209e80b83561d4 100644 (file)
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/01/06 19:06:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.3 2007/04/29 19:33:47 dcoutts Exp $
 
 inherit base eutils ghc-package multilib autotools
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="doc glade gnome firefox"
 
-RDEPEND=">=virtual/ghc-5.04.3
+RDEPEND="<virtual/ghc-6.6
                !>=virtual/ghc-6.6
                amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
                >=x11-libs/gtk+-2

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
deleted file mode 100644 (file)
index 73cebcc..0000000
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10.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.ebuild,v 1.9 2007/01/06 19:06:55 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=">=virtual/ghc-5.04.3
-               !>=virtual/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-0.6
-                                >=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"
-}
-
-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.9.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild
deleted file mode 100644 (file)
index 0714d27..0000000
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild
+++ /dev/null
@@ -1,84 +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.9.ebuild,v 1.2 2007/01/06 19:06:55 dcoutts Exp $
-
-inherit base ghc-package multilib
-
-DESCRIPTION="GTK+-2.x bindings for Haskell"
-HOMEPAGE="http://haskell.org/gtk2hs/"
-SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-
-KEYWORDS="-amd64 ~x86 ~ppc"
-#enable amd64 when ghc-6.4.1 is out
-#enable sparc when CFLAGS/-mcpu ebuild bug is fixed
-
-IUSE="doc gnome"
-
-DEPEND=">=virtual/ghc-5.04
-               !>=virtual/ghc-6.6
-               >=x11-libs/gtk+-2
-               gnome? ( >=gnome-base/libglade-2
-                                >=x11-libs/gtksourceview-0.6
-                                >=gnome-base/gconf-2 )
-               doc? ( >=dev-haskell/haddock-0.7 )"
-
-src_compile() {
-       econf \
-               --enable-packager-mode \
-               `use_enable gnome libglade` \
-               `use_enable gnome gconf` \
-               `use_enable gnome sourceview` \
-               `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}" \
-               "${D}/usr/$(get_libdir)/gtk2hs/gtk.${pkgext}" \
-               "${D}/usr/$(get_libdir)/gtk2hs/mogul.${pkgext}" \
-               $(useq gnome && echo \
-                       "${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}" \
-                       "${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
-                       "${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}")
-       ghc-install-pkg
-
-       # build ghci .o files from .a files
-       ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSglib.a
-       ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSgtk.a
-       ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSmogul.a
-       if use gnome; then
-               ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSglade.a
-               ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a
-               ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a
-       fi
-}
-