diff options
author | Gregory M. Tuner <gmt@be-evil.net> | 2014-01-22 15:17:11 -0800 |
---|---|---|
committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-01-22 15:17:11 -0800 |
commit | bef5f9973af5a0d5bb1b61f1767fa3876aa60d8e (patch) | |
tree | 9f742d5f766fbcd38e63b0ce94bcd247ebd35013 /x11-libs | |
parent | x11-libs/gdk-pixbuf: clone upstream (diff) | |
download | gmt-bef5f9973af5a0d5bb1b61f1767fa3876aa60d8e.tar.gz gmt-bef5f9973af5a0d5bb1b61f1767fa3876aa60d8e.tar.bz2 gmt-bef5f9973af5a0d5bb1b61f1767fa3876aa60d8e.zip |
x11-libs/gdk-pixbuf: multilib-utize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gdk-pixbuf/Manifest | 4 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild | 35 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1-r1.ebuild | 100 |
3 files changed, 20 insertions, 119 deletions
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 328015c..8158e09 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,7 +1,5 @@ AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35ca6d7d33350f7b5721dc06d88a7dc2a6 SHA512 54e7248076cdb1d446b5bb5ee09474461c775a0e51372602f10b0096f5c4779f01c739c75461d2c134565dacc03a38f298486ce814df8318410c8ab77ca5a8a7 WHIRLPOOL be4193a8e83733c031629d3a67e690b740180c9ac20eaac424119a3381a558c2b233524c599536276fe97b541f2d9d824dafa1642099b246a87df5deea497083 DIST gdk-pixbuf-2.28.2.tar.xz 1192936 SHA256 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 SHA512 2082e6f44aa8e986586da8f5797b7e9aae23c60021c5183ed6e1e2e99cef338ec1b20cf2baef19a337ac557eb585399377e92534d2f90222a68943b914d86656 WHIRLPOOL 7060b0b591d47b1eec43b01a29cde5903ee78f458a4623a66d66d6b0d83f32d08ae2c5aa9da9dfc328990168c477a879b501c34d6f24b3d93f38cd7cdb4b8a66 -DIST gdk-pixbuf-2.30.1.tar.xz 1294392 SHA256 a3263b1e15668c009313bf04ab67420bec9f2b167c402a71a486307cadee8d30 SHA512 70b1ce4bb67dc4dad73c610fd00e2f6050c411b702f58478045608114e5a1613f6373862ee0a6a47f9259f722ba64dd33a2d5fc7660f0af59bf53f261b5dac08 WHIRLPOOL 0e0ce99334ee12ea634b8f3557281e603a04534d5df78d35549d709d11f32b927d6cc69d253e706ad5a0e130270d186729fda0a682790329fe709d36ab50dc07 -EBUILD gdk-pixbuf-2.28.2-r1.ebuild 2758 SHA256 b10628b50411060dfe544f9fd0ee763d41bdc7202472081ee1204fc1a8b82fca SHA512 470b5b5f65cdd0d634858f6e74aa15c554d91a41c5cbc17e1c2a37d287639cbc22bcd52c3595c4f3814173b98207f972d3c068fa71e5c8611d0ee9787e2a38b3 WHIRLPOOL 337c5d866d476f92ef180af7289b3813d619f56302c2aa015ecd371d4e5e51b7553d7d0f458f4be7eae74e9abda214c5b4c7792d62603b24e096c36d4fe66f99 -EBUILD gdk-pixbuf-2.30.1-r1.ebuild 3009 SHA256 3b2e9df39f9f3ac6332ccefd84a3e5f9340fa20419655999513bb9441d7eb48f SHA512 20c874b328ce28587c937deb988c0b35a30df169dd031fe573856cc09125b2daf92686209facaef90b8afe5d357bd1ea47655971f2cc379c0ff28a7204405abe WHIRLPOOL 1a9aa360a876f29ad62077742f1b8a5f4e7737476fadfe7855492e548380b753abb8e55731def561d7fea250f07b0db94c85e24e509e506ce1230563e8dccf0b +EBUILD gdk-pixbuf-2.28.2-r1.ebuild 2794 SHA256 a01384d70e60e12e157646d74a2f8dfef658f1d7a5a63274e2e611d76f9005e5 SHA512 9adb7eec7a2bef9f37532f09f88d7bfd40035521efbcbd1bd53198108a6f7626e3972f0983ebfbbb37267257ec124e1d8bcabfd172a2c91d22f741fb1c1ae208 WHIRLPOOL efad1b622458f0d4be17fd17fb0d85448dca52fc5a217e58ba13159a04ce95fb12a51548c51a4de01b61dc18096a65eee32e4c203e4275f1b9bc310bcb351c4d MISC ChangeLog 14620 SHA256 0f3d2aa643f360797efe6f4eac0a88dea906fe301d06fa52a3815b0b9062e23c SHA512 c376198fbcbcd8b8762dcc6876e4325c26d259f81b638c2905cbd3bcfc03a4c37c2f7e76fd93a4b222c2f107c6b235a36ebae978a825782cad7e978f49eae7b5 WHIRLPOOL 6191d4fc3bbf07634530f89b9b810b0ff0651f1758c5269fec099d73c2dff55ef43ac3c873142ec86d638bd6e1f5a934e3fb2862eed1b6b5c184aaba76d8f2ae MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild index 2c2c90a..c656138 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild @@ -3,28 +3,28 @@ # $Header: $ EAPI="5" -inherit gnome.org gnome2-utils multilib libtool +inherit gnome.org multilib libtool gnome2-multilib 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" +KEYWORDS="~amd64" 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 ) + >=dev-libs/glib-2.34.0:2[${MULTILIB_USEDEP}] + >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.3[${MULTILIB_USEDEP}] ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) " DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.11 - >=sys-devel/gettext-0.17 + >=sys-devel/gettext-0.17[${MULTILIB_USEDEP}] virtual/pkgconfig " # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise @@ -43,13 +43,12 @@ src_prepare() { # 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, bug #???? + gnome2-multilib_src_prepare } src_configure() { # png always on to display icons - econf \ + gnome2-multilib_src_configure \ $(usex debug --enable-debug=yes "") \ $(use_with jpeg libjpeg) \ $(use_with jpeg2k libjasper) \ @@ -61,8 +60,7 @@ src_configure() { src_install() { # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 - MAKEOPTS+=" -j1" default - prune_libtool_files --modules + GNOME2_LA_PUNT=yes gnome2-multilib_src_install -j1 } pkg_preinst() { @@ -73,6 +71,7 @@ pkg_postinst() { # causes segfault if set, see bug 375615 unset __GL_NO_DSO_FINALIZER + # todo: figure out if this requires multilibutization or not? gnome2_gdk_pixbuf_update # Migration snippet for when this was handled by gtk+ @@ -85,6 +84,10 @@ pkg_postinst() { pkg_postrm() { if [[ -z ${REPLACED_BY_VERSIONS} ]]; then - rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache + multilib_foreach_abi abi_postrm fi } + +abi_postrm() { + rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache +} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1-r1.ebuild deleted file mode 100644 index 19f0b5b..0000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit 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.37.2: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() { - # 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, bug #???? -} - -src_configure() { - # png always on to display icons - 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() { - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 - MAKEOPTS+=" -j1" default - prune_libtool_files --modules -} - -pkg_preinst() { - gnome2_gdk_pixbuf_savelist - - # Make sure loaders.cache belongs to gdk-pixbuf alone - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - gnome2_gdk_pixbuf_update - - # Migration snippet for when this was handled by gtk+ - 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 -} |