diff options
Diffstat (limited to 'x11-themes/tango-icon-theme')
3 files changed, 32 insertions, 23 deletions
diff --git a/x11-themes/tango-icon-theme/Manifest b/x11-themes/tango-icon-theme/Manifest index 59c8e1741112..a820326a7e50 100644 --- a/x11-themes/tango-icon-theme/Manifest +++ b/x11-themes/tango-icon-theme/Manifest @@ -1,3 +1,4 @@ +AUX tango-icon-theme-0.8.90-rsvg-convert.patch 256 BLAKE2B 9b9fa859a97d5014a194e78d3a41ff9f967699ef7473532ab95298d76835457363d1affdb0f19703362405fb76841ce96101d1e473de6e3d35a0c001585cdad6 SHA512 5cc6e21de319463910ae7835f3e2e53eb9a5b59ccde99080b32a95e2f049763d9f0a4527fc79d81655e916345340af8352147ec7fea4d0c13c05955a395876c9 DIST tango-icon-theme-0.8.90.tar.gz 1790489 BLAKE2B da51dd7be2d6da84476f163ab1c94d2f0b1dd358ef980d7ff82488e775a92b4eb2f8c0d6705388615dd84225cbdab460c83ea7b81e99ff14a8cf036949361ead SHA512 78b909bfc8b126060f8a320f5465ee6af98533b5229ebe46952469ba9f08796189b1ad8110e0ffa1e5745d083cad292396af887c4f8792595b0b8d2891258a52 -EBUILD tango-icon-theme-0.8.90-r1.ebuild 1378 BLAKE2B a170eadb35056943e04035b689b2cda160a4b82f988e6df0ab347b6e23f6f5eda8352a0d76c965ff17744171807ecddb1b4076ff5647cf2f3212b3866cbbe898 SHA512 a365bb7af016af11a1787c03e57d68e79fc8ef2fa831ce13796c46281ab4d3916eed038c92d6be4e28ea897feab83d099986981979660c470b413263af181356 +EBUILD tango-icon-theme-0.8.90-r1.ebuild 1154 BLAKE2B 7e5111a8dd1c4641fb079265bc86b8cd18f5004d92c7007f50789bc76619355841bb85640079f09d4f021341a0fd7e5c63af5417fb30a4bc029f809eb7015014 SHA512 791d2826c40b306c3c4ccf8536464eeb0e42f87074b0e318bb00cc24ec3e85876cace8b5bf7f8e22fe63a78b43993925aae64b90605d210651be931f3d6945dd MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae diff --git a/x11-themes/tango-icon-theme/files/tango-icon-theme-0.8.90-rsvg-convert.patch b/x11-themes/tango-icon-theme/files/tango-icon-theme-0.8.90-rsvg-convert.patch new file mode 100644 index 000000000000..f681d55f8404 --- /dev/null +++ b/x11-themes/tango-icon-theme/files/tango-icon-theme-0.8.90-rsvg-convert.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -6554,7 +6554,7 @@ + enable_large_bitmaps=no + fi + if test "x$enable_large_bitmaps" = "xyes"; then +- svgconvert_prog="rsvg" ++ svgconvert_prog="rsvg-convert" + else + svgconvert_prog="ksvgtopng" + fi diff --git a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild index c4913359517a..74c2e45634cf 100644 --- a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild +++ b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit gnome2-utils +EAPI=7 + +inherit xdg DESCRIPTION="SVG and PNG icon theme from the Tango project" HOMEPAGE="http://tango.freedesktop.org" @@ -12,31 +13,31 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="minimal png" +RESTRICT="binchecks strip" RDEPEND="!hppa? ( !minimal? ( x11-themes/adwaita-icon-theme ) ) >=x11-themes/hicolor-icon-theme-0.12" -DEPEND="${RDEPEND} +BDEPEND=" dev-util/intltool - virtual/pkgconfig - >=gnome-base/librsvg-2.34 - virtual/imagemagick-tools[png?] + gnome-base/librsvg sys-devel/gettext - >=x11-misc/icon-naming-utils-0.8.90" - -RESTRICT="binchecks strip" + virtual/imagemagick-tools[png?] + virtual/pkgconfig + x11-misc/icon-naming-utils" -DOCS="AUTHORS ChangeLog README" +PATCHES=( + # https://bugs.gentoo.org/413183 + "${FILESDIR}"/${PN}-0.8.90-rsvg-convert.patch +) src_prepare() { - sed -i -e '/svgconvert_prog/s:rsvg:&-convert:' configure || die #413183 + xdg_src_prepare # https://bugs.gentoo.org/472766 - shopt -s nullglob - cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${cards}"; then - addpredict "${cards}" - fi - shopt -u nullglob + local d + for d in /dev/dri/card*; do + [[ -s ${d} ]] && addpredict "${d}" + done } src_configure() { @@ -49,7 +50,3 @@ src_install() { addwrite /root/.gnome2 default } - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } |