gentoo resync : 23.12.2017

14 files changed, 2 insertions, 329 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bfe3ad3f5630..669a63eb6efb 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 2528e969c4e4..9ce9119a7910 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,9 +1,5 @@
 DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
-DIST CairoSVG-1.0.7.tar.gz 29648 BLAKE2B 266c0b28b6b36087565fa519743dbdba6709d76718b97c85b0545f4d277ee3ce3192f3bd83bd46af1128a1a599fbed1fc312e4536e881f4ac2a4e6ad584ccac5 SHA512 1b10657f1e53b486f624ec00e952c3d2ba2f28b2a5d6cb6f66eb6441e8c51190bd75315e7a537d37eadff5ce4e0a52d3f4ebd7b36d81b2e9fd804ac92f2d83db
-DIST CairoSVG-1.0.tar.gz 28573 BLAKE2B d69ffa0ba1639a2932d6fdfbb3460c12d78d3e1aad3c9ca57a7366624179962726808d0741a0ed463d15a7ff6fd847f46395a35570ead8aedef60200f19f05e6 SHA512 26046de33feb5d7cbd8438d5fdf7f0e86e4f252c21478b51e764d7bf7800c8392a11a42a87666af6e008ad1e09f0749b57d06c566101d2a3e630e151703a3bb9
 DIST CairoSVG-2.0.3.tar.gz 39371 BLAKE2B a04e3e3d311167cef84063fd3eabc4ffa7c206c5c6fc8016283874411c344c686c441a3149631eccb38b610bb86a2ec3c193eec869b8802ddba1dac92c612215 SHA512 b7ad7be9bd06059392f2004e7cd5c1df1667dbae78482c68d681990a8b3a4141a9c4b72aa4af5075a87ac6a1a4ddf8311d991512be98128b21b87d4355c1bd3d
 EBUILD cairosvg-1.0.22.ebuild 718 BLAKE2B 66406ac10235747f6d972682a174538302404f3bd2bdd8dfd7cbdf3b218242932a965a90643c54c11b73dc382c83c0af762d26f87834869ff2de9ed02949da52 SHA512 e07573ec7f609d8f3e043c724a9b18f6c51705854557761c66f18f0c118a0a9f71d1af5d3964323cea132e6c8d6b16fbfffa5829db1b943d871323fde6dd57eb
-EBUILD cairosvg-1.0.7.ebuild 740 BLAKE2B b24b94f631ef6e094633bd24c2cb2d33ee2f1bd9632b038b23f1191666beefb5a1b654aed6a9ad5797a623c2165fce9f485825c4fc8a33ef966ebe19b117b32c SHA512 3df680c2896c5f598af0e377df61c5df541549b743b6f9ab81c0fa1ef8c9c29b70679ef12e42c9201522ad364abfdc7fb6d9dc44fa043a7fa937685ea3b92343
-EBUILD cairosvg-1.0.ebuild 692 BLAKE2B 1a9d49e0bb1b19d8502200703bad96bbc6a9b78e535b5d01b21989904972eb41e0a77d5bc2fcbcb9917698c99df4403e77a53fba31cfa17109461d0681cf0da5 SHA512 cee1307e3cc5ca1838793485ea941ddc0cbcf55347ef6453998bd836dca360e3c3d671c454210edd4914cef5d0c03a292847aecc3399b50b51ba4281a6016a47
 EBUILD cairosvg-2.0.3.ebuild 712 BLAKE2B ba745cddf2231e0bdcf76791cd57a8a965453e7e75fd24ea2043bf844129bc7b512335c65e10ae1be91753254163cc9113068b62146bfc00b776be223b9e5e5e SHA512 d94d1329bc42e90a88a153998a411f296ef2107a141f686eaeb6b775b45120c799acf4e32169882b501734303c6a473d935a385d72d111f95d5f8f563dba36df
 MISC metadata.xml 340 BLAKE2B 98ccd93460bbb405ae591ba8d5d216fcf57d07247bd2f03698b158eadaabf79d510393b32e7827f2d4a2e859e64f0ff3262ba4b6086baf5a0d893d942d516915 SHA512 48eddade88ce54234da4c04edc349a80d162f88ad6c96ee30b9434e792fe174654990efedabbe3927b78f54400c7aa61dcc8acd1776772d6e5bb31626cd31e4d
