diff options
Diffstat (limited to 'x11-themes/tango-icon-theme-extras')
| -rw-r--r-- | x11-themes/tango-icon-theme-extras/Manifest | 5 | ||||
| -rw-r--r-- | x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch | 14 | ||||
| -rw-r--r-- | x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch (renamed from x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch) | 29 | ||||
| -rw-r--r-- | x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild | 31 |
4 files changed, 39 insertions, 40 deletions
diff --git a/x11-themes/tango-icon-theme-extras/Manifest b/x11-themes/tango-icon-theme-extras/Manifest index 38c8b3bd0d7e..e4bef527fd78 100644 --- a/x11-themes/tango-icon-theme-extras/Manifest +++ b/x11-themes/tango-icon-theme-extras/Manifest @@ -1,5 +1,4 @@ -AUX tango-icon-theme-extras-0.1.0-MKDIR_P.patch 344 BLAKE2B 378ba2896ee6f7012703710542c16b87f2a867c4c8d0a760499ea76a3c5ea752e9f91d131f84e0c3c73b0914bd5ae2979a2c4e17e9eb15d2c0734f5e327e5e01 SHA512 3cc0b296c6aa3ac52d9e0ff3e9b05904a6e19e79944c637dd3980723a749d03a46886f34021614a2af29709771067c65f89807b7df9b887ae96619bc396c246b -AUX tango-icon-theme-extras-0.1.0-graphicsmagick.patch 823 BLAKE2B 2b09e8248547cc5a0259102d266a2c4971b5f054454fa6695a6e98551d19e43d1e7a5e694cb9d80317648b89d146647e7dc8618c4ebb807aeab81fb29e7e3498 SHA512 9cd58e3e2c3d9b4205c5ff7d5a3d073bbf6843e894cb7867377ff9fba6a02799e11531a86758c1b7a95573e4551bbc09194723fb12863931c9e8dbcc2ae3fc29 +AUX tango-icon-theme-extras-0.1.0-autotools.patch 1354 BLAKE2B a35301cf4c29370536bb339b8aa5952057492ab690cc242755aa09b038975d062ead10e34804994c1ab931ca169a85c2f8176b0e076fdadd271eef4fa4851bb3 SHA512 af2932560582296246e5d04214973dad5d7747cdb48c2f01a5d62ab93dad6ad6816f584b702ddb5d15bb81ce6d06bf059e300d2e9ab73ce999d3d978924e88b1 DIST tango-icon-theme-extras-0.1.0.tar.gz 228375 BLAKE2B 4864f097fb13ad40902b046b21faa586f59575d97d75def7bad5c3fbb1b3a7eb5f539653a070158a2dfc39553270b2883b718cd8392159690bca0828f2642a65 SHA512 017ddcbf1109332cdcc5537e07e467485697571c87c192b8d0367290eacf8c6cc4d00313e24cf298fcf23dd612cc4f6125590c3df34f1484bd7deebfb307494c -EBUILD tango-icon-theme-extras-0.1.0-r2.ebuild 1185 BLAKE2B 99c243a6f4bf5d62fb53c7bfebe0fdf3bcbacba0aacb8d8daa43a981b2070bc96d9ea8b81354e6483eb73500c5d97bf242ca3ff841d613ad7f686fd8f16b5c54 SHA512 c1fb50307d3f6b1663f2c574167e7d0af35c70cbb146d503896fee34dcb4e212a496d93ba6bbeee082bbf85f887df4b4a9d10a0e88923f6ede01e247177ade64 +EBUILD tango-icon-theme-extras-0.1.0-r2.ebuild 882 BLAKE2B 4d18db7c570a0cd60ff285db96da7cfbd0f8cb5543ac69eafdc4d2ff008eac67d9e51c4a2b1253cd62411ae0a54365cf83258ff8c9a3809b34b6b18fd60ea329 SHA512 005b5c3ad668f574e61665edd45b3fb33bf08f3ab0e6b4252025d14e514f27ff0cf3f11cb43af9e9bed7706a0d16c7e546ea9783e8856cef7d3508f8b4ae47d9 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44 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 f757248c8f54..000000000000 --- 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 index 446d42c8f433..1bce972ea285 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 359cd9fad71b..102e33b7dc4b 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; } |