From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- mate-extra/mate-utils/Manifest | 7 +- .../mate-utils-1.22.1-make-inkscape-optional.patch | 192 --------------------- mate-extra/mate-utils/mate-utils-1.22.0.ebuild | 65 ------- mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild | 68 -------- mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild | 2 +- 5 files changed, 2 insertions(+), 332 deletions(-) delete mode 100644 mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch delete mode 100644 mate-extra/mate-utils/mate-utils-1.22.0.ebuild delete mode 100644 mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild (limited to 'mate-extra/mate-utils') diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest index 2afcf02f2983..6997177a3f40 100644 --- a/mate-extra/mate-utils/Manifest +++ b/mate-extra/mate-utils/Manifest @@ -1,11 +1,6 @@ -AUX mate-utils-1.22.1-make-inkscape-optional.patch 8395 BLAKE2B 139854ae3e3c94aa561deef18d81ca18bc25cdcb6d4f1b27633cd2f120caf453dbc03b1c93acc54ba92120112687d30e8f5cef5d3b3e7821f8189083333500ab SHA512 7d8f3b8b0b9ee34d8c891dc996eb67907ce48964c3235eecaff32a74ad744a9cb7b2b12b347ce0102ab7eff34c1a85094b22adfbc8f7ea759ba83bbcab86f72a AUX mate-utils-1.22.2-gcc-10-fno-common.patch 1022 BLAKE2B 772c831ae0c4ed0c640d2d4302c08335b83b4e1bb0d88cb7e0bb84ac7709edc3bc28c7f81d59531b502610e6676e8cba37e10c7de1572e4530c27b58f40a4f37 SHA512 9c4252dc5fd68b0fff87c19ae46c02da634ea238537ab2fb3be7614726e289607ac85d551f5ad5f22e162cc7bfbb2ea1fc6be5523ccf44b5912e56ffea31e997 -DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70 -DIST mate-utils-1.22.1.tar.xz 7284496 BLAKE2B 83e7e39a0daadae595ab2cc90ad250f61a294afc896df28bf17259cec619af4b0c9d1927c07b03a0cdd7449174af258227678299823169e2cb4d9c4d3ec98c92 SHA512 0f70f088de80440ff6954c899eab75c2bf22d332293c1ec61bf8391396ed31a2ab126279dc4d9dab6f4932225120309bc52e122bcd5a8dc17abccfd6e480390d DIST mate-utils-1.22.2.tar.xz 7306448 BLAKE2B 0fb28f85e39ac58c1e78e6f5f4c6d01e72a2b8c32197739b93ec3f17617b4676fdfe251b81e3b5b01c44f69136d9bfc8d12d64fff832d5a9f1c30591b2facebb SHA512 bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c -EBUILD mate-utils-1.22.0.ebuild 1306 BLAKE2B f19e55915234d9aee662a2200db160fae980e11db87d0f0e583036c08d51973cb01133a83214606d0ee236e9b07583a6ab792db2f31424bf924893d7514f913c SHA512 a5bf9bd7266506356521cea66be6d0b3ea22a6221f94190af0522f7fc1fed261785583a466d7f60789258f73eadc7b29ec2efa9cebf67ee81afab1b2bad49c9c -EBUILD mate-utils-1.22.1-r1.ebuild 1397 BLAKE2B d1fa2e028a80a282bc24a6ee737c11cdd6bda68ac7ed1b4173beb6d81bb1364b41e6d0d42ee0302a40ef8364ea40c1c97784a14c0598dc12da7f9d615d3e7ab8 SHA512 f642f6d9dde2917e988741958c2de7f7b6d88627dfe180b7be963ce4f582c231ebe2a9006b1df825d1dc32ec8a6c1c5e133dbc989640ce4c283ef628970bbc8c -EBUILD mate-utils-1.22.2-r1.ebuild 1365 BLAKE2B 522cdf2c0b26c404e425b7074ad76ca33a6fc7424a08512f9767309a4d9701ff5823aee88707430caef7e53fa9d09cf2f815fae7da5e9cb626c2bf3c9e7880d9 SHA512 b5b37c5afb0bd14bca0e49587a808d819bfb91844b325a4662e298cfebf6f25c18434870b086506339811722e0907bd6fca361a0fe76930ee244ddd79e0dc320 +EBUILD mate-utils-1.22.2-r1.ebuild 1363 BLAKE2B 9359f0dffa230b21ea9e2fb7190ec4d9bff60be87a057aaf6859651346f438396ab1c885a1ec503bae9f487bfafd440f9cdc474907f91a4a24a5f4b39d62ba42 SHA512 59b1ff239be0649938702c11206c321b0abbb94fa2a6dfeba1e9975605d35c1f1f6af6b256cee47cda68c160e2a1066a27302624879e6c01198f074b652e819c EBUILD mate-utils-1.24.0.ebuild 1427 BLAKE2B f95fb1d0fd7fc14cc034d3da299fa20faa02616e31ee5240666e5f8c8499da4371ff6721a80c7afb13b64c8ce0ec4db75b900aa0e709ec98c1252961e92cfcbc SHA512 ba54d08e0fbfd512c1a84862d2b5484d601c0a03328e4a2d01e469960b66f090c47cfdb694311de7f375c6a3711e73b38b9dfa0a2ab1ab049797b37ef13f7f9a MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4 diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch b/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch deleted file mode 100644 index 57d984b91cc4..000000000000 --- a/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 563dec11a51f4c6517509642e335a1fd64cd4ec4 Mon Sep 17 00:00:00 2001 -From: rbuj -Date: Thu, 2 May 2019 20:51:09 +0200 -Subject: [PATCH] Make inkscape and rsvg-convert optional - -TEST on Fedora: -inkscape, librsvg2-tools package are not installed on system: The user can build, install and distribute the package: - - $ sudo dnf remove inkscape librsvg2-tools -y - $ ./configure --prefix=/usr - $ make - $ sudo make install - $ make distcheck - -logview/data/icons: - -Can not run build-png-icons target if inkscape package is not installed on system: - - $ make -C logview/data/icons clean-png-icons -make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' -rm -f hicolor_apps_16x16_mate-system-log.png hicolor_apps_22x22_mate-system-log.png hicolor_apps_32x32_mate-system-log.png hicolor_apps_48x48_mate-system-log.png hicolor_apps_256x256_mate-system-log.png -make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' - $ make -C logview/data/icons build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' -make: *** No rule to make target 'hicolor_apps_16x16_mate-system-log.png', needed by 'build-png-icons'. Stop. -make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' - -Can run build-png-icons target if inkscape package is installed on system: - - $ sudo dnf install inkscape -y - $ ./configure --prefix=/usr - $ make -C logview/data/icons build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' -Background RRGGBBAA: ffffff00 Area 303:65:319:81 exported to 16 x 16 pixels (96 dpi) Bitmap saved as: hicolor_apps_16x16_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 303:101:325:123 exported to 22 x 22 pixels (96 dpi) Bitmap saved as: hicolor_apps_22x22_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 304:142:336:174 exported to 32 x 32 pixels (96 dpi) Bitmap saved as: hicolor_apps_32x32_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 296:202:344:250 exported to 48 x 48 pixels (96 dpi) Bitmap saved as: hicolor_apps_48x48_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 33:11:289:267 exported to 256 x 256 pixels (96 dpi) Bitmap saved as: hicolor_apps_256x256_mate-system-log.png -make: Nothing to be done for 'build-png-icons'. -make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' - -baobab/pixmaps: - -Can not run build-png-icons target if librsvg2-tools package is not installed on system: - - $ make -C baobab/pixmaps clean-png-icons -make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' -rm -f hicolor_apps_16x16_mate-disk-usage-analyzer.png hicolor_apps_22x22_mate-disk-usage-analyzer.png hicolor_apps_32x32_mate-disk-usage-analyzer.png hicolor_apps_48x48_mate-disk-usage-analyzer.png hicolor_apps_128x128_mate-disk-usage-analyzer.png -make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' - $ make -C baobab/pixmaps build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' -make: *** No rule to make target 'hicolor_apps_16x16_mate-disk-usage-analyzer.png', needed by 'build-png-icons'. Stop. -make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' - -Can run build-png-icons target if librsvg2-tools package is installed on system: - - $ sudo dnf install -y librsvg2-tools - $ ./configure --prefix=/usr - $ make -C baobab/pixmaps build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' -/usr/bin/rsvg-convert -w 16 -h 16 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_16x16_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 22 -h 22 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_22x22_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 32 -h 32 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_32x32_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 48 -h 48 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_48x48_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 128 -h 128 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_128x128_mate-disk-usage-analyzer.png -make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' - -Closes #223 ---- - baobab/pixmaps/Makefile.am | 6 ++++-- - configure.ac | 8 ++------ - logview/data/icons/Makefile.am | 31 ++++++++++++++++++++++++------- - 3 files changed, 30 insertions(+), 15 deletions(-) - -diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am -index f36e8bf3..6804bef9 100644 ---- a/baobab/pixmaps/Makefile.am -+++ b/baobab/pixmaps/Makefile.am -@@ -11,8 +11,10 @@ public_icons = \ - hicolor_apps_scalable_mate-disk-usage-analyzer.svg \ - $(NULL) - -+if HAVE_RSVG_CONVERT - hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg - $(RSVG_CONVERT) -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@ -+endif - - EXTRA_DIST = \ - $(public_icons) \ -@@ -20,7 +22,7 @@ EXTRA_DIST = \ - - ############################################################################### - --install-icons: $(public_icons) -+install-icons: | $(public_icons) - for icon in $(public_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ -@@ -57,7 +59,7 @@ update-icon-cache: - fi - - .PHONY: build-png-icons clean-png-icons --build-png-icons: $(png_icons) -+build-png-icons: | $(png_icons) - - clean-png-icons: - rm -f $(png_icons) -diff --git a/configure.ac b/configure.ac -index d65e5b54..0907e194 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,13 +31,9 @@ AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) - - dnl ICONS: convert svg to png - AC_PATH_PROG(RSVG_CONVERT, rsvg-convert) --if test x$RSVG_CONVERT = x ; then -- AC_MSG_ERROR([could not locate rsvg-convert]) --fi -+AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "x$RSVG_CONVERT" != x]) - AC_PATH_PROG(INKSCAPE, inkscape) --if test x$INKSCAPE = x ; then -- AC_MSG_ERROR([could not locate inkscape]) --fi -+AM_CONDITIONAL([HAVE_INKSCAPE], [test "x$INKSCAPE" != x]) - - MATE_COMPILE_WARNINGS([yes]) - -diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am -index 9db44489..30fff904 100644 ---- a/logview/data/icons/Makefile.am -+++ b/logview/data/icons/Makefile.am -@@ -17,20 +17,37 @@ public_icons = \ - hicolor_apps_scalable_mate-system-log-symbolic.svg \ - $(NULL) - -+if HAVE_INKSCAPE - hicolor_apps_16x16_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_22x22_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_32x32_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_48x48_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_256x256_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) -+endif - - noinst_DATA = \ - logview.svg \ -@@ -43,7 +60,7 @@ EXTRA_DIST = \ - - ############################################################################### - --install-icons: -+install-icons: | $(public_icons) - for icon in $(public_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ -@@ -80,7 +97,7 @@ update-icon-cache: - fi - - .PHONY: build-png-icons clean-png-icons --build-png-icons: $(png_icons) -+build-png-icons: | $(png_icons) - - clean-png-icons: - rm -f $(png_icons) diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild deleted file mode 100644 index 1d7235cde03e..000000000000 --- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="Utilities for the MATE desktop" -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+" -SLOT="0" - -IUSE="X applet debug ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=gnome-base/libgtop-2.12:2= - >=media-libs/libcanberra-0.4[gtk3] - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango - applet? ( >=mate-base/mate-panel-1.17.0 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -src_prepare() { - # Make apps visible in all DEs. - LC_ALL=C find . -iname '*.desktop.in*' -exec \ - sed -e '/OnlyShowIn/d' -i {} + || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-maintainer-flags \ - --enable-zlib \ - --enable-debug=$(usex debug yes minimum) \ - $(use_with X x) \ - $(use_enable applet gdict-applet) \ - $(use_enable ipv6) -} diff --git a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild deleted file mode 100644 index eda93518f5ea..000000000000 --- a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Utilities for the MATE desktop" -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+" -SLOT="0" - -IUSE="X applet debug ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=gnome-base/libgtop-2.12:2= - >=media-libs/libcanberra-0.4[gtk3] - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango - applet? ( >=mate-base/mate-panel-1.17.0 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - gnome-base/librsvg - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -PATCHES=( "${FILESDIR}/${PN}-1.22.1-make-inkscape-optional.patch" ) - -src_prepare() { - # Make apps visible in all DEs. - LC_ALL=C find . -iname '*.desktop.in*' -exec \ - sed -e '/OnlyShowIn/d' -i {} + || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-maintainer-flags \ - --enable-zlib \ - --enable-debug=$(usex debug yes minimum) \ - $(use_with X x) \ - $(use_enable applet gdict-applet) \ - $(use_enable ipv6) -} diff --git a/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild index 63022e807b7b..b58cd086c832 100644 --- a/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild +++ b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild @@ -8,7 +8,7 @@ MATE_LA_PUNT="yes" inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="Utilities for the MATE desktop" -- cgit v1.2.3