diff --git a/media-gfx/cairosvg/cairosvg-1.0.7.ebuild b/media-gfx/cairosvg/cairosvg-1.0.7.ebuild
deleted file mode 100644
index 96d048fc8c4d..000000000000
--- a/media-gfx/cairosvg/cairosvg-1.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple cairo based SVG converter with support for PDF, PostScript and PNG formats"
-HOMEPAGE="http://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/tinycss[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( NEWS.rst README.rst TODO.rst )
diff --git a/media-gfx/cairosvg/cairosvg-1.0.ebuild b/media-gfx/cairosvg/cairosvg-1.0.ebuild
deleted file mode 100644
index 4445b53c81d4..000000000000
--- a/media-gfx/cairosvg/cairosvg-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple cairo based SVG converter with support for PDF, PostScript and PNG formats"
-HOMEPAGE="http://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/tinycss[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( NEWS.rst README.rst TODO.rst )
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index dfb08a91a702..cd6c318d3646 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -6,5 +6,5 @@ DIST eom-1.18.2.tar.xz 2196228 BLAKE2B 6689a3b3b0954b7f29f12bd951adfe2d2a89de8c9
 EBUILD eom-1.12.2-r3.ebuild 1897 BLAKE2B acdf2fa81bae0814e7f9891810b146b58f77a959ae5fab53349868499d58c971c3af040fae0e49500a47253f65638d10beecd11fc84885eec1059f6da357356b SHA512 41e360632bd653ef941714e45bca87f8ff940729070ab1a31046f87726e92ba2c73b71eb092ffc258f7674a3cf420c0bad5726442d35fbd49fbaf354f067e795
 EBUILD eom-1.14.2.ebuild 1892 BLAKE2B 0298f92977d6368dfe624a78cbde84291db5a7f06774f2935b60ed33432dd06ab996661d8fdcc88525b2027d21627c4c7e9f46e30e8d857b1725a8147de4c4d6 SHA512 4d7e22033498bff1cad886de6d850977e913dce452f46d71c580c263103bb66cca9f4ee6ff3331d9b68e294fd52978bbda39df583be7472072957c0db4f56955
 EBUILD eom-1.16.0.ebuild 1892 BLAKE2B 0298f92977d6368dfe624a78cbde84291db5a7f06774f2935b60ed33432dd06ab996661d8fdcc88525b2027d21627c4c7e9f46e30e8d857b1725a8147de4c4d6 SHA512 4d7e22033498bff1cad886de6d850977e913dce452f46d71c580c263103bb66cca9f4ee6ff3331d9b68e294fd52978bbda39df583be7472072957c0db4f56955
-EBUILD eom-1.18.2.ebuild 1473 BLAKE2B 43879e5a346f9e3efc278fe96baedccc1c940a252ccf404500ebe751baef0bde5acba90eb30967a7e508f663dc894fdec682097a5b1b2f3291219db2fda4731b SHA512 f044d9b3f8937a5163973cf02a00b83e8c5fe6779d7b30844d86521c96fa2fa7f1811daf8013e23b9f95d4d8b720bc34c6aaf0d04ac951608457f6b7690d6685
+EBUILD eom-1.18.2.ebuild 1480 BLAKE2B 1b7cbb148fb9ffb72d91219a880f13461353715d48c81614b416dbe32d16c109e57b4ec4a6e99df909a3868cc79d1ee773b482af6395259cd8154df9c948c430 SHA512 1120a5126289d462ce1b8737ac8ec51abfe297f5cb686cc29c73cf1698b94ebd152159f5f68f7c8c5813ca9bd18c3abb55835c74aead4f47ee0eed7e5dda689a
 MISC metadata.xml 408 BLAKE2B 3aa045b7f75c60605aead480120e080ce799255190b0ffddb3a204b9fdaad92451bd42717fa70232056dc073a29fca96c96b01cdce2125f9e357c06aaf874880 SHA512 948981426d592856f20cfcf6cfc8d0505acc76144ca32211ed1a5c9d6106aa71e2d7987c1a0ab6373903b5a413da6e22f5fd9d10894bc89eefbac12d48cd7b30
