diff options
author | Pacho Ramos <pacho@gentoo.org> | 2013-11-06 21:42:24 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2013-11-06 21:42:24 +0000 |
commit | 675fa803e3b642c1cc18684b600f318ccc58b8ea (patch) | |
tree | a80ba02b3f1a1092356555db8c1be26df14b1879 /x11-libs | |
parent | version bump (diff) | |
download | historical-675fa803e3b642c1cc18684b600f318ccc58b8ea.tar.gz historical-675fa803e3b642c1cc18684b600f318ccc58b8ea.tar.bz2 historical-675fa803e3b642c1cc18684b600f318ccc58b8ea.zip |
Parallel install fails when no gdk-pixbuf is already installed, bug #481372
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gdk-pixbuf/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/Manifest | 12 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild | 88 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild | 6 |
4 files changed, 13 insertions, 99 deletions
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog index 168996faf25c..3f79cd6660ec 100644 --- a/x11-libs/gdk-pixbuf/ChangeLog +++ b/x11-libs/gdk-pixbuf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/gdk-pixbuf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.89 2013/10/24 13:25:16 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.90 2013/11/06 21:42:20 pacho Exp $ + + 06 Nov 2013; Pacho Ramos <pacho@gentoo.org> -gdk-pixbuf-2.28.1.ebuild, + gdk-pixbuf-2.28.2.ebuild: + Parallel install fails when no gdk-pixbuf is already installed, bug #481372 24 Oct 2013; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.26.5.ebuild: Stable for HPPA (bug #476364). diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 807ad8a01a45..7abdc4ad9f80 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -4,18 +4,16 @@ Hash: SHA256 AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35ca6d7d33350f7b5721dc06d88a7dc2a6 SHA512 54e7248076cdb1d446b5bb5ee09474461c775a0e51372602f10b0096f5c4779f01c739c75461d2c134565dacc03a38f298486ce814df8318410c8ab77ca5a8a7 WHIRLPOOL be4193a8e83733c031629d3a67e690b740180c9ac20eaac424119a3381a558c2b233524c599536276fe97b541f2d9d824dafa1642099b246a87df5deea497083 DIST gdk-pixbuf-2.26.4.tar.xz 1181640 SHA256 a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be SHA512 a85d9fb8a206b6986abc8bc8caa079f5ddbd1c83226f80896439a06a7644d27fa1e9d80cc0a34ba82ce0877cdfaeaee8bc2548b016d25d314bcbbab44091ef76 WHIRLPOOL f452673a3d4b9e894d7e92a24ecca9c4551353d38c242ad7ddcde812ce55dd56b68d80b297957c3f3cd7a649837cd47412995b842082ae5abec81a02ec486b07 DIST gdk-pixbuf-2.26.5.tar.xz 1181336 SHA256 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 SHA512 2988dd550aac92c2633c5443c712be8e3c06d852190251d6436ef2457c43ccce48ef795f7b187ef975b643a0bc4fc407f8b539fd627dc05a69d7ee4b210244ee WHIRLPOOL 2a05fb5501a72fcb4acb502c542509a845406b1905e7750097de2c555dc5222b903bb7f1d4e953fdf19e4d6dd1b7acae6f6bceadcd26687d3b628f8c4cc654da -DIST gdk-pixbuf-2.28.1.tar.xz 1191084 SHA256 bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb SHA512 5829d5eaca69fe8e813f5a668cb807d26dd7fc61a32e4d8a4beae638cb01d8f89f90ca554520ac4a43a530d7d03bd2e96da2d616b80effca264d385b97fee502 WHIRLPOOL 86b66300f0361d73e62e57a6998ca1751aa7a85b4703696672b6374b4c261a1b8f1745b5efd268b12831726fd830ab5056ab04fdf04b291f0f9db7a0487ce70d DIST gdk-pixbuf-2.28.2.tar.xz 1192936 SHA256 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 SHA512 2082e6f44aa8e986586da8f5797b7e9aae23c60021c5183ed6e1e2e99cef338ec1b20cf2baef19a337ac557eb585399377e92534d2f90222a68943b914d86656 WHIRLPOOL 7060b0b591d47b1eec43b01a29cde5903ee78f458a4623a66d66d6b0d83f32d08ae2c5aa9da9dfc328990168c477a879b501c34d6f24b3d93f38cd7cdb4b8a66 EBUILD gdk-pixbuf-2.26.4.ebuild 2610 SHA256 ee12fe249e0578741f439dab431f07a506a55fe3a2b2ed8b2d8d4ef111a29792 SHA512 b9828c7c90e4ce82551c486c214270d62d3e57e1224ac63f3c9996a5dfbacae77868ad5df44847afa43cfc3e98942df3f74849dfb4ada08f0202312abfb8fbbe WHIRLPOOL 02c80fd00dfe18850264d1829962b0f7cc979937c00029d5bae50d7ab062a5300f11261696c3e30e98d0c621bc0e804c6ca91e001d64b4efe60f3ffc0e9f82cc EBUILD gdk-pixbuf-2.26.5.ebuild 2528 SHA256 89a0a3d05b7912cf6c3778f18f1f694a018fd8bb3290da21b9e0428bef369c3f SHA512 7a2647596fbe07dd00476121f4cec66787208a4efe559d9a80be1cbbceb002a11c263809f9d606951d0fbed28bfa2d5976fc5287a1ca4f7561ce72bbf116e4df WHIRLPOOL b039c38a9a6a527879eac455e02047b666ca2f18488d2c3c71c8d807e1511491379caee8e0e0825d0529a596490a9ef2be2c9e3ed2132d87733b6da93681f56e -EBUILD gdk-pixbuf-2.28.1.ebuild 2802 SHA256 5faf8a46ad1db2b6447cd028eed82e7aac771f03a33326ab519250cb882835f4 SHA512 ee9a302c1633cea4e4c4491672df6d2bbd7485dd3280a24fff6e98592b40e1179e1799ed97964dc3f1e06a3e7508f817022439742a2deb3eb0b15abed78fb392 WHIRLPOOL 82060456f4282fc832604fa4f4dd8559ce6ff22820025aa152ab2cca1d81b3921abdcc9eb883ffa60f409daf4c4f11c375729a784cbbd87e3df8aa1cd61777a1 -EBUILD gdk-pixbuf-2.28.2.ebuild 2769 SHA256 aa8740f3e53278483d91dee82d495d6fd5bda01e1727badedf1bf2eaca6db9a5 SHA512 2ace2d44e1ac3804f4a2374f20f9fa6208980e75758690b26e2a62bc4a48efd1ce9fb0f93708f5d7afb9a70e78ed06845723a1faf0cf6ce0ad3675027d603114 WHIRLPOOL db464ee197826f22b0d0a2f0d97c8a67c75614c07122eaac41aabe236bcc34114ffed3204ae7094bba2b8f8d1e57843bfe106ae5474cb8d6eaadb5b13160aa5e -MISC ChangeLog 13682 SHA256 87d612a5d64fd397fb6974dd4435a9597ca116708df3f1db070d2eb492e28079 SHA512 2f25a4155b7b8f0442d2cb6c830280c6593e31b128a483d0247c72115a03e37af63cd8fa4a7be81cbc6f0c998b2a2af0e65b3aa16b4a31591a7a13b500e35056 WHIRLPOOL 146eba693e8d881492151490dfd4b492967c7448aa05430e11669dc65cd1de41ee07e8cfdf96d8b265e28f7585211535beae30dc5158c73874a64f924740aecf +EBUILD gdk-pixbuf-2.28.2.ebuild 2866 SHA256 31533a58dda76641402ab407a68fab76264372e01c65bb57d637ee82cb266345 SHA512 19fb73977e2262bba33c319ac4fe2b19188d991d0d53a71342efe019c9b8c4f34c9eb3e1f41030ce76db8f536a253c92733ce231ff2109d9be77ca9e7e07f604 WHIRLPOOL 3aa647c1092d8cc5f62ef9c9aa60636987e5497c368b76457b43ef071e4ee7e7ff5a4a5e0742cac361110d535fd9cfd29d2c547967e0cf99f9cd9df6d1e84c87 +MISC ChangeLog 13864 SHA256 91223f7e1e1fdab494ae1653707c012b19e4b6dde019b4fd51b946ce773f58dc SHA512 dfdaf0d6a553d3afa96e7779af76e452df7af151b33f9396ed23b24426071616df1b13b9d7ed77b441f5bec3d3570377773ed4fafb311ad5837ca1b685771957 WHIRLPOOL a218f40b46db49ac7aacf12b6e36cab1e9f952e4200a90b7955fe58d5548d3d9b0e58fde8f7b84853e7ce6c13ca4c0f45e5476a26beea5d58a280c0d881cee39 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJpH70ACgkQVWmRsqeSphPOrQCfRd+0O1vyf+QFgHrJAq/G1M3X -2hcAnjkTe6ONQ0jjyZyBdLob8LWsKHXo -=JJ8U +iEYEAREIAAYFAlJ6t70ACgkQCaWpQKGI+9RT4ACeNQxSiQVXu3UtbtM9nUj1b4R5 +lWUAnRSHTsFsqrcFl71bDWWwSVYYDwA5 +=W+YO -----END PGP SIGNATURE----- diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild deleted file mode 100644 index fe818ce4cb1c..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild,v 1.3 2013/09/03 21:59:11 eva Exp $ - -EAPI="5" - -inherit eutils gnome.org gnome2-utils multilib libtool - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+X debug +introspection jpeg jpeg2k tiff test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.34.0:2 - >=media-libs/libpng-1.4:0= - introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) - jpeg? ( virtual/jpeg:0= ) - jpeg2k? ( media-libs/jasper:= ) - tiff? ( >=media-libs/tiff-3.9.2:0= ) - X? ( x11-libs/libX11 )" -DEPEND="${COMMON_DEPEND} - >=dev-util/gtk-doc-am-1.11 - >=sys-devel/gettext-0.17 - virtual/pkgconfig" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gail-1000 - !<gnome-base/librsvg-2.31.0 - !<x11-libs/gtk+-2.21.3:2 - !<x11-libs/gtk+-2.90.4:3" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.28.0-string_h.patch #466034 - # This will avoid polluting the pkg-config file with versioned libpng, - # which is causing problems with libpng14 -> libpng15 upgrade - # See upstream bug #667068 - # First check that the pattern is present, to catch upstream changes on bumps, - # because sed doesn't return failure code if it doesn't do any replacements - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die - default - elibtoolize # for Darwin modules -} - -src_configure() { - # png always on to display icons (foser) - econf \ - $(usex debug --enable-debug=yes "") \ - $(use_with jpeg libjpeg) \ - $(use_with jpeg2k libjasper) \ - $(use_with tiff libtiff) \ - $(use_enable introspection) \ - $(use_with X x11) \ - --with-libpng -} - -src_install() { - default - dodoc AUTHORS NEWS* README* - prune_libtool_files --modules -} - -pkg_preinst() { - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - gnome2_gdk_pixbuf_update - - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" - fi -} - -pkg_postrm() { - if [[ -z ${REPLACED_BY_VERSIONS} ]]; then - rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache - fi -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild index 90beacb884dc..0c906947e8f6 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild,v 1.3 2013/09/03 21:59:11 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild,v 1.4 2013/11/06 21:42:20 pacho Exp $ EAPI="5" - inherit gnome.org gnome2-utils multilib libtool DESCRIPTION="Image loading library for GTK+" @@ -61,7 +60,8 @@ src_configure() { } src_install() { - default + # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 + MAKEOPTS+=" -j1" default prune_libtool_files --modules } |