2 files changed, 24 insertions, 19 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 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