commit: 74c0ee1311223f86b0783bc5d1a49b5d8f2a30c5 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Dec 24 11:53:26 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Dec 24 11:53:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c0ee13
x11-themes/tango-icon-theme: Port to EAPI 7 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../tango-icon-theme-0.8.90-rsvg-convert.patch | 11 ++++++ .../tango-icon-theme-0.8.90-r1.ebuild | 41 ++++++++++------------ 2 files changed, 30 insertions(+), 22 deletions(-) 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 00000000000..f681d55f840 --- /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 c4913359517..74c2e45634c 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; }
