Remove old ebuild, make modular X friendly, do not install COPYING/INSTALL.

(Portage version: 2.0.54)

5 files changed, 20 insertions, 44 deletions

diff --git a/media-gfx/qiv/ChangeLog b/media-gfx/qiv/ChangeLog
index d1bb11d6a716..fbaa1a882382 100644
--- a/media-gfx/qiv/ChangeLog
+++ b/media-gfx/qiv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/qiv
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/ChangeLog,v 1.15 2005/09/13 17:04:16 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/ChangeLog,v 1.16 2006/01/19 18:28:52 vanquirius Exp $
+
+  19 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -qiv-1.7-r3.ebuild,
+  qiv-2.0.ebuild:
+  Remove old ebuild, make modular X friendly, do not install COPYING/INSTALL.
 
   13 Sep 2005; Aron Griffis <agriffis@gentoo.org> qiv-1.9.ebuild:
   Mark 1.9 stable on alpha
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index 1434b4db1f93..5431ca5ae716 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -1,10 +1,8 @@
-MD5 bda79ca65b5f47c4f7323c21def0d605 qiv-2.0.ebuild 749
-MD5 97b5c11fc7ef5fc991b15cc20c3cf2c6 qiv-1.9_pre10.ebuild 642
-MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
 MD5 9ac1a05327b6910b3a12cfa35669f0df ChangeLog 1950
-MD5 7566d60aff071101c76389eac6ef6390 qiv-1.9.ebuild 622
-MD5 2fa2f734aa7d5270c35bb46b190216ce qiv-1.7-r3.ebuild 612
-MD5 98b8d5ed7bf4340676a2aa8e16906c81 files/digest-qiv-1.7-r3 59
 MD5 28ceb350e2f9981483bf5dd1408e8f47 files/digest-qiv-1.9 59
 MD5 5699ee267d58090636ca8299ff3f9c78 files/digest-qiv-1.9_pre10 62
 MD5 c05ba881e54da3f1b35e28258d497037 files/digest-qiv-2.0 59
+MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
+MD5 7566d60aff071101c76389eac6ef6390 qiv-1.9.ebuild 622
+MD5 97b5c11fc7ef5fc991b15cc20c3cf2c6 qiv-1.9_pre10.ebuild 642
+MD5 150c9861c289339810f4e65f39a5f422 qiv-2.0.ebuild 840
diff --git a/media-gfx/qiv/files/digest-qiv-1.7-r3 b/media-gfx/qiv/files/digest-qiv-1.7-r3
deleted file mode 100644
index f46d6b6c1ddb..000000000000
--- a/media-gfx/qiv/files/digest-qiv-1.7-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8b0f4edaf6b596bc9aab4be5f0faf4c qiv-1.7-src.tgz 88107
diff --git a/media-gfx/qiv/qiv-1.7-r3.ebuild b/media-gfx/qiv/qiv-1.7-r3.ebuild
deleted file mode 100644
index 10aef7c8c637..000000000000
--- a/media-gfx/qiv/qiv-1.7-r3.ebuild
+++ /dev/null
@@ -1,28 +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/qiv/qiv-1.7-r3.ebuild,v 1.13 2005/07/28 21:10:58 chriswhite Exp $
-
-DESCRIPTION="Quick Image Viewer"
-SRC_URI="http://www.klografx.net/qiv/download/${P}-src.tgz"
-HOMEPAGE="http://www.klografx.net/qiv/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha sparc"
-IUSE=""
-
-DEPEND="media-libs/libpng
-	>=media-libs/tiff-3.5.5
-	>=media-libs/imlib-1.9.10
-	virtual/x11"
-
-src_compile() {
-	make || die
-}
-
-src_install () {
-	into /usr
-	dobin qiv
-	doman qiv.1
-	dodoc README*
-}
diff --git a/media-gfx/qiv/qiv-2.0.ebuild b/media-gfx/qiv/qiv-2.0.ebuild
index 39cb02b5d823..efa61633e460 100644
--- a/media-gfx/qiv/qiv-2.0.ebuild
+++ b/media-gfx/qiv/qiv-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-2.0.ebuild,v 1.2 2005/07/28 21:10:58 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-2.0.ebuild,v 1.3 2006/01/19 18:28:52 vanquirius Exp $
 
-MY_P=${P/_/-}
-S=${WORKDIR}/${P%%_*}
+MY_P="${P/_/-}"
+S="${WORKDIR}/${P%%_*}"
 DESCRIPTION="Quick Image Viewer"
 SRC_URI="http://www.kdown1.de/files/${MY_P}-src.tgz"
 HOMEPAGE="http://www.klografx.net/qiv/"
@@ -16,16 +16,19 @@ IUSE="xinerama"
 DEPEND="media-libs/libpng
 	>=media-libs/tiff-3.5.5
 	>=media-libs/imlib-1.9.10
-	virtual/x11"
+	|| (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-proto/xineramaproto-1.1.2 )
+	virtual/x11 )"
 
 src_compile() {
 	use xinerama && sed -i "s:# GTD_XINERAMA = -DGTD_XINERAMA:GTD_XINERAMA = -DGTD_XINERAMA:" Makefile
-	make || die
+	emake || die
 }
 
 src_install () {
 	into /usr
 	dobin qiv
 	doman qiv.1
-	dodoc README*
+	dodoc README{,.TODO,.CHANGES}
 }