commit: f89e03ad7cdf9102e9c399339f381e6b0280310b Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Dec 24 11:53:28 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Dec 24 11:53:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89e03ad
x11-themes/tango-icon-theme-extras: 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-extras-0.1.0-MKDIR_P.patch | 14 ---------- ... tango-icon-theme-extras-0.1.0-autotools.patch} | 29 ++++++++++++++++---- .../tango-icon-theme-extras-0.1.0-r2.ebuild | 31 +++++++++------------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch deleted file mode 100644 index f757248c8f5..00000000000 --- a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=486906 - -diff --git a/configure.ac b/configure.ac -index ce2bc5f..21cc450 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([svg2png.sh.in]) - - AM_INIT_AUTOMAKE([1.9 tar-ustar]) - -+AC_PROG_MKDIR_P - PKG_PROG_PKG_CONFIG([0.19]) - - # Workaround to make aclocal get the right flags diff --git a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch similarity index 53% rename from x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch rename to x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch index 446d42c8f43..1bce972ea28 100644 --- a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch +++ b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch @@ -1,8 +1,18 @@ -http://bugs.gentoo.org/314423 +https://bugs.gentoo.org/314423 +https://bugs.gentoo.org/413183 +https://bugs.gentoo.org/486906 ---- configure.ac -+++ configure.ac -@@ -39,9 +39,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -6,6 +6,7 @@ + + AM_INIT_AUTOMAKE([1.9 tar-ustar]) + ++AC_PROG_MKDIR_P + PKG_PROG_PKG_CONFIG([0.19]) + + # Workaround to make aclocal get the right flags +@@ -39,9 +40,6 @@ AM_CONDITIONAL(ENABLE_ICON_FRAMING, test x$enable_framing = xyes) if test "x$enable_framing" = "xyes"; then @@ -12,7 +22,7 @@ http://bugs.gentoo.org/314423 AC_PATH_PROG(CONVERT, convert) if test -z "$CONVERT"; then AC_MSG_ERROR([ImageMagick is required to build tango-icon-theme]) -@@ -50,9 +47,6 @@ +@@ -50,9 +48,6 @@ # Add the command line options we need here CONVERT="$CONVERT -bordercolor Transparent -border 1x1" AC_SUBST(CONVERT) @@ -22,3 +32,12 @@ http://bugs.gentoo.org/314423 fi # Check for rsvg or ksvgtopng for creating large scale bitmaps from svg +@@ -68,7 +63,7 @@ + PKG_CHECK_EXISTS([librsvg-2.0 >= 2.12.3], + [enable_large_bitmaps=yes], [enable_large_bitmaps=no]) + 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-extras/tango-icon-theme-extras-0.1.0-r2.ebuild b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild index 359cd9fad71..102e33b7dc4 100644 --- a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild +++ b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.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 autotools eutils gnome2-utils +EAPI=7 + +inherit autotools xdg DESCRIPTION="Tango icons for iPod Digital Audio Player devices and the Dell Pocket DJ DAP" HOMEPAGE="http://tango.freedesktop.org"; @@ -12,22 +13,20 @@ LICENSE="CC-BY-SA-2.5" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="png" +RESTRICT="binchecks strip" -RDEPEND=">=x11-themes/tango-icon-theme-0.8.90" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=gnome-base/librsvg-2.34 +RDEPEND="x11-themes/tango-icon-theme" +DEPEND="${RDEPEND}" +BDEPEND=" + gnome-base/librsvg virtual/imagemagick-tools[png?] - >=x11-misc/icon-naming-utils-0.8.90" - -RESTRICT="binchecks strip" + virtual/pkgconfig + x11-misc/icon-naming-utils" -DOCS="AUTHORS ChangeLog NEWS README" +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) src_prepare() { - epatch "${FILESDIR}"/${P}-graphicsmagick.patch - epatch "${FILESDIR}"/${P}-MKDIR_P.patch - sed -i -e '/svgconvert_prog/s:rsvg:&-convert:' configure{,.ac} || die #413183 + xdg_src_prepare eautoreconf } @@ -36,7 +35,3 @@ src_configure() { $(use_enable png png-creation) \ $(use_enable png icon-framing) } - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; }
