diff options
Diffstat (limited to 'x11-libs/gdk-pixbuf')
| -rw-r--r-- | x11-libs/gdk-pixbuf/ChangeLog | 12 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/Manifest | 24 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch | 24 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild | 93 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild | 14 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild | 91 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild | 14 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild (renamed from x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.3.ebuild) | 20 |
8 files changed, 41 insertions, 251 deletions
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog index 010f79f160c2..edad1c877b4b 100644 --- a/x11-libs/gdk-pixbuf/ChangeLog +++ b/x11-libs/gdk-pixbuf/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-libs/gdk-pixbuf # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.76 2012/10/28 15:30:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.77 2012/11/10 05:54:13 tetromino Exp $ + +*gdk-pixbuf-2.26.5 (10 Nov 2012) + + 10 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch, + -gdk-pixbuf-2.24.0-r1.ebuild, -gdk-pixbuf-2.24.1.ebuild, + gdk-pixbuf-2.24.1-r1.ebuild, -gdk-pixbuf-2.26.3.ebuild, + gdk-pixbuf-2.26.4.ebuild, +gdk-pixbuf-2.26.5.ebuild: + Version bump, fixes crashes with >glib-2.35. Drop useless USE=doc, it only + regenerated documentation. Update license. Drop old. 28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.26.4.ebuild: ia64/sh/sparc stable wrt #427544 diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 5d5a702f3758..ad21fd0bd55f 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,23 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 SHA256 e977da6d4731a0164b7346a790dfabb95a951f9986fa623abd171bce79f63bcb SHA512 934ad675df83d4b51c3082f6a11fbf9c35f05587b31703706c4e01f55702efca4e63a07f3f6e48430504aeebf227d8c4a074f31064460486eeb30e1d1d0e41cb WHIRLPOOL 2a10b6b8ddecf44bcb7cd15d2f612cad4fcc29a3b277d58024100d13581f2b0f11452e8f2035a5bf3743149b77eb1a158adcd224bc2b01dbcdc8ff16e14f9039 AUX gdk-pixbuf-2.24.1-xbm-overflow.patch 1534 SHA256 97d2dcde3312ec2ad15f26a91cb3af9538db8218acccef69e32fa888802e007e SHA512 39c80fc9fc2c16e99db44292b52dd8272abd4b58b2c0d736280e12d2fc5f7c57d959194b976676d79fafcf1a6c43af5ee2fa6d3999ffe72533f61e6846aee89b WHIRLPOOL 994c3f4420184a077ea999c95e2f9355f9842ff3bb651fe1b5ccdbc3a34aa330c751163fb3850c38199ed79db3ae7e0fba97ed8bd9c7ceb26ba335c13b19035b -DIST gdk-pixbuf-2.24.0.tar.xz 1176324 SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7 SHA512 50a6cdbfb55473576da86f800b0d0407dc47bd8df6c9ca4db60009cdba550f632766f35210494d7b1ada1748d0927107f421115714a806cf6f851d9105995bc4 WHIRLPOOL a9325ed8566d3c3731be4e1c41a7b44c4e003e7dd241897a179e9e14d0e8331e0a3008c1500e3f8021ebf0a7acaa43b87acd6bf0b501ffd63f2f6d0f3dfb0e40 DIST gdk-pixbuf-2.24.1.tar.xz 1177036 SHA256 da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1 SHA512 93f86369fb050f4e564163bf516d9a4769b3b0f011416c891be9811520835d4fea007641b27939aa2eaa6d38f07ab53cc5635a20f9befd94824924ae38abac19 WHIRLPOOL 1254c823afc85b7ae02d1adb3b98775b89d7482070447d75419bd7886b1be11867f8b21668684dc7ce912ba48816a4b85d7d24bf65b6f1cde92ff83c6e5a7961 -DIST gdk-pixbuf-2.26.3.tar.xz 1175376 SHA256 a22373a72621c6f73e8c216410aeb46e3bb05b477e600b6ac481a47ecd4c09cc SHA512 866f88f572ce931b6a1b3911231f81a8b096ed5191c290c114934351ec88f0a7490dfdc276c252e953b2a28904722c0435ec4013c81ec8f09d9637b3be8f2c91 WHIRLPOOL c176ab2c8b9c61914b98e289847e932b71781fba2f5a741913738e8b21715ac31919d90ed9e4ac3028d9c52cdea944053b8771d4ab0e0670c374124df67437a1 DIST gdk-pixbuf-2.26.4.tar.xz 1181640 SHA256 a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be SHA512 a85d9fb8a206b6986abc8bc8caa079f5ddbd1c83226f80896439a06a7644d27fa1e9d80cc0a34ba82ce0877cdfaeaee8bc2548b016d25d314bcbbab44091ef76 WHIRLPOOL f452673a3d4b9e894d7e92a24ecca9c4551353d38c242ad7ddcde812ce55dd56b68d80b297957c3f3cd7a649837cd47412995b842082ae5abec81a02ec486b07 -EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2933 SHA256 8ecfd63a4cc05ee0c4c9ea97af47dd93dcc0ab7c61d3ccdfafd921dbf3052ecb SHA512 ef27b2066f35f8f3650dc659e5042d8918cf91bffca36a600f0cddc842ceadaaf59f63c057473e128663694ffdd2cb4fd890db3d7ff3b574c1f498a86733d4f0 WHIRLPOOL 8f0baa5d9dc7ca2b8871cccea98a6e105cef23d5b2146b0d75c1db0b0d3b43b5daca62125c38306cfa5d54e53013871f743c5a88e2631ec167206cb4f1f2bbb4 -EBUILD gdk-pixbuf-2.24.1-r1.ebuild 2920 SHA256 e444fe4d388a8732bd0153189e535df1a0c438d3947f17924cf18a3808a31a29 SHA512 ef8291a65ff796fe63dfde3592621ed8f742e647090cf4b28b6675fdaa6ad409fa458c7101fb203d5c8a03b0948a9ee9dca00b74f3999ad52fa8fd3b35559d50 WHIRLPOOL 3e5c7f5e0a5fab80ea98877201417462978156025d30b1b2edd796be826bedbf8802ec78c27f3be2968a27df4d5b17fef635e2862141106a0e46de30f04ab23e -EBUILD gdk-pixbuf-2.24.1.ebuild 2814 SHA256 6ba2c1537d15d824ad357330d448d0c6f0724dbc3d99f56a176e187044d61200 SHA512 d8cf5e7a1528a6c848c9a83b8cd995900a43c34bc8cb914725b9f64ab66653cab6e236c450784d0500858ffd69d52b9ade3b6d567ed536b7d1aae0d10a30e5fa WHIRLPOOL d86b7caf9636d89a8b19029b09c89625b04de84ef104b7c439a35f451b1313f1f5a1170731cd62a2d32fc86670b53a12ab04412da24f19d3972f7ad3c363ef08 -EBUILD gdk-pixbuf-2.26.3.ebuild 2834 SHA256 0143f5f107b1205e09db3777b911ed8dd6898d9ab9070bceab3a5cf4f9b4eca9 SHA512 d630c3f16fa42b866376f63a49486dac28e0c9f8ec608be83d981d107815e0d1149f4fe320aae54ed3f1fad9f5846f7879c23be94f279d34a839256afa8184f1 WHIRLPOOL 203386582b770e17beb4f111bc36ff50c3965932956460413c25576a4a839068223422e5efb2ea2a5e1b81957802e3692d4176a0010a580f9bfdf2d5ae93f5a6 -EBUILD gdk-pixbuf-2.26.4.ebuild 2822 SHA256 8e117b3f710b8f14f7c5a01e19620f6ea5610d37710e45520ee41b906e77ebb7 SHA512 04d7229f31bf9f9d4405cb9109e09b47e5d8b51eaa732f61565da6681694b0b52df74ff37ac11c9c3315b4406f7349b9fb89b7b75e0afb0d0604cea4812fefcb WHIRLPOOL 07e404f829153530c9cc7b9b9070125fce07eda24f16a6e196b5a5b6356b8ec8aa2c9700170a75808f6e9f44acaff2c55aa10114bd3c7e31807dad47ceed2c6d -MISC ChangeLog 11151 SHA256 2d767d6212d4f0eb00e288d355a86b0bbfa1b98a12e3cca988acb20fd0d959c6 SHA512 560464e4efce73b40344b86b49da5ebdc7e2d8659971f95a22911e4acf9359ae53e83b884d575cfe265222d9fffb14d3db742cf29845e2e50692af8508763d46 WHIRLPOOL 8956d3895e60eecd28d06299f6b8f7dd5f8038eda08fa96faea311e40814dca840f4a0cb587cb6be94350daddae4dfb2bb8c22ec3d9a536c8ae545cfc0c0d395 +DIST gdk-pixbuf-2.26.5.tar.xz 1181336 SHA256 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 SHA512 2988dd550aac92c2633c5443c712be8e3c06d852190251d6436ef2457c43ccce48ef795f7b187ef975b643a0bc4fc407f8b539fd627dc05a69d7ee4b210244ee WHIRLPOOL 2a05fb5501a72fcb4acb502c542509a845406b1905e7750097de2c555dc5222b903bb7f1d4e953fdf19e4d6dd1b7acae6f6bceadcd26687d3b628f8c4cc654da +EBUILD gdk-pixbuf-2.24.1-r1.ebuild 2819 SHA256 6679884e054e73b5961ea9d00ef00ba1f332042de7dba28f1041ce236f150058 SHA512 2b00ea9b735e123cc3713122b72f705a6dcfd00f76de48222e45301ab7c3b199d7fa1cc9e8927c23e4f2f6d81b6a63145a2d1bd5e56314bc49fdd0f112d76dc1 WHIRLPOOL 2d61b8cdd56591791e8b9c1e3237f7a81b50d49016dc55ceebf77030c1d0cdb947cf992f1bae90125a8747b08c33243ebd2c7306e9afe76b69fd4fdfafc81b49 +EBUILD gdk-pixbuf-2.26.4.ebuild 2723 SHA256 e1c3a9c313ad1400c8d4383030f98e29d28df86b846893f485a3bd0cb54d0273 SHA512 8e0de7685a3d0d4981edb6fdad3536611f2945045f7748378f5b71616b5fd76de127228f205d2baaf723ce7d8c17edf6eed6c7385b45da2e34a3f25d7d4244f9 WHIRLPOOL 0a35ed032c2da2de57740d4b227a05f603d47850f24bc9459cbf5ab6cef1f0b753da917a110dae941510127fca875afd77755a454e9832f9b00bed09ea62cd94 +EBUILD gdk-pixbuf-2.26.5.ebuild 2719 SHA256 8086e61828a7969b0a7458f2df8a10426677e55b1337254e32e791b8fc097a7a SHA512 03ad4d6ff8e7cd23a9b9c00fd6aa37a6f79e0d46f09c94b8a219ec294d294bb3872bb30bf8b7b4e6e71ffa61114e8b03147504dc92199691b36b17b0c93fcfdd WHIRLPOOL 0a2778590bcca0abb50ea26ae4f078b47d82e6bc1045df7eff23d8bac7f66862d20558f69e08e6efd80dc8958c0a5e90520fff761fa04ed10b6327655af60bff +MISC ChangeLog 11603 SHA256 c310799ab38d2ef11bf746dc38fdc32ed2396f32857a215badd50c3312a7f126 SHA512 8016cd30ff271108e916f910065cd1b906a336e492e43397c6bcf1f8d4186e8ce445d8b0cf71c2821b3e9cdd2bf11353b93be3c15676d9717dc6ad7b58f3d6a0 WHIRLPOOL 7979dad8c9e04126419377766a77f365cc24be922807065a5fe84e5e4d1b8c336c677d1059f542bb97576fadcbb555b04904d01db28b60371aaecb372e1e3435 MISC metadata.xml 285 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0 SHA512 530f007c5e32d2a70d601342642e306f5a4ac40b07aa540b43aafb5708184b4cfd3d7e52fabac76aae590e562e2a1a5ba601f316f3f63f40d29d7dfee036c776 WHIRLPOOL 5783ba665a7ee8dc468d562c30716f10ed5468345c8e0ed088966b999ba39eea01ed84758da2fa1322a3f771e2d4283a010bf03e0e197e8cb4b6cbd49f6d3c22 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlCNT6UACgkQuQc30/atMkAzrgCgqLexf3i4q5qjDRUaPC9e4aHw -wJwAmgJAoRNHAmOEavNJn82A7luyUr+P -=wxnf +iQEcBAEBCAAGBQJQnewGAAoJEJ0WA1zPCt1hMQgH/RqAugnrYovf/uwMDhfRb1d+ +CyreSmSdn6auiD4V09WJ/YDvfhHnvoPL4ZgAUzbukqSP8RD1HOyH7pbjITTixJlJ +5hkGmZYw8NnoU8Q3QhVVE2No2GMtMCUe/cfHOkN3NK3ZnTOs57XQeUWq0E8SLERi +3L0E63QRJ/SHKx6T+GaHc6V0Y6DQPk0/uIAZyhFNTDcDQU1uXCJRkf8NMg+krFma +3KXYpU6PqrZPZVtOBFxy9BG6Ha6AMW9MZCKmgtxYBnRq4UqiHyb8Yw82gleVh3Gw +Ia5iLRnERHN8/Sc6LA0/3MFqg1aejmsH/3MtomrlSPvo4CTacr9MLFGw0td9YBE= +=SObv -----END PGP SIGNATURE----- diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch deleted file mode 100644 index ae7ec2c905a6..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch +++ /dev/null @@ -1,24 +0,0 @@ -Adds a new configure option to remove the automagic dependency on libX11. - ---- configure.ac -+++ configure.ac -@@ -929,7 +929,18 @@ GDK_PIXBUF_XLIB_PACKAGES= - GDK_PIXBUF_XLIB_EXTRA_CFLAGS= - GDK_PIXBUF_XLIB_EXTRA_LIBS= - --if $PKG_CONFIG --exists x11; then -+AC_ARG_WITH(x11, -+ AC_HELP_STRING([--with-x11=@<:@no/auto/yes@:>@], -+ [build X11 support @<:@default=auto@:>@]),, -+ [ -+ if $PKG_CONFIG --exists x11; then -+ with_x11=yes -+ else -+ with_x11=no -+ fi -+ ]) -+ -+if test x$with_x11 = xyes; then - AM_CONDITIONAL(USE_X11, true) - PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0) - else diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild deleted file mode 100644 index b1e3a8c3ec2a..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2012 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.24.0-r1.ebuild,v 1.15 2012/09/18 09:44:29 tetromino Exp $ - -EAPI="4" - -inherit eutils gnome.org multilib libtool autotools - -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 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+X debug doc +introspection jpeg jpeg2k tiff test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.27.2:2 - >=media-libs/libpng-1.4:0 - introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.9.2:0 ) - X? ( x11-libs/libX11 )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.17 - >=dev-util/gtk-doc-am-1.11 - doc? ( - >=dev-util/gtk-doc-1.11 - ~app-text/docbook-xml-dtd-4.1.2 )" -# 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() { - # Only build against libX11 if the user wants to do so, upstream bug #657569 - epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch - - # This will avoid polluting the pkg-config file with versioned libpng, - # which is causing problems with libpng14 -> libpng15 upgrade - sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die - eautoreconf -} - -src_configure() { - # png always on to display icons (foser) - local myconf=" - $(use_enable doc gtk-doc) - $(use_with jpeg libjpeg) - $(use_with jpeg2k libjasper) - $(use_with tiff libtiff) - $(use_enable introspection) - $(use_with X x11) - --with-libpng" - - # Passing --disable-debug is not recommended for production use - use debug && myconf="${myconf} --enable-debug=yes" - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS* README* - - # New library, remove .la files - find "${D}" -name '*.la' -exec rm -f '{}' + || die -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - tmp_file=$(mktemp -t tmp_gdk_pixbuf_ebuild.XXXXXXXXXX) - # be atomic! - gdk-pixbuf-query-loaders > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" - else - ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run" - fi - rm "${tmp_file}" - - 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 -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild index 8f39c7af531a..1f786837e68d 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.24.1-r1.ebuild,v 1.11 2012/09/18 09:44:29 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild,v 1.12 2012/11/10 05:54:13 tetromino Exp $ EAPI="4" @@ -9,10 +9,10 @@ inherit eutils gnome.org multilib libtool autotools DESCRIPTION="Image loading library for GTK+" HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2" +LICENSE="LGPL-2+" SLOT="2" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+X debug doc +introspection jpeg jpeg2k tiff test" +IUSE="+X debug +introspection jpeg jpeg2k tiff test" COMMON_DEPEND=" >=dev-libs/glib-2.27.2:2 @@ -23,12 +23,9 @@ COMMON_DEPEND=" tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 )" DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.17 >=dev-util/gtk-doc-am-1.11 - doc? ( - >=dev-util/gtk-doc-1.11 - ~app-text/docbook-xml-dtd-4.1.2 )" + >=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 @@ -49,7 +46,6 @@ src_prepare() { src_configure() { # png always on to display icons (foser) local myconf=" - $(use_enable doc gtk-doc) $(use_with jpeg libjpeg) $(use_with jpeg2k libjasper) $(use_with tiff libtiff) diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild deleted file mode 100644 index 97042c7dc442..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2012 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.24.1.ebuild,v 1.10 2012/09/18 09:44:29 tetromino Exp $ - -EAPI="4" - -inherit gnome.org multilib libtool autotools - -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 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+X debug doc +introspection jpeg jpeg2k tiff test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.27.2:2 - >=media-libs/libpng-1.4:0 - introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.9.2:0 ) - X? ( x11-libs/libX11 )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.17 - >=dev-util/gtk-doc-am-1.11 - doc? ( - >=dev-util/gtk-doc-1.11 - ~app-text/docbook-xml-dtd-4.1.2 )" -# 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() { - # This will avoid polluting the pkg-config file with versioned libpng, - # which is causing problems with libpng14 -> libpng15 upgrade - # See upstream bug #667068 - sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die - eautoreconf -} - -src_configure() { - # png always on to display icons (foser) - local myconf=" - $(use_enable doc gtk-doc) - $(use_with jpeg libjpeg) - $(use_with jpeg2k libjasper) - $(use_with tiff libtiff) - $(use_enable introspection) - $(use_with X x11) - --with-libpng" - - # Passing --disable-debug is not recommended for production use - use debug && myconf="${myconf} --enable-debug=yes" - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS* README* - - # New library, remove .la files - find "${D}" -name '*.la' -exec rm -f '{}' + || die -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - tmp_file=$(mktemp -t tmp_gdk_pixbuf_ebuild.XXXXXXXXXX) - # be atomic! - gdk-pixbuf-query-loaders > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" - else - ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run" - fi - rm "${tmp_file}" - - 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 -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild index b9a9bdfb3bb1..70351c369438 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.26.4.ebuild,v 1.8 2012/10/28 15:30:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild,v 1.9 2012/11/10 05:54:13 tetromino Exp $ EAPI="4" @@ -9,10 +9,10 @@ inherit gnome.org multilib libtool DESCRIPTION="Image loading library for GTK+" HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2" +LICENSE="LGPL-2+" SLOT="2" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+X debug doc +introspection jpeg jpeg2k tiff test" +IUSE="+X debug +introspection jpeg jpeg2k tiff test" COMMON_DEPEND=" >=dev-libs/glib-2.31.0:2 @@ -23,12 +23,9 @@ COMMON_DEPEND=" tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 )" DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17 - virtual/pkgconfig >=dev-util/gtk-doc-am-1.11 - doc? ( - >=dev-util/gtk-doc-1.11 - ~app-text/docbook-xml-dtd-4.1.2 )" + >=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 @@ -49,7 +46,6 @@ src_prepare() { src_configure() { # png always on to display icons (foser) local myconf=" - $(use_enable doc gtk-doc) $(use_with jpeg libjpeg) $(use_with jpeg2k libjasper) $(use_with tiff libtiff) diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild index 72d1d62554de..b248b2ca0c98 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.3.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild @@ -1,21 +1,21 @@ # Copyright 1999-2012 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.26.3.ebuild,v 1.2 2012/09/18 09:44:29 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild,v 1.1 2012/11/10 05:54:13 tetromino Exp $ EAPI="4" -inherit gnome.org multilib libtool +inherit eutils gnome.org multilib libtool DESCRIPTION="Image loading library for GTK+" HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2" +LICENSE="LGPL-2+" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+X debug doc +introspection jpeg jpeg2k tiff test" +IUSE="+X debug +introspection jpeg jpeg2k tiff test" COMMON_DEPEND=" - >=dev-libs/glib-2.31.0:2 + >=dev-libs/glib-2.34.0:2 >=media-libs/libpng-1.4:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg ) @@ -23,12 +23,9 @@ COMMON_DEPEND=" tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 )" DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.17 >=dev-util/gtk-doc-am-1.11 - doc? ( - >=dev-util/gtk-doc-1.11 - ~app-text/docbook-xml-dtd-4.1.2 )" + >=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 @@ -49,7 +46,6 @@ src_prepare() { src_configure() { # png always on to display icons (foser) local myconf=" - $(use_enable doc gtk-doc) $(use_with jpeg libjpeg) $(use_with jpeg2k libjasper) $(use_with tiff libtiff) @@ -68,7 +64,7 @@ src_install() { dodoc AUTHORS NEWS* README* # New library, remove .la files - find "${D}" -name '*.la' -exec rm -f '{}' + || die + prune_libtool_files --modules } pkg_postinst() { |