diff --git a/media-gfx/eom/eom-1.18.2.ebuild b/media-gfx/eom/eom-1.18.2.ebuild
index 429377265824..ed91e1376aa2 100644
--- a/media-gfx/eom/eom-1.18.2.ebuild
+++ b/media-gfx/eom/eom-1.18.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index a95899a61a28..b64c21c21d07 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,13 +1,8 @@
-AUX iscan-2.25.0-drop-ltdl.patch 2121 BLAKE2B ef35b38f20000b1063950b56233505db5ea3a15cc7e5fee1de4ab8e37f07f20a7974757ae8b62921aca20aa7eb7a92941490ebeb008c430e942997c8cc17fc02 SHA512 9f279db992101a525e83b14e45c60840c8a546c70e6087dd4210c647bf9f6fe5bf22fb34402c31da4070089f7869bc59d8a4ab4b772d7efc8f2429b2791e503f
-AUX iscan-2.25.0-fix-g++-test.patch 523 BLAKE2B 91c18f6e403e7426c86a07e151223539c51ec6db808486df3c4320f586f0046b776c4e14f8fbf3375a2c921f172f22f42e080d262f4eb4fb22df784da2c4efe0 SHA512 3b0182d2023077b7d6339b594843a53fcba1cad6f45b5ad4596efcef214aac1170664e184f65e326cdc7a2ac3ce98340c72ca48eaf9e0ec34cfa0e8edfd6f840
-AUX iscan-2.26.2-libpng15.patch 1490 BLAKE2B 5c7956920c2294ab0c119dda1eb491176326e71cdc6f3345291a083f22fee4528c1f4a77148d9b46db49ca2dd8cbea391af57e88dbbe4213729350b4674e5765 SHA512 85adc14eeb8833e91e09bcc36488b773790ecc0b8889961380c330995e703345439b028572f94dbb50a59cb67ddff014257283d72dce0a42d4bd112d684b1c2a
-AUX iscan-2.26.2-png-libs.patch 1309 BLAKE2B d5bbfbabfaae9fc3702d092d236d7622ae6b81e2f146c9f15540d367ab22c73f41ac38e7f4477c566efd56d397961043f9eca49667d627b4925e8f0d5c7e48b1 SHA512 030e0072d9f70b690a5f0927fdcf7587bee1022d69b2672be27d893a224573c752bbb950f87cdd48a6eaac2cfbeca4dc7fc9a2e4f23fb49f3facee7f0f6d65a2
 AUX iscan-2.28.1.3+libpng-1.5.patch 1466 BLAKE2B 474069046d0ff5037bfdba4f7ab138cbc153b8cc0b1fb8fd8fa14ac55b5afe6dd3e3fc088aab83114c607a3ae6da72e90fc68abafea80b7008046cd40cb0db0f SHA512 914861963db02f1a330a7e2f90bfc545fb411d6a418567811452454ad14ff912f504beba8a30fa668e6e7e83aaf826cae142adf9433adf0d3e972e72e0147714
 AUX iscan-2.29.1-drop-ltdl.patch 2107 BLAKE2B ebb47c8148d3b1baaec17606bb85d98ed5b8c68ba79c1f8a3d165281a4b3d2514e13021de4d5806c4313308f297a4b876d6bb41515b79735a1e9cf9e44a8f7cb SHA512 593f9a8c7a85ed4e379553c63a75eec09965e803f2785456a4416895cb2d13048db8c7d731bd427cfb4049386a1270b676edad5cc92c354c7e2eaa4542d930dd
 AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9fda301a63b690cf4bba92dff2b559aeeaab8fcc9149bd4334f411e7f68aa514c986541eb99ced01bb14df7a141dd68 SHA512 ea2347e169118cfa2916f9ef3f0715d2322763715198714271fc611203a37cec5977ec0de5de0e737a5dd8cf223f2e23198faf52d79671b85173f4a02d3982c5
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
-AUX iscan-usb.sh 715 BLAKE2B 7ff35425cbf1611dc7ae71cc514491c6bacd4e3fe51bf8d1067ad6258d0249305627d6b5a384f82f62ee9243c3785ea704a30ff3af05ce8449223e06a7a971c7 SHA512 39762e587163658f6481bc16e75605aeee1251acc52cf51f0e9360c25298290fdd04140dd0e8863105bfafeb5dd69502b490972bf1bc2f3e2ade667e1f51cd35
 DIST iscan_2.30.1-1.tar.gz 1217985 BLAKE2B a469b455566bb249044d1cc7994d233393139756135f2fec0b91325fe0f793eeb90df0fe5b512766993d480b5b2e1b2360067bf3b44ff9132c3bc61baac91133 SHA512 0562be739b637ee78a5bf2612e7b148de60709c32550742383b76750688d48e42834acbe050c5f2fad26bd9063c9faff425bf906dcebc3e4160d17cd5481850a
 DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
