gentoo resync : 16.02.1018

3 files changed, 2 insertions, 94 deletions

diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 997f770a039a..bd8bc1e3abca 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -8,6 +8,5 @@ AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
-EBUILD xv-3.10a-r17.ebuild 2598 BLAKE2B 035bf28413f30b3a615f59d3266c59b4e9833f8d26ec84b2351e0a9ec3a1da90dcf12f2ae3e8afae1d79369bb5258fb6532ef76dca72c0c0539f4e981f4aef61 SHA512 6f56e5bc72b1912a8901355ed6847bbaea44bc4c11f05e5537e1921bb1b177537604116683e2f80d523675d778ca182fb474eb2070ee3c9d002ea621b467dd24
-EBUILD xv-3.10a-r19.ebuild 2445 BLAKE2B 1a0f47df51caa4ae24cd2ea802783a4d7801b9354fca6bb956fae26a32fd655b7f10272f226b759771e9250e72f022873e3b0d9fac9ba32464084c30c16166df SHA512 4b95123a458431e73b62dcd8c38cfeb8151e4922a3736e7d808905f5a089dee9dbf3a3d5c6e70657ca53007c9dfc0645891ce90144f8c56ca04187fff976e2d3
+EBUILD xv-3.10a-r19.ebuild 2444 BLAKE2B 5049bef53eb5c3d080e102e97295b75cdba90c3fe770790f1b6018e9bf34088ed5fa79e0c21e52cffd9c0c54c47f7dbc91846aadcd5198869e10b9ae45c492fe SHA512 bd8e3dd3104f235ed516fb4e3b98cc778acdc787fe37841328d2f384262d39f6efbf10b278c4939c205fc420bafbd2d996d3402bf069b8950bb633471ccdb723
 MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d
diff --git a/media-gfx/xv/xv-3.10a-r17.ebuild b/media-gfx/xv/xv-3.10a-r17.ebuild
deleted file mode 100644
index 84423f73c816..000000000000
--- a/media-gfx/xv/xv-3.10a-r17.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-JUMBOV=20070520
-DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
-HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
-SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
-	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
-	mirror://gentoo/${P}.png.bz2"
-
-LICENSE="xv"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="jpeg tiff png"
-
-DEPEND="x11-libs/libXt
-	jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Apply the jumbo patch
-	epatch "${WORKDIR}"/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt
-
-	# OSX and BSD xv.h define patches
-	epatch "${FILESDIR}"/${P}-osx-bsd-${JUMBOV}.patch
-
-	# OSX malloc patch
-	epatch "${FILESDIR}"/${P}-vdcomp-osx-${JUMBOV}.patch
-
-	# Disable JP2K (i.e. use system JPEG libs)
-	epatch "${FILESDIR}"/${P}-disable-jp2k-${JUMBOV}.patch
-
-	# Fix -wait option (do not rely on obsolete CLK_TCK)
-	epatch "${FILESDIR}"/${P}-fix-wait-${JUMBOV}.patch
-
-	# Use LDFLAGS on link lines
-	epatch "${FILESDIR}"/${P}-add-ldflags-${JUMBOV}.patch
-
-	epatch "${FILESDIR}"/${P}-libpng15-r1.patch
-
-	# Link with various image libraries depending on use flags
-	IMAGE_LIBS=""
-	use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg"
-	use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng"
-	use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff"
-
-	sed -i \
-		-e 's/\(^JPEG.*\)/#\1/g' \
-		-e 's/\(^PNG.*\)/#\1/g' \
-		-e 's/\(^TIFF.*\)/#\1/g' \
-		-e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile
-
-	# /usr/bin/gzip => /bin/gzip
-	sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h
-
-	# Fix installation of ps docs
-	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile
-}
-
-src_compile() {
-	append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
-	use jpeg && append-flags -DDOJPEG
-	use png && append-flags -DDOPNG
-	use tiff && append-flags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
-
-	emake \
-		CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		LIBDIR="${T}"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		LIBDIR="${T}" install
-
-	dodoc CHANGELOG BUGS IDEAS
-	newicon "${WORKDIR}"/${P}.png ${PN}.png
-	make_desktop_entry xv "" "" "Graphics;Viewer"
-}
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index 1b06f5a96590..f824a67e122e 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt