diff options
| -rw-r--r-- | x11-libs/cairo/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-libs/cairo/Manifest | 27 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-1.14.2.ebuild (renamed from x11-libs/cairo/cairo-1.14.0-r1.ebuild) | 32 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-9999.ebuild | 6 |
4 files changed, 39 insertions, 36 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index c9a21fb63513..afb7d7639d7e 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.410 2015/03/05 19:13:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.411 2015/03/25 03:15:30 tetromino Exp $ + +*cairo-1.14.2 (25 Mar 2015) + + 25 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + -cairo-1.14.0-r1.ebuild, +cairo-1.14.2.ebuild, cairo-9999.ebuild: + Version bump, various bugs fixed. Update live ebuild to git-r3.eclass. + Propagate live ebuild flag changes (experimental/broken flags now + completely removed from the ebuild). Drop old. 05 Mar 2015; Jeroen Roovers <jer@gentoo.org> cairo-1.12.18-r1.ebuild: Stable for HPPA (bug #540676). diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index f31f1f556acc..865a742fa65c 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -23,19 +23,32 @@ DIST cairo-1.10.2.tar.gz 23558405 SHA256 32018c7998358eebc2ad578ff8d8559d34fc802 DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 SHA512 35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f WHIRLPOOL 00c5e237ac67c2287f90f204456178dcd123126c42669fa63e3dc04fbf9b46d867c554b8f2ecaf803a2553c388661fda5efc4803d6c1f30d7d8fc75fff06cde0 DIST cairo-1.12.18.tar.xz 38276736 SHA256 dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6 SHA512 238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2 WHIRLPOOL e4408a3f6185f1d7e0f1c95f4beb266c48722ba075329621c1a6a6f2ad3114c334ceb6b242d661d7d3e7e7a3b3fcd013c5806c17b637bfa7a59895cc70fc66cf DIST cairo-1.14.0.tar.xz 36584076 SHA256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7 SHA512 46900fac809763d610062d92fad6a65440d63f957907ebccc82cd90222bb8fea9782293b7825bdf9d86c396dd7f3879043a4c69dd80b519efa5488357c34ab58 WHIRLPOOL 8ac5e8be6f56f1636529ac61506db123ee343b051d99463b1644abf56b5e7eeb16197eab08c6d29faf4d99c8c0ba7d43902def99e33af1e20882bf44c5825309 +DIST cairo-1.14.2.tar.xz 35376404 SHA256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb SHA512 74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200 WHIRLPOOL fd57e1f474280a1df7a641bdcbe4dc5e5a71bd53b9e46e54302c7858e3bc0081fd1145f19133152819d259611096e4cca034c9caa73a748a507de9094f81a519 EBUILD cairo-1.10.2-r3.ebuild 4382 SHA256 1656fb57c943b71b588ca8427320067fdf91ae83331e8c4dead61a2461c83c18 SHA512 8392faa29b007706de4c2b6d61e3507bfcbccc07689239c7eb98e8b19547d4c656b18f507188e1d150a63f18782d864ecd4c5d70abff7c22033a4be5e775d9bf WHIRLPOOL 515c656ea979ed756b38f42db19b839f679c52a9f349a84430aaf31467634f66355d8a2d41a578d39e2ea6179c4baec94b73eefdba5905b8c291269070a00fb7 EBUILD cairo-1.12.16-r4.ebuild 5967 SHA256 5e0b558e4eb8d89d6b05e76762874c3747ab82e63e6e3258de908bef1836e5f4 SHA512 70870aac91452f40c1cbb380d3b2d5ff228d563d11882b12498a3a95482a06639d232e6a6ceac2326ffb8139a87f3a8a9feeeeab17bf678346c9ded06eaa6418 WHIRLPOOL 2c564483c6ba1a1cfe4c193f8c863078a45035c7c1581d4f8d43cf68a0b04ad9c4c45740299e0ad6b36f9074662942fabf9566d7e1ae08258790841fe6e0f074 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d EBUILD cairo-1.12.18-r1.ebuild 5299 SHA256 cfb3527cf035dceaad46a4aa1514f86f8e3e46fc8f3d66389ca95f8f7b5f625f SHA512 77cab2609dda0bd6b73dfaa16f2817e53a37afc7eeffb3e778d435234e8d7a9d603408cff792e003863e8f98e67a020eb56f3d8112be1aa0e79908ea50d4a76a WHIRLPOOL bfe15d47e6ed8f7ddaca1734fdac22a8ef8364c1f960c23a53854fe080c1ee36156f526b620da44ada6e494d201ba66ccf5caf1a5145a5d7e34abb80d0aa9dc4 -EBUILD cairo-1.14.0-r1.ebuild 5379 SHA256 f7bf0da497a5b006c6873fb6c959dd34716073d4215ff5b000ba77b3b3606860 SHA512 969d81c3ae2161003526630867857935a7dc0e94f3b53254df9533c7baf976d4180c58a94deff8ba508a9db6cd2437af34dd2756624bbd008ab4297e65a69050 WHIRLPOOL 218dd62b2e3e70ed791e372666629d4e223efa411b32980f76e563787afdc60e01d3278eb9f9abd1aa5ee903fd4ecd620a62dbefd93b65d5cc0654a0d25af50a EBUILD cairo-1.14.0-r2.ebuild 5755 SHA256 80bf88134e12057ac73c8750b7184053087367345b9484d1fc9914821b458a9d SHA512 7a1f5f7e783e924a3e1b3f7940cdb6602061de8ba76947fd04fabd4df661d541cf31c51d23c1eb22390e9ba7c0bf1ef3b73dfcbb2d145773f69f31993819921c WHIRLPOOL 60d4fe86c1cf6073db11217b8158e138a2a142084b51f3d143865b813713e0ebe3981a3fc27709a16e2a22c2c2eb5ef73676e04111633592b7a736ee1c1e0139 -EBUILD cairo-9999.ebuild 4775 SHA256 4de8533788128e7794f4a46ec34f3d0e978379d2a06790ebc78074c345f81693 SHA512 42ba24bb51ba1c8b088a860d07d1326901d1d1ef9509ae275c03eba08266508574c96e56c02d95d619a80fc6a8506bcb1931a80c0cce29356d028e70a2f17188 WHIRLPOOL eea6de53be6cdcc841c4deae13c74e55b1c792df9586e933cab979efc85407247c40b1267391108cf0015414a6ae73bc83eebce98e27ecc8673c1979a8c8cfc2 -MISC ChangeLog 61994 SHA256 7836e0acb5150c2129641bbcecdc5726bae1be4b541b46469998b96358ae0e2f SHA512 4030707ebfe402e326ab117d9eecd9a0211941eb35637189ddc713609aa706c1cb2948f7b94a6e3f43c04902fed1039e3a163836009f362be66f4b0d39cc6805 WHIRLPOOL 5f54184cbdf212ffbef455cf5be6872c063b30b2ee800126ddb4f896f28bafac5ce417b47de49ccb0edea0e103441764b9588e161490f7076708c8ff509180eb +EBUILD cairo-1.14.2.ebuild 4777 SHA256 475bf264794fdd96117c4b96d1769616d364823e206754fbc19692804929eb32 SHA512 1323bb9161e36d478d32b1672912d674ee910a4bca66ee8dd008ee88544e6418c5d8561bf1eaa99a1a8bf0f91927f2e9739b6e589f7f15279386d6b5f476f3af WHIRLPOOL 3c54042278077634608207ad059c35593f99d9910ef625568cff85bdd976952e9e0185fa9c82d47e46f88b235683c6f9e7cb8b37840e565ea38581d875189e25 +EBUILD cairo-9999.ebuild 4776 SHA256 64f0c155392d97a1b210b6e4fa12cf0641b24ab06bd8765dd002d7380873c8d1 SHA512 57f62cbf149451256eed3517163e59f4e6c953a462cc97b68a649a3bd1e6dd0d91b48307941604aee246670cef89a753b63677d83aa2cb6fa05548e27b3fd4dd WHIRLPOOL 26a1063f16c147530440290e50d1526428714baf1e4d0d79eeb76620f22ab167436b3b5c4845f37afc613a5b36585b2240619607dffa317d9b1d1cacaa4388f3 +MISC ChangeLog 62347 SHA256 f0a71a20daaabacf65fb93a8da47a705ea5ee2c96fb14301cc7788dc1e1f90fa SHA512 e85a72e8a65fdf9050e371cc44eb714bac5018be65401e4432cc7a3058abfa4f9617a5da69a2e03b4425c4d7cfe7de1eeccab27cd2e5966568266ec4f7b15028 WHIRLPOOL c542fe49c9bd3ba44566020a282fbbbb068109358841d153d45ebfc126264cbd0073b6e2630c93151c5fed6ef13b3360a40a76bd7ff113173fc211824c6d26ee MISC metadata.xml 1294 SHA256 988ed8eceb7738628f10a041a322482997d26a5fed1fd42eb86bd742a6e3602c SHA512 7d333210abf19ed97a1210d37d77a1cbe944220f16757a0c652c1a329d00cc387ebf2ca174db6dc7f79a892ab068c66d773c364da0321fcfeec0a05d84946bcf WHIRLPOOL b0d67117667918643b4d889b74207b995d8fa1c851786fc89bb81cecc5c46e89714533eb2f8cd005e1175ac8c79eb5d3912826e87cf1c34886103b5a4d7e06a2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlT4qt4ACgkQVWmRsqeSphMnlQCeLHDByyoU4qcZmstTOTM6IlKM -J9IAnilvRr417k7isRyGj2HY2diKPD4d -=gb/P +iQJ8BAEBCABmBQJVEihTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNMPsP/jRqHs9CnUqCmYs3qCgpHlxI +9Bm7wx/OU2AhBu9K00TAedrxBzZsCv131qcpza/13wP8SF1m8xiyWJ+WF/ho9eIX +8blNYqlSFG9r2yywzuFyrZsr1Me8m11p4Z2ZZQQJ/iRwrthlASXueiBIdBctPvz0 +rNI9jq3vaeV8Oa+UEJl+C+N8sA5AenxvXziEf/On8fH1llwdkFxjeKUMylKIT2mv +tIP1bmsBshs7hSi4Wrll/cuGaulHzXeIuwAYxgv3jjme8Uf9CNOE9P5B28d7mzdh +puwvDCQA5nG0yyXBG9o1g9zrqYR8Ru65b50v6SBZFX9A3k1T+igFaT0TBxACaIVF +zrEgfhJ+a2TaEBE9OevPtemMx+GIAYKQsE3zC1aDZD1j+O7gO8tczuuRgOhEkbqb +YaTUo9H6FHaUSIGwKRk0TLpY1I/cy6qU4Z4xudrQKTaPRIcXc+lZW965trGjxEKX +7GMxKwN94YzWyCoXVRcfWXeiZdOK+js4q0RpIxej8gYbke/FwxHfjKwV104+61Ru +WFH5t94bf04cGRwVho/y3Qh/2fzihvtKzBFy/wgSGlHqoe9MiYZazDlgTnZbuFKD +TYRa3EQcMxfesDSQNhBeRASH/vDBrmeyUBrTwqZYqCzVgFu/WvWZmjyB15oE4SnA +KsMa+QrV6kRIu2L/gH+O +=C93S -----END PGP SIGNATURE----- diff --git a/x11-libs/cairo/cairo-1.14.0-r1.ebuild b/x11-libs/cairo/cairo-1.14.2.ebuild index 39689805fa26..6f18451f59a1 100644 --- a/x11-libs/cairo/cairo-1.14.0-r1.ebuild +++ b/x11-libs/cairo/cairo-1.14.2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.14.0-r1.ebuild,v 1.1 2015/02/21 18:00:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.14.2.ebuild,v 1.1 2015/03/25 03:15:30 tetromino Exp $ EAPI=5 inherit eutils flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then - inherit git-2 + inherit git-r3 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" SRC_URI="" else @@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="http://cairographics.org/" LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug directfb drm gallium gles2 +glib opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb" +IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb" # gtk-doc regeneration doesn't seem to work with out-of-source builds #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate @@ -36,16 +36,10 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) - openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] ) - qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - drm? ( - >=virtual/libudev-208:=[${MULTILIB_USEDEP}] - gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] ) - ) ) xcb? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] @@ -59,10 +53,6 @@ DEPEND="${RDEPEND} >=sys-devel/libtool-2 X? ( >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}] - drm? ( - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - ) )" #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} # doc? ( @@ -70,13 +60,8 @@ DEPEND="${RDEPEND} # ~app-text/docbook-xml-dtd-4.2 # )" -# drm module requires X -# for gallium we need to enable drm REQUIRED_USE=" - drm? ( X ) - gallium? ( drm ) gles2? ( !opengl ) - openvg? ( || ( gles2 opengl ) ) xlib-xcb? ( xcb ) " @@ -88,9 +73,6 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch - # fixed in 1.14.1 - epatch "${FILESDIR}"/${P}-align-64bit-types.patch - # tests and perf tools require X, bug #483574 if ! use X; then sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die @@ -138,14 +120,10 @@ multilib_src_configure() { $(use_enable aqua quartz) \ $(use_enable aqua quartz-image) \ $(use_enable debug test-surfaces) \ - $(use_enable drm) \ $(use_enable directfb) \ - $(use_enable gallium) \ $(use_enable gles2 glesv2) \ $(use_enable glib gobject) \ - $(use_enable openvg vg) \ $(use_enable opengl gl) \ - $(use_enable qt4 qt) \ $(use_enable static-libs static) \ $(use_enable svg) \ $(use_enable valgrind) \ @@ -156,6 +134,10 @@ multilib_src_configure() { --enable-pdf \ --enable-png \ --enable-ps \ + --disable-drm \ + --disable-gallium \ + --disable-qt \ + --disable-vg \ ${myopts} } diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index d26c7086f9d0..19fa849fc165 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.58 2015/02/23 05:44:06 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.59 2015/03/25 03:15:30 tetromino Exp $ EAPI=5 inherit eutils flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then - inherit git-2 + inherit git-r3 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" SRC_URI="" else @@ -136,7 +136,7 @@ multilib_src_configure() { --enable-ps \ --disable-drm \ --disable-gallium \ - --disable-qt4 \ + --disable-qt \ --disable-vg \ ${myopts} } |