Loosen glib and gtk deps in glade-0.12.5.0-r2

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

diff --git a/dev-haskell/glade/ChangeLog b/dev-haskell/glade/ChangeLog
index 1334085a12813c216888ae73245e12e99cc4c106..810761b081204695e418a3d71841fe141285e685 100644 (file)
--- a/dev-haskell/glade/ChangeLog
+++ b/dev-haskell/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/glade
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.14 2014/07/25 09:16:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.15 2014/12/14 05:16:04 gienah Exp $
+
+*glade-0.12.5.0-r2 (14 Dec 2014)
+
+  14 Dec 2014; Mark Wright <gienah@gentoo.org> +glade-0.12.5.0-r2.ebuild,
+  -glade-0.12.0.ebuild:
+  Loosen glib and gtk deps in glade-0.12.5.0-r2
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> glade-0.12.0.ebuild,
   glade-0.12.1-r1.ebuild, glade-0.12.1.ebuild, glade-0.12.5.0-r1.ebuild:

diff --git a/dev-haskell/glade/Manifest b/dev-haskell/glade/Manifest
index 5446cfa3111f09544d78376f04a329b5add8e5ff..c2df622d8684bad5257328c4e25513327363bbcc 100644 (file)
--- a/dev-haskell/glade/Manifest
+++ b/dev-haskell/glade/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST glade-0.12.0.tar.gz 149722 SHA256 b8d2a223c921be8415a2be460e4e4ef0d2f5f86e604f13bec7fd049fee0cf440 SHA512 b18ef6453684cb45d6c1e15a88c2bf93230cd16e5074c1c4737b08979ee66a0101904024cb3d39dadad95248925f327888a734e6f555014126d9dd2ee617ebe0 WHIRLPOOL ed0151b2a75ebc7fa4725e5113efff90d884d51dd037f39f4931b162c0ce0491cec65991e6e83f3292625c7df541752f9e88617a252c902d28aed8be4a8654fd
 DIST glade-0.12.1.tar.gz 153938 SHA256 2025c44fbaada6463a99e3c5b39bdc8c9b846b59fe04194ec5dffd65be6c8f84 SHA512 82ac4a4cff6124eabce0744a5b8cefbae6609c9acb023fdeb0285eb9b7c84bc6b6aa09f43dacf1ba1b35f7a7e7b3f03f213869ee087d926002af5f0992b0a1ce WHIRLPOOL 5a3761fa2670269018115d9fd6abd244fec3196dd5416d80414dc385f976fabf970cfacc288d2a71288698bc379e28dc3916a6303b091e813a2bd8acc2fb9b3f
 DIST glade-0.12.5.0.tar.gz 152942 SHA256 79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435 SHA512 5ea6ac03e919b881b53649c340d23eacc4c7e7055d9425b581c38bbc08192ad65e009b9bf03e9f224cee69ee2301354b2e42f4c7c845349b2b34fcdf8994c865 WHIRLPOOL 0d3e313d7a9f9c079e3a47fb2995dc70163a31fe6ae26d99e9c637e5b9e6512c49d0e27ebd26492117f01cddf3b22b89cea9f837028171da050c1766a1a279da
-EBUILD glade-0.12.0.ebuild 894 SHA256 11c5fd5f8e29da7cbaf3dd54d4872f7598f451b019080489e73981d2f98070e8 SHA512 06eeaad98553a2bfa8e87df2ac25bda128caa3414db1d80aaa8a308605996e9edd6c955da834126bc2ec079c80f5d956121c666849e7ef2571d9a6adbb989da9 WHIRLPOOL fed9152a8adc89e277c75c1c5eabd2d82b488e42c6ba5caf980b7b7819b33974391dd177a3551bcf835d9604b8f6ac96899e6672f8aba64408d31e56177aa778
 EBUILD glade-0.12.1-r1.ebuild 892 SHA256 819a8918cc073e8ff725c931cc4591babd22f510853c19fd9c23ed8b0ebe530f SHA512 372fd25b939d818dc1935628780f97fb3e02c9e8e057967c8764469f663ccc2d5f1fcfad308f226fbead3ac4baddf95165606f13a1dd19cb17f859d1ce5a5881 WHIRLPOOL 019e7ee8e15cf30afa2f838f5bc8d3e7a13b6b827b27c5958f8d233f569de2fe7b9b0428a4affbc768d99d08ccaf3122a1c5275d96e8821ecd594c8e975cbd2f
 EBUILD glade-0.12.1.ebuild 830 SHA256 b881ca8aa3eeb1c462ecb42df385b43a5b721bbd6de74beee40caf476157ebb5 SHA512 c5fe15c0958ed9eacc0cce95d99543d5bab21803bf574773863e8987a403fa6d145e812816d5165a0f08290365e893d948b2ce4b8f7a02f4dadf1ddeb6aa24e3 WHIRLPOOL 68fcff4758ba48f9da5cd9b0b387800f6a25c79768eacff67ca7a070ecd6dcc37dcb526647cf6bfe91d9e77fb1ec83d7ea5b98c1390281ecca9ed7e8f9a3ec2a
 EBUILD glade-0.12.5.0-r1.ebuild 1013 SHA256 3094d4419d34dcd78ca7b464e7b68b8c4f69318c194f825584998b2783558981 SHA512 bf43b7edf48c5fecc4c66adf35b4c3ed3b3f1968b6d5276691e2b6ae7ff2dcb738a3b0cc1d1cd86a0df3598f13ed35370812ed05cdaf52d1506f3d9f0df96aa6 WHIRLPOOL 6fa65f22ad6c51d7e9f038599daf4ff0296a3126b8dfc44c56621dcaa29fb1f25fbb289ac70218f1b7c09cb585f85402f76a500c25a217776cf1cbba073e0dce
