summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-03-15 18:45:04 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-03-15 18:45:04 +0000
commit4b578541155a120201230fe71f40fa690db7bc8f (patch)
tree0ba13d094aa621f584e7d21b4ce1caf5d47a3b41 /media-gfx/xv
parentRemove no-op USE="musicbrainz" and depend wrt #405113 by Tomasz Golinski and ... (diff)
downloadgentoo-2-4b578541155a120201230fe71f40fa690db7bc8f.tar.gz
gentoo-2-4b578541155a120201230fe71f40fa690db7bc8f.tar.bz2
gentoo-2-4b578541155a120201230fe71f40fa690db7bc8f.zip
Move xv.png to mirrors wrt #370905 by Matt Turner
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/xv')
-rw-r--r--media-gfx/xv/ChangeLog8
-rw-r--r--media-gfx/xv/files/xv.pngbin2651 -> 0 bytes
-rw-r--r--media-gfx/xv/xv-3.10a-r16.ebuild20
3 files changed, 17 insertions, 11 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/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
Binary files differ
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"
}