5 files changed, 20 insertions, 16 deletions
diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 2d3678dcb05c..b218eebc0ac4 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xv
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.25 2003/12/19 20:07:00 gmsoft Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.26 2004/02/02 19:46:01 mr_bones_ Exp $
+
+  02 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> xv-3.10a-r3.ebuild,
+  xv-3.10a-r5.ebuild, xv-3.10a-r6.ebuild:
+  fix license for bug 17976
 
   19 Dec 2003; Guy Martin <gmsoft@gentoo.org> xv-3.10a-r6.ebuild:
   Marked stable on hppa.
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index dfe3d37b0654..21e5729f8d1c 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,10 +1,10 @@
-MD5 b74b84dd958bc6e512beaad75f2fd459 ChangeLog 4826
-MD5 fef6fa30fcd85a862ef5af0750d66529 xv-3.10a-r3.ebuild 1368
-MD5 c3f12901b7e6e9a741051ecb65ead809 xv-3.10a-r5.ebuild 1497
-MD5 1d80dc1fcba6131eb752236bb20b7e8a xv-3.10a-r6.ebuild 1755
+MD5 09d2ab16aed3a0bdb291faff5658592a ChangeLog 4975
+MD5 f4e47e9ee0c9c99847dadceed0eedd77 xv-3.10a-r3.ebuild 1369
+MD5 25ab6127faa9cf817e98fb384df6eeca xv-3.10a-r5.ebuild 1498
+MD5 10d17507341af594a599b750f9a588bf xv-3.10a-r6.ebuild 1755
 MD5 f0dfce1262042f01e76412c96ba62d25 files/digest-xv-3.10a-r3 125
 MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r5 61
-MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r6 61
 MD5 038271e3c5a7a3e94b5d1f5eb63c9f1e files/xv-3.10a-enhanced-Nu.patch 155050
 MD5 14eb913966c7e03b1014219c2620cac5 files/xv-3.10a-gentoo-Nu.patch 27873
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
+MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r6 61
diff --git a/media-gfx/xv/xv-3.10a-r3.ebuild b/media-gfx/xv/xv-3.10a-r3.ebuild
index cc26ce52c502..449ee951a35e 100644
--- a/media-gfx/xv/xv-3.10a-r3.ebuild
+++ b/media-gfx/xv/xv-3.10a-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r3.ebuild,v 1.11 2003/11/05 18:26:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r3.ebuild,v 1.12 2004/02/02 19:46:01 mr_bones_ Exp $
 
 inherit ccc eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.trilon.com/xv/index.html"
 SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
 	png? http://www.ibiblio.org/gentoo/distfiles/xv-png-patch.tar.bz2"
 
-LICENSE="as-is"
+LICENSE="xv"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~amd64"
 IUSE="png"
diff --git a/media-gfx/xv/xv-3.10a-r5.ebuild b/media-gfx/xv/xv-3.10a-r5.ebuild
index b03e569d5758..a3ef5f1e1bfd 100644
--- a/media-gfx/xv/xv-3.10a-r5.ebuild
+++ b/media-gfx/xv/xv-3.10a-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.7 2003/11/05 18:26:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.8 2004/02/02 19:46:01 mr_bones_ Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="An interactive image manipulation program for X which can deal with
 HOMEPAGE="http://www.trilon.com/xv/index.html"
 SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="xv"
 SLOT="0"
 KEYWORDS="~x86 ~ppc sparc ~alpha ~amd64"
 IUSE="jpeg tiff png"
diff --git a/media-gfx/xv/xv-3.10a-r6.ebuild b/media-gfx/xv/xv-3.10a-r6.ebuild
index 20fafb1b1aa7..dc053a5e6ffb 100644
--- a/media-gfx/xv/xv-3.10a-r6.ebuild
+++ b/media-gfx/xv/xv-3.10a-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r6.ebuild,v 1.4 2003/12/19 20:07:00 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r6.ebuild,v 1.5 2004/02/02 19:46:01 mr_bones_ Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="An interactive image manipulation program for X which can deal with
 HOMEPAGE="http://www.trilon.com/xv/index.html"
 SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="xv"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 mips hppa"
 IUSE="jpeg tiff png"