summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2013-04-03 05:24:37 +0000
committerMark Wright <gienah@gentoo.org>2013-04-03 05:24:37 +0000
commit258e21d80f2a6e2343f52fa6a6291e53f2e06781 (patch)
tree33d0d59b35aa20be36afb0f1c5f67122358aca09 /dev-haskell/cairo
parentRestrict the deps in bustle to select gtk+2 in slot 2 fix bug 464260. (diff)
downloadhistorical-258e21d80f2a6e2343f52fa6a6291e53f2e06781.tar.gz
historical-258e21d80f2a6e2343f52fa6a6291e53f2e06781.tar.bz2
historical-258e21d80f2a6e2343f52fa6a6291e53f2e06781.zip
Restrict the deps in cairo to select gtk+2 in slot 2 fix bug 464260.
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'dev-haskell/cairo')
-rw-r--r--dev-haskell/cairo/ChangeLog9
-rw-r--r--dev-haskell/cairo/Manifest20
-rw-r--r--dev-haskell/cairo/cairo-0.12.0.ebuild8
-rw-r--r--dev-haskell/cairo/cairo-0.12.3.1.ebuild8
-rw-r--r--dev-haskell/cairo/cairo-0.12.3.ebuild8
-rw-r--r--dev-haskell/cairo/cairo-0.12.4-r1.ebuild (renamed from dev-haskell/cairo/cairo-0.12.4.ebuild)20
6 files changed, 52 insertions, 21 deletions
diff --git a/dev-haskell/cairo/ChangeLog b/dev-haskell/cairo/ChangeLog
index 891e2ab71882..c319b0adcab1 100644
--- a/dev-haskell/cairo/ChangeLog
+++ b/dev-haskell/cairo/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-haskell/cairo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.16 2013/01/06 09:17:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.17 2013/04/03 05:23:56 gienah Exp $
+
+*cairo-0.12.4-r1 (03 Apr 2013)
+
+ 03 Apr 2013; Mark Wright <gienah@gentoo.org> +cairo-0.12.4-r1.ebuild,
+ -cairo-0.12.4.ebuild, cairo-0.12.0.ebuild, cairo-0.12.3.1.ebuild,
+ cairo-0.12.3.ebuild:
+ Restrict the deps in cairo to select gtk+2 in slot 2 fix bug 464260.
06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> cairo-0.12.4.ebuild:
Add ~sparc, wrt bug #449220
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index cf9b06e32e9d..02f5e773cb35 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX cairo-0.12.3-fixincl.patch 747 SHA256 d1e27a609da83fe801d4c98df4e822edb83899cc7374b8bbd198155e8aa65665 SHA512 69fa99726c8794ce5a9b149708905fd96dc81d61c348543129f862d7d2212ef63e6270928e0401bde786b0a0f91b86e14a054920754764b006cf5e891b0f67c8 WHIRLPOOL d73d5995caae65c68c4270a926d03ac5a99be754331158cdfee0f0177626029ff99c8d8d714804487ba51405cd064ed21422ff50694cb28559a5b70bd356d2d0
DIST cairo-0.12.0.tar.gz 47495 SHA256 29736aa5a6c7c3f4401c9ad53768a4806dbc0b3278be186aa95b4a8edcc25a58 SHA512 5b01d745ca9a3fdb389d035baf2483399b630b5ebcc48bd1a9364272de2a7d91cae7595fe33438ab2d2e49508d01939dada4b123623a87c0bc6d43b3872978a5 WHIRLPOOL 4e660df7d038bd6ab2d5e37bd7740f44a6360c304d9df051f686072fc5c09af20850e1e2101be00cde1bdc3c3e2a78cdf4c5b2cc3a9478486b4b97e8eb0ea6d3
DIST cairo-0.12.3.1.tar.gz 50437 SHA256 91bb958e8fcdff9d5496d6e7888359902e7b0c4e8ddfbf0df949856201c5779c SHA512 d77a67840e641d03b26e88db5ddc536fac32c577d42cf208803fb263eed24f23836abb7bdb5c951db2bcbb9932dd37f691edd95d592866667ed5df0fe0919a04 WHIRLPOOL 3c2a43bc9a7d2686cd56cefd1503fab573b9e083c701c353cec225eaa41156363e99b90de62669f875c7b6b37f4103409461e3f926a2dd08736823dc91815a98
DIST cairo-0.12.3.tar.gz 50412 SHA256 8d6bfa6488b4baa87f6722685b437b755bb739351bf3168ae681e87d4032fe4d SHA512 f2a747ec02045815cef999496ceb62d0620d86490c68ab893d683a5ebf06b25c42c729a0d26283c6e865718649edaf88ee7e40b56c93d4e55f84c62b5787b93b WHIRLPOOL 83ccbeea940cd90d9966b51a6aa2f3a5be6b35bcd4907e1699081bcfdfab51b4160292536f1b29d322c5d66a2904e01b8f36d7626637d82ded9309b46f3415d5
DIST cairo-0.12.4.tar.gz 50933 SHA256 783943379a6b02e8645dd29960e057bea8d05a7afa12a918d87e54d561b7c63f SHA512 ab5217d6448b8e6234bc3213ea50b114f5ad02cdb5d3e5fd4e5ead0c1a853096aa219785e07e96f9fd7be956ba15c0fc2a5fe3fdbc0d94f86190d6dc7c50205b WHIRLPOOL d40295d4111c23609e9b7f80364390d26137ea4009c561f458a0599388734a0d5ce249a915d67c07c9ce8e1c3d88c41dfb5285ca7437244cc0cf80a4e2f8d259
-EBUILD cairo-0.12.0.ebuild 943 SHA256 6e3fe9bd1a80be2f8b81502dc4c09811f1b7e65d450f2a10c82c704614a5df7a SHA512 2c6039a6053f490a1a46b408cea638336ce4ddaa595b4046ae761eee227529a9ae45b0393a6357a9e5290252a713712b6cb9702f47097584dacba4ef0bcce447 WHIRLPOOL 3c182a3f5214717664c68d54db4231938a8734364f0c46ae321ed8f753c24111c9c98c5ad1db9ef926c4a79839a07d8eaf66b8c18fb864144bd1236c0e598ab1
-EBUILD cairo-0.12.3.1.ebuild 917 SHA256 7684a06e4cb0c4f2296d4fca89977f32c2be09f653c851d6a8e9712549c62f58 SHA512 4f44bc60e9889e0187cdc33e16636e0462c1a2748ccfe594131f27c1e1c3ca54ab3b4f4d10f010a1e410c4c51c4bb79089c14c620bc5467845fa0efdbcb6bb8e WHIRLPOOL 9301fad74890cfc1301522e0e38af7274f0bd9743436244a5113ae2c3b1d9f469e57d628cdb2f76f8c86e31736b1b4017d2f7f77f19ff40e707e806a93ab915a
-EBUILD cairo-0.12.3.ebuild 984 SHA256 3fb7ebf42019a20738afb0018d01050c0463cafb77543a7dd6fb4e59027feed6 SHA512 be30de6497a74d6aa297921f6fb07eff521fcffccf1722c75e7967d3951544717a37c81bfbab033407b55ab300ec948bd2b153f20388c20c593a77e3643bb713 WHIRLPOOL 41a65d9557b068bc4d97114cbc8733aecb251f0c0a29898c766aa74217c37cf2d424a1a4bbff0f96bf7ba99d65a929bc29fe9cc13307795f5a0c591b70ee2182
-EBUILD cairo-0.12.4.ebuild 1023 SHA256 0b0e5d096243d73878ea9b674fa6ec67e6635e3520c630a4f9c3b7b3f7a00220 SHA512 fd6b517d6fefa35eba12d7171d1625448bf2efd580a7f0688fb45d14f4ef42f6aced27f1a1dc12ffa7b6a6c05c178160571008d70829879481b20e00799b6ee7 WHIRLPOOL eb4f3f995fa0bb3afdaf95ec619e9d2781d6d88a4298663c20d5975806f593bb99847ffdb0cdc9153ae97089b4ac8768fee63993913ef3ea3212b5010ee6de84
-MISC ChangeLog 2168 SHA256 96ae326808f6914b7ba39c1761bec9c4a5633ffbe857d616a764c01cdf233c84 SHA512 4e5e553eb4fba39612a679e1c51d090bf4504eeac118efaa01f25dfe1d66a7864fe2ae087f04572ed71d59c15155c7202b578be2f448f0d77dd31c046c745910 WHIRLPOOL ceb92d3189a49073721d1e19706ad1952b9a50f4acb452dbcbed322db88f8312c54d0c02ddfc0d9acab9f68a75edf6986fad4cd68aa4903a6ceaf957fa9c57aa
+EBUILD cairo-0.12.0.ebuild 945 SHA256 da6820031f4d71f0fe91018f758f9e94e163b96c47c40b50425e1601a9165942 SHA512 22df41c3c718d902044650fce65f5a38b54f65ebd9114d6b7533e095386a9aa0e0ac426e49fe4acc17ab2c953479d92cdccc66b6bc8767394ea8cf3ce9486b1b WHIRLPOOL 77c45ce03b655ad02794f00f1b11cf41c916735c605c912b779888c896f6ef2bda3108a769c2df137746601be3bf8ffd98b5249f4b6cc1ac49ecd02182e07a9c
+EBUILD cairo-0.12.3.1.ebuild 915 SHA256 076ac9a71a89b95fbce363721d2af271187b2ca572f39fb24a1a2b5b681281c6 SHA512 bed56f312bb6f46110a221078d9347366be74bb86cd0a92187a1d9939583ca25e794a62f54a5fa21b2fdb7f0c6f6323146ffbb97f4ae3d5683dc980c9514dfbf WHIRLPOOL 1993ed4c77b422b0a4ac0ab48fd5826128867ccc88ac5d690157d9136bc4aad6d714bb93e0edf3ebdc14c84bed117defb79d9575e4d254b9c1a69a52d08807a8
+EBUILD cairo-0.12.3.ebuild 986 SHA256 015846a3620797b0aec5e6a2806a63eee2a5e6b55bfc9a642e2b57afd60801d1 SHA512 25fa1895d031dab601e8a1daacefcfae4fdd1b0ebdec31054973b4bdea20f5cf458e9c3246c496a1c96bf7a17d5d7099f8b6088f6be8d82fdb4e4fcd22b40d12 WHIRLPOOL 0d17b101a90a7b9fae079e8c9c4bba76d3d1758eb8b1fe211017deced2b6fd5942fc17296022856bf3cd11a0f0cbee5b8be3cd86457a052ac9e0c919f70644df
+EBUILD cairo-0.12.4-r1.ebuild 1532 SHA256 6b22d72c4104fa1f6e54287edd1b031bdd6071540f866671df0edc7d0af70fd2 SHA512 670325303830a3e2f3a1264cfd7d6846823c9e327ef0c3eba456473fb95e79e688894e395bea522ed6dc75a5103cc3b9ca7e0c73cef8920d8ebec888f549006f WHIRLPOOL c9fdd7d4a11744db09e06f636a357e49392dbadd37e4724d310060767891115028e72b1c70f8e8efc6910635de2a79852a877fa986618fc36e36e54851289789
+MISC ChangeLog 2438 SHA256 733ce913c701939fef2ca6528843031aa1142ecc960d60a8b6245ae89c786dae SHA512 5140c0f90d1a0c53f88cd8d503ae59d8e690e499898427b0d96b7b4028bca6dde4137d3e8ad048f70fc3e1e664eff1e1f513ee2f87af189dc64657784e8bd251 WHIRLPOOL 10a51939bb8d5c54b4204444ccefb51e9ca151ff945be2f4dd28c2e6ab757c6b7ad3f522c4c450d492261f79b051766ac91f63e588d6e8726cf012387d5574d1
MISC metadata.xml 445 SHA256 de19bba189f3bf007551683022f9fa146765a1fbf489b38777c931411b547e78 SHA512 ee9f5f9fb0db0f034c36f0257fcf03a3094feb4985855bd3eedf958a273a1fb947646fb377cef17caa5ba9f8a8fde6140f8529b3d01282be61db571d7addeb36 WHIRLPOOL 2057e5295ea7763de875637cf39d77491ddc6ccf2392e14a071d71211efad1c6199780ea887bc4481b79ee009d59e5334ccb7372e62cdfe7ea785702b3889ea4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFbvOoACgkQoBEVQmGOlx8b6QEAv9H9ZjnPvakC670TTS6mcDl9
+yr+V7bV8m8IkQ7GSxUgBAL84mOmG498wvHECFafUplX9kjitubIhGcpjI4l4Wo8k
+=SHHv
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/cairo/cairo-0.12.0.ebuild b/dev-haskell/cairo/cairo-0.12.0.ebuild
index 1a08066e87be..2df82a00021a 100644
--- a/dev-haskell/cairo/cairo-0.12.0.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.0.ebuild,v 1.4 2012/09/12 15:13:57 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.0.ebuild,v 1.5 2013/04/03 05:23:56 gienah Exp $
# ebuild generated by hackport 0.2.13
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.haskell.org/gtk2hs/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="2"
KEYWORDS="amd64 x86"
IUSE="+svg"
@@ -23,7 +23,7 @@ RDEPEND="dev-haskell/mtl
>=dev-lang/ghc-6.10.1
x11-libs/cairo[svg?]"
DEPEND="${RDEPEND}
- dev-haskell/gtk2hs-buildtools"
+ dev-haskell/gtk2hs-buildtools:2"
src_configure() {
# x11-libs/cairo seems to build pdf and ps by default
diff --git a/dev-haskell/cairo/cairo-0.12.3.1.ebuild b/dev-haskell/cairo/cairo-0.12.3.1.ebuild
index 6b7f6c8d8667..cbadf9647b09 100644
--- a/dev-haskell/cairo/cairo-0.12.3.1.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.1.ebuild,v 1.4 2012/09/23 08:41:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.1.ebuild,v 1.5 2013/04/03 05:23:56 gienah Exp $
EAPI=4
@@ -13,7 +13,7 @@ HOMEPAGE="http://projects.haskell.org/gtk2hs/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="2"
KEYWORDS="amd64 x86"
IUSE="+svg"
@@ -21,7 +21,7 @@ RDEPEND="dev-haskell/mtl[profile?]
>=dev-lang/ghc-6.10.1
x11-libs/cairo[svg?]"
DEPEND="${RDEPEND}
- dev-haskell/gtk2hs-buildtools"
+ dev-haskell/gtk2hs-buildtools:2"
src_configure() {
# x11-libs/cairo seems to build pdf and ps by default
diff --git a/dev-haskell/cairo/cairo-0.12.3.ebuild b/dev-haskell/cairo/cairo-0.12.3.ebuild
index 96ef7431bc71..6eadea1f6f29 100644
--- a/dev-haskell/cairo/cairo-0.12.3.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.ebuild,v 1.4 2012/09/12 15:13:57 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.ebuild,v 1.5 2013/04/03 05:23:56 gienah Exp $
# ebuild generated by hackport 0.2.13
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.haskell.org/gtk2hs/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="2"
KEYWORDS="amd64 x86"
IUSE="+svg"
@@ -23,7 +23,7 @@ RDEPEND="dev-haskell/mtl
>=dev-lang/ghc-6.10.1
x11-libs/cairo[svg?]"
DEPEND="${RDEPEND}
- dev-haskell/gtk2hs-buildtools"
+ dev-haskell/gtk2hs-buildtools:2"
PATCHES=("${FILESDIR}"/${P}-fixincl.patch)
diff --git a/dev-haskell/cairo/cairo-0.12.4.ebuild b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
index 71d7c56bd362..fad681e2f64c 100644
--- a/dev-haskell/cairo/cairo-0.12.4.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
@@ -1,11 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4.ebuild,v 1.6 2013/01/06 09:17:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.1 2013/04/03 05:23:56 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.3.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
@@ -15,7 +17,7 @@ HOMEPAGE="http://projects.haskell.org/gtk2hs/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="${GTK_MAJ_VER}/${PV}"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+svg"
@@ -24,7 +26,19 @@ RDEPEND="dev-haskell/mtl:=[profile?]
x11-libs/cairo[svg?]"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
- >=dev-haskell/gtk2hs-buildtools-0.12.4"
+ >=dev-haskell/gtk2hs-buildtools-0.12.4:${GTK_MAJ_VER}=
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -e "s@gtk2hsTypeGen@gtk2hsTypeGen${GTK_MAJ_VER}@" \
+ -e "s@gtk2hsHookGenerator@gtk2hsHookGenerator${GTK_MAJ_VER}@" \
+ -e "s@gtk2hsC2hs@gtk2hsC2hs${GTK_MAJ_VER}@" \
+ -i "${S}/Gtk2HsSetup.hs" \
+ || die "Could not change Gtk2HsSetup.hs for GTK+ slot ${GTK_MAJ_VER}"
+ sed -e "s@gtk2hsC2hs@gtk2hsC2hs${GTK_MAJ_VER}@" \
+ -i "${S}/${PN}.cabal" \
+ || die "Could not change ${PN}.cabal for GTK+ slot ${GTK_MAJ_VER}"
+}
src_configure() {
# x11-libs/cairo seems to build pdf and ps by default