Move xv.png to mirrors wrt #370905 by Matt Turner

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 27 insertions, 21 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 29da00dbbfa0..9cf37b0f4b45 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xv
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.112 2011/10/23 16:29:53 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.113 2012/03/15 18:45:04 ssuominen Exp $
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> xv-3.10a-r16.ebuild,
+  -files/xv.png:
+  Move xv.png to mirrors wrt #370905 by Matt Turner
 
   23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -xv-3.10a-r15.ebuild:
   old
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 86fbc036276a..77ace3dfab67 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -7,20 +7,20 @@ AUX xv-3.10a-fix-wait-20070520.patch 1664 RMD160 7d65d1ce5310ca7890ab426f41ce0bc
 AUX xv-3.10a-libpng15.patch 16471 RMD160 8f73a7d20321cecf4f4d74a7d71570a117001a17 SHA1 3d19aa0c6ecc8b554081906babe0b4f9a6946da3 SHA256 b06d04e38a13d25dd4ebf8913ee308c946ab27b94becc1ae9c928e89ed63f57e
 AUX xv-3.10a-osx-bsd-20070520.patch 1479 RMD160 27f6e665e4a6dad409d90b64eba5416d17fe60e9 SHA1 96fd3efc7c6ced3374aa4de15dbe983ab475fcb4 SHA256 fc801f9f3e4ebfc6f59f62e4dc15404b65654f1b46d1141794b249270d941114
 AUX xv-3.10a-vdcomp-osx-20070520.patch 437 RMD160 033c4340794a43400c67150a6c594909a6c52680 SHA1 5005c394564287d7e57f0c86fbc86b601c45c916 SHA256 e0d522ed4d835b8231aa5b3df1e401d9d1f6608eae2ec8ca7d415a11ff349d29
-AUX xv.png 2651 RMD160 9493aca7e4d60c9467f7501a151f2e5c9dbe3918 SHA1 8a02593d470b90da7c3944c55429cddaaa3505d8 SHA256 d2de01bf43ceaee4021e6fce7f165c29e2537971a7b20ec1ba6ed46bcb97d012
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 RMD160 23bc07030416ebaca5ce4d223921e33094c37b93 SHA1 d00308c1687d9d803d26ef40c73d19a0f593c626 SHA256 221ec89fdf0772bd09c845cbb337aecf411a1aee215140b676717f49e9e65c80
+DIST xv-3.10a.png.bz2 3082 RMD160 d1948f866392e80350e7b5d6aae2406ab826cc7b SHA1 d33bc9f3d43f23aaf71608ad440f9543dd850635 SHA256 244cd9da79e86e0c0bc00bfaad09a18e229795eb0146925328ad147ec7adcfe9
 DIST xv-3.10a.tar.gz 2259124 RMD160 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d SHA1 9e6372f154be9e9e355972cbeb91d98d9c342474 SHA256 03eb26b1e8f315c3093f4ae794862ba46637d16c055e8efbe5e3beb5d40fc451
-EBUILD xv-3.10a-r16.ebuild 2585 RMD160 ed2d42f9cbdd8f37701bca477e57e236700940ca SHA1 34af5fbcadb854a3b85e0ac33580c6e73c68ec3d SHA256 e034e3d31cb11ee26b2b7619cdbc6f989a109159d97600a2591964ed4b1a1423
-MISC ChangeLog 16066 RMD160 6dadcf1a20b604d96c552e72b706cf4a5583a562 SHA1 442ad2cf7770429eaa883abeba09398303671329 SHA256 113c389f43f82866e7640de9a5c6b9954de5d16f1ce63bde9ced58a641508888
+EBUILD xv-3.10a-r16.ebuild 2635 RMD160 e8a788c3afb41ece52f517dd87313c3f19e22a1d SHA1 035c73c00771cf6fbd8db5b60c18353fa836de3b SHA256 bb8ce2208a0677d86cedef392a72290e51f0400420468508689598f10d9f74be
+MISC ChangeLog 16211 RMD160 cbb6c1c245e2e9e0aeb62d92a17271e21a656391 SHA1 ac58af4f0f16f20db50b4a81a452e0c5f53ae445 SHA256 9f36c11017cd28f83e4438e23884aa77db4bac73b06295b2298ebbc45b9bd017
 MISC metadata.xml 202 RMD160 d77846f1397f9554b8046851f3ede4fa7dd8673e SHA1 cc9e89770b767b1cdb1943e99181728159f3b5b0 SHA256 808dd994dd71a13e4fb62ff45b63c381b505df83fbef11bffe05219eaf6b248c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOpEDUAAoJEEdUh39IaPFN3/0H/0hvJGj98rqIc83mu6xYqGjy
