7 files changed, 10 insertions, 133 deletions
diff --git a/media-gfx/xzgv/ChangeLog b/media-gfx/xzgv/ChangeLog
index 9bfe699e00a9..57766a78d903 100644
--- a/media-gfx/xzgv/ChangeLog
+++ b/media-gfx/xzgv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/xzgv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/ChangeLog,v 1.11 2005/01/16 13:44:51 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/ChangeLog,v 1.12 2005/05/19 04:05:23 tester Exp $
+
+  19 May 2005; Olivier Crête <tester@gentoo.org> -xzgv-0.7-r1.ebuild,
+  -xzgv-0.8.ebuild, xzgv-0.8-r1.ebuild:
+  Fixed homepage and src_uri, removed vulnerable versions (see GLSA 200501-09)
+  and marked stable on amd64, closes bugs #42092 and #74069
 
   16 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> xzgv-0.8-r1.ebuild:
   Marked ~amd64.
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
index 5c4acec0d36c..1f448f7c2748 100644
--- a/media-gfx/xzgv/Manifest
+++ b/media-gfx/xzgv/Manifest
@@ -1,9 +1,5 @@
 MD5 6dae879e60ee32f37935a887191a7675 ChangeLog 1352
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 c7b6bed4012956449cc69bcc784f5438 xzgv-0.7-r1.ebuild 1163
-MD5 8f2b7ebde784e98ef01f95f127c3222e xzgv-0.8.ebuild 1261
 MD5 e7f085aa061f9b3115e1031e36916922 xzgv-0.8-r1.ebuild 1364
-MD5 fdc1547580fe894d8749ab0fbc604452 files/digest-xzgv-0.7-r1 60
-MD5 df76e36ea08fa4317c30d7879eec9f93 files/digest-xzgv-0.8 60
 MD5 df76e36ea08fa4317c30d7879eec9f93 files/digest-xzgv-0.8-r1 60
 MD5 9495e82307945c08599a0bd9ffc2f4f6 files/xzgv-0.8-integer-overflow-fix.diff 6374
diff --git a/media-gfx/xzgv/files/digest-xzgv-0.7-r1 b/media-gfx/xzgv/files/digest-xzgv-0.7-r1
deleted file mode 100644
index e6717c919a9c..000000000000
--- a/media-gfx/xzgv/files/digest-xzgv-0.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37b5bd8286de9f1047f603879460b364 xzgv-0.7.tar.gz 297485
diff --git a/media-gfx/xzgv/files/digest-xzgv-0.8 b/media-gfx/xzgv/files/digest-xzgv-0.8
deleted file mode 100644
index 0840bb8d59ac..000000000000
--- a/media-gfx/xzgv/files/digest-xzgv-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e392277f1447076402df2e3d9e782cb2 xzgv-0.8.tar.gz 302801
diff --git a/media-gfx/xzgv/xzgv-0.7-r1.ebuild b/media-gfx/xzgv/xzgv-0.7-r1.ebuild
deleted file mode 100644
index 4e086cae3c5b..000000000000
--- a/media-gfx/xzgv/xzgv-0.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.7-r1.ebuild,v 1.11 2005/01/05 16:32:01 chriswhite Exp $
-
-DESCRIPTION="An X image viewer."
-SRC_URI="http://xzgv.browser.org/${P}.tar.gz"
-HOMEPAGE="http://xzgv.browser.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -sparc"
-IUSE=""
-
-DEPEND="virtual/x11
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	sys-libs/zlib
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.0"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp config.mk config.mk.orig
-	sed -e "s:-O2 -Wall:${CFLAGS}:" \
-		config.mk.orig > config.mk
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
-	make PREFIX=${D}/usr \
-		 SHARE_INFIX=/share \
-		 INFO_DIR_UPDATE=no \
-		 MANDIR=${D}/usr/share/man/man1 \
-	     install || die
-
-	# Fix info files
-	cd ${D}/usr/share/info
-	for i in 1 2 3
-	do
-		mv xzgv-$i.gz xzgv.info-$i.gz
-	done
-	gzip -dc xzgv.gz | \
-		sed -e 's:^xzgv-:xzgv\.info-:g' | \
-		gzip -9c > xzgv.info.gz
-	rm xzgv.gz
-
-	cd ${S}
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-gfx/xzgv/xzgv-0.8-r1.ebuild b/media-gfx/xzgv/xzgv-0.8-r1.ebuild
index ca741850ab22..21e924c2540d 100644
--- a/media-gfx/xzgv/xzgv-0.8-r1.ebuild
+++ b/media-gfx/xzgv/xzgv-0.8-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.8-r1.ebuild,v 1.3 2005/01/16 13:44:51 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.8-r1.ebuild,v 1.4 2005/05/19 04:05:23 tester Exp $
 
 inherit eutils
 
 DESCRIPTION="An X image viewer."
-SRC_URI="http://xzgv.browser.org/${P}.tar.gz"
-HOMEPAGE="http://xzgv.browser.org/"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/${P}.tar.gz"
+HOMEPAGE="http://rus.members.beeb.net/xzgv.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~sparc ~ppc amd64"
 IUSE=""
 
 DEPEND="virtual/x11
diff --git a/media-gfx/xzgv/xzgv-0.8.ebuild b/media-gfx/xzgv/xzgv-0.8.ebuild
deleted file mode 100644
index c561e1ed2bad..000000000000
--- a/media-gfx/xzgv/xzgv-0.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.8.ebuild,v 1.7 2005/01/05 16:32:01 chriswhite Exp $
-
-DESCRIPTION="An X image viewer."
-SRC_URI="http://xzgv.browser.org/${P}.tar.gz"
-HOMEPAGE="http://xzgv.browser.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-IUSE=""
-
-DEPEND="virtual/x11
-	sys-apps/gawk
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	sys-libs/zlib
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.0"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp config.mk config.mk.orig
-	sed -i -e "s:-O2 -Wall:${CFLAGS}:" config.mk
-
-	case "${ARCH}" in
-		"x86")
-			;;
-		*)
-			sed -i -e "s/CFLAGS+=-DINTERP_MMX/#&/" config.mk
-			;;
-	esac
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
-	make PREFIX=${D}/usr \
-		 SHARE_INFIX=/share \
-		 INFO_DIR_UPDATE=no \
-		 MANDIR=${D}/usr/share/man/man1 \
-	     install || die
-
-	# Fix info files
-	cd ${D}/usr/share/info
-	for i in 1 2 3
-	do
-		mv xzgv-$i.gz xzgv.info-$i.gz
-	done
-	gzip -dc xzgv.gz | \
-		sed -e 's:^xzgv-:xzgv\.info-:g' | \
-		gzip -9c > xzgv.info.gz
-	rm xzgv.gz
-
-	cd ${S}
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-}