diff --git a/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch
deleted file mode 100644
index 8ac18defc007..000000000000
--- a/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur iscan-2.25.0.orig//backend/Makefile.am iscan-2.25.0/backend/Makefile.am
---- iscan-2.25.0.orig//backend/Makefile.am	2010-05-19 07:51:55.000000000 +0200
-+++ iscan-2.25.0/backend/Makefile.am	2010-07-21 22:49:08.579705272 +0200
-@@ -56,7 +56,6 @@
- 
- libepkowa_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS) \
--	$(LTDLINCL) \
- 	-I$(top_srcdir)/include \
- 	-I$(top_srcdir)/non-free \
- 	$(XML_CFLAGS) \
-@@ -66,7 +65,7 @@
- libepkowa_la_LIBADD = \
- 	-lm \
- 	$(XML_LIBS) \
--	$(LIBLTDL)
-+	-lltdl
- libepkowa_la_SOURCES = \
- 	$(sane_backends_files) \
- 	marshal.c \
-diff -Naur iscan-2.25.0.orig//configure.ac iscan-2.25.0/configure.ac
---- iscan-2.25.0.orig//configure.ac	2010-07-21 22:48:11.411332268 +0200
-+++ iscan-2.25.0/configure.ac	2010-07-21 22:49:58.918332411 +0200
-@@ -261,13 +261,10 @@
- dnl  The somewhat obscure LT_AC_PROG_SED is here to make sure that the
- dnl  SED environment variable gets set before it's used by the libtool
- dnl  machinery.  This works around buggy libtool versions.
--LT_AC_PROG_SED
--AC_LIBLTDL_INSTALLABLE
--AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
--AC_LIB_LTDL
--AC_SUBST(LTDLINCL)
--AC_SUBST(LIBLTDL)
-+AC_LTDL_SHLIBPATH
-+AC_LTDL_SHLIBEXT
-+AC_LTDL_SYSSEARCHPATH
- 
- 
- dnl  Graphic file format options
-diff -Naur iscan-2.25.0.orig//frontend/Makefile.am iscan-2.25.0/frontend/Makefile.am
---- iscan-2.25.0.orig//frontend/Makefile.am	2010-05-19 07:51:54.000000000 +0200
-+++ iscan-2.25.0/frontend/Makefile.am	2010-07-21 22:50:53.965581385 +0200
-@@ -34,7 +34,7 @@
- iscan_LDADD = \
- 	$(top_builddir)/lib/libimage-stream.la \
- 	-lsane \
--	@LIBLTDL@ \
-+	-lltdl \
- 	@GTK_LIBS@ \
- 	@GDK_IMLIB_LIBS@ \
- 	$(top_builddir)/non-free/libesmod.so
-diff -Naur iscan-2.25.0.orig//lib/Makefile.am iscan-2.25.0/lib/Makefile.am
---- iscan-2.25.0.orig//lib/Makefile.am	2010-05-19 07:51:56.000000000 +0200
-+++ iscan-2.25.0/lib/Makefile.am	2010-07-21 22:51:29.794329919 +0200
-@@ -29,7 +29,7 @@
- libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include
- libimage_stream_la_LDFLAGS = -static
- libimage_stream_la_LIBADD  = \
--	$(LIBLTDL) \
-+	-lltdl \
- 	$(top_builddir)/lib/pdf/libpdf.la
- libimage_stream_la_SOURCES = \
- 	$(libimage_stream_la_files)
diff --git a/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch b/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch
deleted file mode 100644
index 23fa6edd76b4..000000000000
--- a/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: iscan-2.21.0/configure.ac
-===================================================================
---- iscan-2.21.0.orig/configure.ac
-+++ iscan-2.21.0/configure.ac
-@@ -68,7 +68,7 @@ AC_PROG_CXX
- #  to be larger than that for the gcc-3.[23] packages (as long as both
- #  are distributed) for smooth upgrade paths.
- 
--if test x"$CXX" = xg++; then
-+if test "$GXX" = "yes"; then
-     AC_MSG_CHECKING([C++ ABI version])
-     CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`"
-     AC_MSG_RESULT([$CXX_ABI])
diff --git a/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch
deleted file mode 100644
index 1b89b735c23f..000000000000
--- a/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=383799#c13
-Upstream: http://www.avasys.jp/cgi-bin/lx/bbs/en/scanner-bbs/hyperbbs.cgi?mode=view;Code=5197
-
---- lib/pngstream.cc
-+++ lib/pngstream.cc
-@@ -76,7 +76,12 @@
-         set_error_handler (_png, _info);
- 
-         lib->write_flush (_png);
-+/* when not interlacing (ie, only one pass), number of rows is image height:  _v_sz */
-+#if PNG_LIBPNG_VER > 10499
-+        if (!_footer && _v_sz == lib->get_current_row_number(_png))
-+#else
-         if (!_footer && _png->num_rows == _png->flush_rows)
-+#endif
-           {
-             lib->write_end (_png, _info);
-             _footer = true;
-@@ -161,6 +166,9 @@
-     funcsym (write_row);
-     funcsym (write_flush);
-     funcsym (write_end);
-+#if PNG_LIBPNG_VER > 10499
-+    funcsym (get_current_row_number);
-+#endif
- 
-     if (lib->access_version_number
-         && lib->create_write_struct
-@@ -170,6 +178,9 @@
-         && lib->set_IHDR
-         && lib->set_pHYs
-         && lib->set_invert_mono
-+#if PNG_LIBPNG_VER > 10499
-+	&& lib->get_current_row_number
-+#endif
-         && lib->write_info
-         && lib->write_row
-         && lib->write_flush
---- lib/pngstream.hh
-+++ lib/pngstream.hh
-@@ -108,6 +108,10 @@
-                png_structp);
-       fundecl (void, write_end,
-                png_structp, png_infop);
-+#if PNG_LIBPNG_VER > 10499
-+      fundecl (png_uint_32, get_current_row_number,
-+               png_structp);
-+#endif
- #endif /* HAVE_PNG_H */
-     };
-     static png_lib_handle *lib;
diff --git a/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch b/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch
deleted file mode 100644
index 0866e604915a..000000000000
--- a/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur iscan-2.26.2/configure.ac iscan-2.26.2.new/configure.ac
---- iscan-2.26.2/configure.ac	2014-01-27 13:37:26.782024452 -0500
-+++ iscan-2.26.2.new/configure.ac	2014-01-27 13:36:47.738024120 -0500
-@@ -274,6 +274,9 @@
- 		  AC_HELP_STRING([--enable-$1],
- 				 [ensure support for the $3 file format]),
- 		  [if test "x$enable_$1" != xno; then
-+		      if test "x$4" != xno; then
-+		         PKG_CHECK_MODULES($3,[$4])
-+		      fi
- 		      iff_header="`echo $2 | $as_tr_sh`"
- 		      AC_CHECK_HEADERS([$2])
- 		      if test `eval echo '$ac_cv_header_'$iff_header` \
-@@ -284,9 +287,9 @@
- 		  [AC_CHECK_HEADERS([$2])])
-    ])
- 
--ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG)
--ISCAN_FILE_FORMAT(png,png.h,PNG)
--ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF)
-+ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,no)
-+ISCAN_FILE_FORMAT(png,png.h,PNG,libpng)
-+ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,no)
- 
- 
- dnl  Support for performance measurements.
-diff -ur iscan-2.26.2/frontend/Makefile.am iscan-2.26.2.new/frontend/Makefile.am
---- iscan-2.26.2/frontend/Makefile.am	2014-01-27 13:31:09.488021241 -0500
-+++ iscan-2.26.2.new/frontend/Makefile.am	2014-01-27 13:37:50.065024650 -0500
-@@ -37,6 +37,7 @@
- 	-lltdl \
- 	@GTK_LIBS@ \
- 	@GDK_IMLIB_LIBS@ \
-+	@PNG_LIBS@ \
- 	$(top_builddir)/non-free/libesmod.so
- iscan_SOURCES = \
- 	$(iscan_source_files)
diff --git a/media-gfx/iscan/files/iscan-usb.sh b/media-gfx/iscan/files/iscan-usb.sh
deleted file mode 100644
index 49430616e69e..000000000000
--- a/media-gfx/iscan/files/iscan-usb.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file is part of media-gfx/iscan
-#
-# This script changes the permissions and ownership of a USB device under
-# /proc/bus/usb to grant access to this device to users in the scanner group.
-#
-# Ownership is set to root:scanner, permissions are set to 0660.
-#
-# Arguments :
-# -----------
-# ACTION=[add|remove]
-# DEVNAME=/dev/bus/usb/BBB/DDD
-# SUBSYSTEM=usb_device
-
-OWNER="root"
-GROUP="scanner"
-PERMS="0660"
-
-DEVICE="${DEVNAME/dev/proc}"
-
-if [ "${ACTION}" = "add" -a "${SUBSYSTEM}" = "usb_device" -a -f "${DEVICE}" ]; then
-    chmod ${PERMS} "${DEVICE}" && chown ${OWNER}:${GROUP} "${DEVICE}"
-fi
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index cc7b9f780c79..247b4e417d9b 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -14,5 +14,4 @@ DIST Propaganda-Vol-10.tar.gz 6376914 BLAKE2B 365e96616d8f82321fd0a0460e6b14e5db
 DIST Propaganda-Vol-11.tar.gz 3030910 BLAKE2B b5637635165557c079d7801b91a6b1d7372a7ac1ef1ba414d0cf172d652de779fb05f106f0ef7cabebac79bbc8a1b21cabde0f34a14735eca17ccb193ade0882 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7
 DIST Propaganda-Vol-12.tar.gz 3140955 BLAKE2B ce23e5e781bd1d1cba757bcee71df199627e18bb72eddd0a6dc5759f1d80fcefbb4daa6048450aa51f9b4830ece14461ef63a299e0c13d43a1670bc8b1a4b0fc SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80
 EBUILD propaganda-1.0-r1.ebuild 1172 BLAKE2B d77e4745e589e8ddf7273d3fbdb417ca79e00d8b51b7c98c60eaf72887656b7a3ddef5bfe17ec534407b5a051f7b7824db01e6fd12116c226408128f4324aa34 SHA512 449456227f619afb5e87503ea8accbc8b6ff94efb8cba4e7419c56a8a6510db998c0cfc50e834a04e592b842f3092b4ad059f035081cc92dde824c8e8ad3e308
-EBUILD propaganda-1.0.ebuild 1788 BLAKE2B 7f84ff0975e2a666aa715f0bd7036b150327504b3228c234aa9a6e44c41edb27ab1da4a9235e84613ee53ee88887262eac9c23d64f935fd0603a524afd271809 SHA512 48cb923ddbfcec7f7ff0dad6d884caaa3b4fca63b4d6a206ef2c8b62e7f0e219779da4f95bcbf79583faf3e515952b318708c8af371b0980bd8913d8ec1f7439
 MISC metadata.xml 251 BLAKE2B 08302baf062696a2cd9e6bbc3469d3e6a2d4d03caf4734810ad4dd22f64347a70a36e38cff8753da18246f448a080829bce1ceae41ae418dbeb19eb1336e5dd7 SHA512 5425f5f068673da4e79daec7d2d22dc122024e4b54a53b8d7b07ccb2b138fb5657b7fe29ec640c6faf12d6efefeaf3a53d67e954ec8b9884b0ff3d959c86a13f
diff --git a/media-gfx/propaganda/propaganda-1.0.ebuild b/media-gfx/propaganda/propaganda-1.0.ebuild
deleted file mode 100644
index d4918b184462..000000000000
--- a/media-gfx/propaganda/propaganda-1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-S=${WORKDIR}/Propaganda
-DESCRIPTION="Propaganda Volume 1-14 + E. Tiling images for your desktop"
-HOMEPAGE="http://www.resexcellence.com/propaganda/index.shtml"
-SITE="http://www.resexcellence.com/propaganda/"
-# Point to any required sources; these will be automatically
-# downloaded by Portage.
-SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
-	${SITE}Propaganda-Vol-02.tar.gz
-	${SITE}Propaganda-Vol-03.tar.gz
-	${SITE}Propaganda-Vol-04.tar.gz
-	${SITE}Propaganda-Vol-05.tar.gz
-	${SITE}Propaganda-Vol-06.tar.gz
-	${SITE}Propaganda-Vol-07.tar.gz
-	${SITE}Propaganda-Vol-08.tar.gz
-	${SITE}Propaganda-Vol-09.tar.gz
-	${SITE}Propaganda-Vol-10.tar.gz
-	${SITE}Propaganda-Vol-11.tar.gz
-	${SITE}Propaganda-Vol-12.tar.gz
-	${SITE}Propaganda-13.tar.gz
-	${SITE}Propaganda-14.tar.gz
-	${SITE}Propaganda-For-E.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-src_compile() {
-	rm -fr ${S}/../Propaganda-Vol-11/.finderinfo
-	rm -fr ${S}/../Propaganda-Vol-11/.resource
-
-	rm -fr ${S}/../Propaganda-Vol-12/.finderinfo
-	rm -fr ${S}/../Propaganda-Vol-12/.resource
-
-	mv ${S}/../Propaganda-Vol-11 ${S}/Vol11
-	mv ${S}/../Propaganda-Vol-12 ${S}/Vol12
-
-	for NUM in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
-		chmod -x ${S}/Vol${NUM}/*
-		cd ${S}/Vol${NUM}
-		rm *.html
-		rename JPG jpg *.JPG
-		chmod +x script.perl
-		./script.perl *.jpg
-	done
-	chmod -x ${S}/Propaganda-For-E/*
-	cd ${S}/Propaganda-For-E/
-	rm *.html
-	rename JPG jpg *.JPG
-	chmod +x script.perl
-	./script.perl *.jpg
-	cd ${S}
-	pwd
-	rm -f ${S}/Vol2/\@
-	chmod ugo-w -R ${S}
-	chmod ugo+r -R ${S}
-}
-
-src_install() {
-	dodir /usr/share/pixmaps/
-	gunzip magicbg.tar.gz
-	dodoc COPYING READM*  magicbg.tar
-	mv -f ${S} ${D}/usr/share/pixmaps || die
-}