-AhdrHiQfzviMfWakVOeKYysfEUnd8pex5pOOQXC77iRWZYJaU+ieGeFpBNk0cWkk
-I4FK6/5+9gJ0I3Vp+LY4fTl/ayRkb4vfQDN7um4Hhm+mcj39KiitohuYWNVkjNWX
-VenDplQJwYrw9QOoVnlBpkO4q38aueGB+R/1OOJFW/n9WimdDEclzwKc22ivjo4y
-zrRhgefeJPbSoU4urmrwBRf0CmlejYtnCTSau1mlikSYFm4ZJGJ5Hye/VHmcxkE5
-VE2tBYsqVRIBMw1stKvp6qXVHFpXBQetgeu93rDwRiCEawDA3D8mcShhyVVvtQg=
-=OzYQ
+iQEcBAEBAgAGBQJPYjiuAAoJEEdUh39IaPFNW2kH/18L0S1Ql4mTu6NDTAlZztPK
+Eo/6OtLmzZW3AwR4zrf1Od4TPmmuUWEZ0k8+zl1gAN6y7ZzcpQ9zziqnG8kJl5xc
+sgexcrRN9VmV/odAfesPBZ3xiJYs9X7ybDhf7EGYnbGwB49dKvSDSKp4Fh7dyxau
+ot/30BJUD1PwNKp2TiGJxWqvPdComrA9non0t6+y3EbzQa2/nq0om7bscPK7PYfI
+CRSHfJGt2wTuYE9BJjUVeUT/7KhzkLgJQ4U0IYLXl4t4xlQ/q3TB4HU8Yk7kqwXw
+h3rNYO0cHQXxW3GA3lNrhjRHiMF9juK3SM3TpbjEFiDF9drqZdBr2tm2n4tPhgo=
+=3MkT
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xv/files/xv.png b/media-gfx/xv/files/xv.png
deleted file mode 100644
index 4bd7e1ded072..000000000000
--- a/media-gfx/xv/files/xv.png
+++ /dev/null
diff --git a/media-gfx/xv/xv-3.10a-r16.ebuild b/media-gfx/xv/xv-3.10a-r16.ebuild
index 41a93b85752a..bc994f4c9418 100644
--- a/media-gfx/xv/xv-3.10a-r16.ebuild
+++ b/media-gfx/xv/xv-3.10a-r16.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r16.ebuild,v 1.9 2011/10/23 15:38:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r16.ebuild,v 1.10 2012/03/15 18:45:04 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils flag-o-matic
 
 JUMBOV=20070520
 DESCRIPTION="An interactive image manipulation program that supports a wide variety of image 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"
+SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
+	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}.png.bz2"
 
 LICENSE="xv"
 SLOT="0"
@@ -17,8 +19,8 @@ IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt
 	jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff )
-	png? ( >=media-libs/libpng-1.4 sys-libs/zlib )"
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -71,7 +73,7 @@ src_compile() {
 		CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		PREFIX=/usr \
 		DOCDIR=/usr/share/doc/${PF} \
-		LIBDIR="${T}" || die
+		LIBDIR="${T}"
 }
 
 src_install() {
@@ -82,9 +84,9 @@ src_install() {
 		DESTDIR="${D}" \
 		PREFIX=/usr \
 		DOCDIR=/usr/share/doc/${PF} \
-		LIBDIR="${T}" install || die
+		LIBDIR="${T}" install
 
 	dodoc CHANGELOG BUGS IDEAS
-	doicon "${FILESDIR}"/${PN}.png
+	newicon "${WORKDIR}"/${P}.png ${PN}.png
 	make_desktop_entry xv "" "" "Graphics;Viewer"
 }