Stable on x86 (bug #117063).

Package-Manager: portage-2.1_pre2

5 files changed, 9 insertions, 55 deletions

diff --git a/x11-misc/xnview/ChangeLog b/x11-misc/xnview/ChangeLog
index dcf05d0fb8bc..fb5ead22f864 100644
--- a/x11-misc/xnview/ChangeLog
+++ b/x11-misc/xnview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xnview
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.16 2005/12/29 16:51:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.17 2005/12/29 21:52:19 nelchael Exp $
+
+  29 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org> -xnview-1.68.ebuild,
+  xnview-1.70-r1.ebuild:
+  Stable on x86 (bug #117063).
 
 *xnview-1.70-r1 (29 Dec 2005)
 
diff --git a/x11-misc/xnview/Manifest b/x11-misc/xnview/Manifest
index 71cf0510280c..60d22b59ca9c 100644
--- a/x11-misc/xnview/Manifest
+++ b/x11-misc/xnview/Manifest
@@ -1,9 +1,7 @@
-MD5 490d0551bf6c5c8bdb9c5ea6aef72e27 ChangeLog 2704
+MD5 2408cd1ff73c1d7ee5fe4738bfc3a7e3 ChangeLog 2835
 MD5 fe2cf2952d86b4eed345d6a7e405d64b files/99XnView 44
 MD5 7497208eecea3974c348190b50713744 files/digest-xnview-1.50 145
-MD5 8906b1ca75ddac450c6030f18d60aefb files/digest-xnview-1.68 73
 MD5 41da862cceba7502ffb2f29c4c6afb7a files/digest-xnview-1.70-r1 88
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 dbc56ab365e37ffd99d6bcfc6a21a313 xnview-1.50.ebuild 1142
-MD5 7e9339d33d4316430227eef8e79ef1a7 xnview-1.68.ebuild 1097
-MD5 b489513b539cef8d3aa5fd9b92c04633 xnview-1.70-r1.ebuild 1084
+MD5 04d4874b349e4c3bae0265ad96ad10c5 xnview-1.70-r1.ebuild 1083
diff --git a/x11-misc/xnview/files/digest-xnview-1.68 b/x11-misc/xnview/files/digest-xnview-1.68
deleted file mode 100644
index efc42b7b60f6..000000000000
--- a/x11-misc/xnview/files/digest-xnview-1.68
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fa350616459405ca37bb809dce46dd8 XnView-static-1.68.i386.rpm 1515380
diff --git a/x11-misc/xnview/xnview-1.68.ebuild b/x11-misc/xnview/xnview-1.68.ebuild
deleted file mode 100644
index 408bac9f3b00..000000000000
--- a/x11-misc/xnview/xnview-1.68.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.68.ebuild,v 1.11 2005/07/12 02:15:28 josejx Exp $
-
-inherit rpm
-
-MY_PN=XnView-static
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XnView image viewer/converter"
-HOMEPAGE="http://www.xnview.com/"
-SRC_URI="x86? ( mirror://gentoo/${MY_P}.i386.rpm )"
-
-SLOT="0"
-LICENSE="free-noncomm as-is"
-KEYWORDS="x86 -*"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-
-S="${WORKDIR}/usr"
-
-src_install() {
-	BASE_DIR=/opt/XnView
-
-	into /opt
-	dobin X11R6/bin/{xnview,nview,nconvert}
-
-	into ${BASE_DIR}
-	dolib lib/libformat.so.*
-	LIBFORMAT_VER=`ls lib/libformat.so.* | cut -f 3,4 -d .`
-	dosym ${BASE_DIR}/lib/libformat.so.${LIBFORMAT_VER} ${BASE_DIR}/lib/libformat.so
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/99XnView
-
-	insinto /usr/lib/X11/app-defaults/XnView
-	doins X11R6/lib/X11/app-defaults/XnView
-	fperms 444 /usr/lib/X11/app-defaults/XnView
-
-	doman local/man/man1/*.1
-
-	dodoc doc/XnView-${PV}/*.txt
-
-	insinto ${BASE_DIR}/Filters/
-	doins share/XnView/Filters/*.dat
-}
diff --git a/x11-misc/xnview/xnview-1.70-r1.ebuild b/x11-misc/xnview/xnview-1.70-r1.ebuild
index 9302ed1f9232..173d30a80b88 100644
--- a/x11-misc/xnview/xnview-1.70-r1.ebuild
+++ b/x11-misc/xnview/xnview-1.70-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70-r1.ebuild,v 1.1 2005/12/29 16:51:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70-r1.ebuild,v 1.2 2005/12/29 21:52:19 nelchael Exp $
 
 DESCRIPTION="XnView image viewer/converter"
 HOMEPAGE="http://www.xnview.com/"
@@ -8,7 +8,7 @@ SRC_URI="x86? ( http://download.xnview.com/XnView-x86-unknown-linux2.x-static-fc
 
 SLOT="0"
 LICENSE="free-noncomm as-is"
-KEYWORDS="~x86 -*"
+KEYWORDS="x86 -*"
 IUSE=""
 
 DEPEND="virtual/x11"