-MISC ChangeLog 2269 SHA256 9074860d795dbda1c518a8c1897422981606e019b20ad79bae3c55fbae7c15c2 SHA512 181d5d82d4fd6aaa711d663361c99df42c54365f83f8594bd6b9549ac50655e58bdcfe379ee74ec67366161ca4ddbe3b6ee45fa622beed9aa146b3f2b796fc33 WHIRLPOOL 75e4eebd31bc931941746375ecc3ab565382360de09cbca609345c895a69015dff279bdb7cd2709d2f8907cc04a26fa26c67880a47eb38b584559da3e0e03972
+EBUILD glade-0.12.5.0-r2.ebuild 1168 SHA256 cc1881a9d19defd04090748eaa1da5dc00fc5bff359a449988e0e98a073ab9f0 SHA512 e7d321ab7ed79b638375be803f1e9b52856e2eef3b53d522a92a103ce7c515964f420f2a2f442a8e6439846cef2f8a90657348156abe5cc94fd290e783f39c52 WHIRLPOOL 2e00feb862fe08ced0de80255b377fd0782e703accd3cb7f62fba1a271241385994c359442c476d167eb3f0a0f43f7603e1a3c41ca443556de43651c3ef4b594
+MISC ChangeLog 2450 SHA256 1f47629a92e63ff826cc1ecfb997803221fbfff2f16dc02eeb69453a7ae733a6 SHA512 0d0d8916256c1ee5926e635c3938f7546d7a5f1c7066c2f61b296c66d6ae19994997970bdb5063f66923b9f09e86aa107da244266cc23c6b9e852d2174c08336 WHIRLPOOL 70ab11c60ee1c8f97131c109b6b345af7beca61e818d1be1accdf837161cab9a6c5e910a1b0054fa1d91ddd5215f6315760ae8c71509ca7090bff246d3115dbc
 MISC metadata.xml 509 SHA256 24f6289fe120de97582fc7d244c70470e05dc8de8a7dd2b499ce09020b6be06c SHA512 ec6d9f6b307c6749d6294e25938ae3b5e120a9ca8663e7f78c18bceb11f658b99ab27d39f98085be8e3d2817f887be68ba19cd44b849137262f9813b66690526 WHIRLPOOL d38c818c049a92b806b69d00c8886154c2891e31b59544242aa4cae409b4b324d6f98d5f01cde9164bcb2f545da95040f58ee5456569416737c8fbec0753beff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlPSIPUACgkQcaHudmEf86qqyQCdGeHktwsgaDWT6QxU6GL0rL5o
-2ewAnRFYGOZKuV88MTslYiRvHjbtLn8Z
-=dpg8
+iF4EAREIAAYFAlSNHRkACgkQoBEVQmGOlx+2YgEAk/8AyuvTsd5tQyU6sdP1YFWf
+m7s+0ppg7URzVjxHZoYBAJRif+TXpnpI4kU/odoLzLJbCNgIswzrbXgPerdBQHiC
+=gIlc
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/glade/glade-0.12.0.ebuild b/dev-haskell/glade/glade-0.12.0.ebuild
deleted file mode 100644 (file)
index 0400e82..0000000
--- a/dev-haskell/glade/glade-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.0.ebuild,v 1.7 2014/07/25 09:16:23 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the gnome-base/libglade library"
-HOMEPAGE="http://www.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/cairo-0.12*:0
-               =dev-haskell/glib-0.12*:0
-               =dev-haskell/gtk-0.12*:2
-               dev-haskell/mtl
-               =dev-haskell/pango-0.12*:0
-               >=dev-lang/ghc-6.10.1
-               gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-               dev-haskell/gtk2hs-buildtools:0"

diff --git a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
new file mode 100644 (file)
index 0000000..dd2b17e
--- /dev/null
+++ b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.5.0-r2.ebuild,v 1.1 2014/12/14 05:16:04 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5.9999
+
+GTK_MAJ_VER="2"
+
+#nocabaldep is for the fancy cabal-detection feature at build-time
+CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the glade library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="${GTK_MAJ_VER}/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
+       >=dev-haskell/gtk-0.12.5.0:${GTK_MAJ_VER}=[profile?] <dev-haskell/gtk-0.14:${GTK_MAJ_VER}=[profile?]
+       >=dev-lang/ghc-6.10.4:=
+       gnome-base/libglade:2.0
+"
+DEPEND="${RDEPEND}
+       >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
+       virtual/pkgconfig
+"
+
+src_prepare() {
+       cabal_chdeps \
+               'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0 && < 0.14' \
+               'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0 && < 0.14'
+}