From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- x11-libs/gdk-pixbuf/Manifest | 9 +- x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild | 131 ---------------------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild | 143 ------------------------ x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild | 139 ----------------------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild | 4 +- 5 files changed, 3 insertions(+), 423 deletions(-) delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild (limited to 'x11-libs/gdk-pixbuf') diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 99d09be49a9e..2e433e28d350 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,11 +1,4 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d -DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9 -DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b -DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920 -DIST gdk-pixbuf-2.38.2.tar.xz 5509752 BLAKE2B f78ba049edc7b1a6c909746ec68948764b3602988e110ee2ad752d26d8b3a37c3f2957a91d3c8a5fe3455cf11b477eaa43d097554048e8988c563b4074bfd751 SHA512 b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa -EBUILD gdk-pixbuf-2.36.12.ebuild 4012 BLAKE2B 37df83a187e728f2d9796ef163a7b1dc87dad4804b6a245a5451b09c2e7bb0f5b75e81753fbcceaafeea24d902aa5f1e90c4a1f645d01db158738f1346acb107 SHA512 d3bdf7f546b3451c939aa62422a6673fbdf5b844718597895e9feadea017ebca8670ce47e4c5224b9239c40420c36382b79a324dbf92d87dd4ac819e406a8995 -EBUILD gdk-pixbuf-2.38.1-r1.ebuild 4019 BLAKE2B e504c2bf8227bd236f7f2a2de5166b396ec8edfaaa6592da40c6f63861e20add23f704ab2f57b53487d0ca424d3727820a3b9c9d93d02f7ff01084bd6943e6a4 SHA512 7716c02cc2b64cde65f434fa43f001a9b3fb4ab2608e4c575d50cac64b4a622c059ec158918a90eb1b329079c9aa78bd6613d139115ee6f145a3d8d938674fee -EBUILD gdk-pixbuf-2.38.2-r1.ebuild 3863 BLAKE2B 664593a683237f7e987b5feeb8a13d713f0ee513a723dc41b16126c84388b3e7c2ac3132826a141393f91ffffc80e28ca8e6bf41e30cb408d34761fec782e7f3 SHA512 b9543eb2055d4c73cef3eafdfbc55b0d3c35f45e635737102463669e34f76f7eb444d1056d7d6fa12d33bcf66116d8d4d7973f61979e218154900fa9a5d41ed3 -EBUILD gdk-pixbuf-2.40.0.ebuild 3855 BLAKE2B e619040cb8ccd2c9fbe2cc499c189810b22e960dfbf840fda36b87b012cba00fdfabd89367063d9b7d62be7c407cdbab00ffd15f364a98c266f5088cadbaf843 SHA512 357356802c23016a0851bfd490e80a67d09fa882f1d8825d937750afce288097940c71d7e5a8328d024cf081f1bb6d36443de20c9d6fd3a688d99f5cd54460e1 +EBUILD gdk-pixbuf-2.40.0.ebuild 3852 BLAKE2B c10991c5f1fdd0fb9553d4c68e0abbb3263b01e3009e5af3460f30e17ad085b46f690e0023baff8bd7f7f278ea27d2b8a753b68c01bd95a170e1391cd66f1452 SHA512 154d9aabf933ce7dda3223ad3f4eec1a4d8a249a3639dd72a5ef6d26a9b555a188855ae709d76b9d0f2ec1db9250c0b7962a5d71e35a8c5276e147c938d4acc5 MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild deleted file mode 100644 index f3e6666b170a..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit flag-o-matic gnome2 multilib multilib-minimal - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X debug +introspection jpeg tiff test" -RESTRICT="!test? ( test )" - -# Remove SRC_URI when gnome bug #795069 is fixed -SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )" - -COMMON_DEPEND=" - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) -" -DEPEND="${COMMON_DEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.19 - virtual/pkgconfig -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${COMMON_DEPEND} - ! 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 - [[ ${CHOST} == *-solaris* ]] && append-libs intl - - gnome2_src_prepare -} - -multilib_src_configure() { - # png always on to display icons - ECONF_SOURCE="${S}" \ - gnome2_src_configure \ - $(usex debug --enable-debug=yes "") \ - $(use_with jpeg libjpeg) \ - --without-libjasper \ - $(use_with tiff libtiff) \ - $(multilib_native_use_enable introspection) \ - $(use_with X x11) \ - --with-libpng - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die - fi -} - -multilib_src_install() { - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # 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 - } - - multilib_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - multilib_foreach_abi gnome2_pkg_postinst - - # 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() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild deleted file mode 100644 index e9a368ec3121..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X gtk-doc +introspection jpeg tiff" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -COMMON_DEPEND=" - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${COMMON_DEPEND} - ! 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 "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream" - sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die -} - -multilib_src_configure() { - local emesonargs=( - -Dpng=true - $(meson_use tiff) - $(meson_use jpeg) - -Djasper=false - $(meson_use X x11) - -Dbuiltin_loaders=png - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc docs) - $(meson_use introspection gir) - -Dman=true - ) - else - emesonargs+=( - -Ddocs=false - -Dgir=false - -Dman=false - ) - fi - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} - -pkg_preinst() { - xdg_pkg_preinst - - multilib_pkg_preinst() { - # 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 - } - - multilib_foreach_abi multilib_pkg_preinst - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - xdg_pkg_postinst - multilib_foreach_abi 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() { - xdg_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild deleted file mode 100644 index 751e7ed0fff8..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_* -# TODO: functions and eutils inherit for emktemp or some other solution - -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X gtk-doc +introspection jpeg tiff" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -DEPEND=" - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${DEPEND} - ! 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 "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream" - sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die -} - -multilib_src_configure() { - local emesonargs=( - -Dpng=true - $(meson_use tiff) - $(meson_use jpeg) - -Djasper=false - $(meson_use X x11) - -Dbuiltin_loaders=png - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc docs) - $(meson_use introspection gir) - -Dman=true - ) - else - emesonargs+=( - -Ddocs=false - -Dgir=false - -Dman=false - ) - fi - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} - -pkg_preinst() { - xdg_pkg_preinst - - multilib_pkg_preinst() { - # 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 - } - - multilib_foreach_abi multilib_pkg_preinst - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - xdg_pkg_postinst - multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - xdg_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT%/}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild index b12ae08a0959..e28fc5ce9fd5 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="X gtk-doc +introspection jpeg tiff" # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -- cgit v1.2.3