gentoo resync : 04.05.2019

3 files changed, 2 insertions, 97 deletions

diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index b7a230e5ff1e..527983e084a9 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -8,6 +8,5 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc2
 AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r11.ebuild 2552 BLAKE2B 9ea8ec71be31f995f78aa0cd1801a9a47c9aacb3462f7397ed43b697021e0bced2f0a144082972daed3a10ac9589a65570506e0fa50fe2a64abe1663f3e31332 SHA512 03b9f7de5b6d51bde25176cbac7f82b37a13d73545916588b41469b1b158003663db5c534ad9fa0afde16773799634fe6f8527ab1335786d58d9daa604e7e2b9
-EBUILD xloadimage-4.1-r12.ebuild 2517 BLAKE2B 877ce8c199d1080a21006d2f46714191aa7810b85a443e0a48dd772a3fc852ccf679d078c4c2b617f8321a4fa530c94b3cc36c689a2d392c05e79bb8a2ad0a6a SHA512 489017f7a6ede439fb8ac701cfe35f037a25f8ac98ee0927ef01cd2e40c2f4afd140289c50d2d19934af0316fbcc58a08fcc820bf6322962aa4258894151d8de
+EBUILD xloadimage-4.1-r12.ebuild 2515 BLAKE2B 09e734559fef97a8371a2c4c303b38880dc43196eb3919cbef586d4f298c32364ff878d097f1465b44a9925b02379e1f0d320b0e601a5378892d8fc477f7a2d9 SHA512 562f89276c0ebdce52af5ddc39af7fb2514e766b2c88a12ae3b87604700e4a080414a569bf46f2c5874bf5ba047e18f994a8fe91e6a2f0d2aa3aa64cdd57df31
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
deleted file mode 100644
index 88c8bacd1277..000000000000
--- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="utility to view many different types of images under X11"
-HOMEPAGE="http://world.std.com/~jimf/xloadimage.html"
-SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
-	mirror://gentoo/${P}-gentoo-r1.diff.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="tiff jpeg png"
-
-RDEPEND="x11-libs/libX11
-	tiff? ( media-libs/tiff )
-	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg:0 )"
-DEPEND="${RDEPEND}
-	!media-gfx/xli"
-
-S=${WORKDIR}/${P/-/.}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo-r1.diff
-	epatch "${FILESDIR}"/${P}-zio-shell-meta-char.diff
-	epatch "${FILESDIR}"/${P}-endif.patch
-
-	# Do not define errno extern, but rather include errno.h
-	# <azarah@gentoo.org> (1 Jan 2003)
-	epatch "${FILESDIR}"/${P}-include-errno_h.patch
-
-	epatch "${FILESDIR}"/xloadimage-gentoo.patch
-
-	sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
-	sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die
-
-	# On FreeBSD systems malloc.h is a false header asking for fixes.
-	# On MacOSX it would require malloc/malloc.h
-	# On other systems it's simply unneeded
-	sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die
-
-	epatch "${FILESDIR}"/${P}-unaligned-access.patch
-	epatch "${FILESDIR}"/${P}-ldflags_and_exit.patch
-
-	sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in
-
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		png.c || die
-
-	# One of the previous patches screws up a bracket...
-	epatch "${FILESDIR}"/${P}-bracket.patch
-
-	chmod +x configure
-	eautoreconf
-}
-
-src_configure() {
-	# Set TIFFHeader to TIFFHeaderCommon wrt #319383
-	has_version '>=media-libs/tiff-4.0.0_pre' && \
-		append-flags -DTIFFHeader=TIFFHeaderCommon
-
-	tc-export CC
-	econf $(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff)
-}
-
-src_compile() {
-	emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage || die
-}
-
-src_install() {
-	dobin xloadimage uufilter || die
-
-	dosym xloadimage /usr/bin/xsetbg || die
-	dosym xloadimage /usr/bin/xview || die
-
-	insinto /etc/X11
-	doins xloadimagerc || die
-
-	newman xloadimage.man xloadimage.1 || die
-	newman uufilter.man uufilter.1 || die
-
-	echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1
-	doman "${T}"/xsetbg.1 || die
-	newman "${T}"/xsetbg.1 xview.1 || die
-
-	dodoc README
-}
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index f02fa7f780e9..8e6085e9cb7e 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11