Missing DEPEND on fonts should be added to new revisions, fixed this.

(Portage version: 2.1.1_pre2-r8)

8 files changed, 133 insertions, 8 deletions

diff --git a/x11-misc/xnview/ChangeLog b/x11-misc/xnview/ChangeLog
index 40f2b4a166a3..e0c087d227fc 100644
--- a/x11-misc/xnview/ChangeLog
+++ b/x11-misc/xnview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xnview
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.21 2006/07/13 13:04:59 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.22 2006/07/14 10:44:45 nelchael Exp $
+
+*xnview-1.70-r2 (13 Jul 2006)
+*xnview-1.50-r1 (13 Jul 2006)
+
+  13 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> xnview-1.50.ebuild,
+  +xnview-1.50-r1.ebuild, xnview-1.70-r1.ebuild, +xnview-1.70-r2.ebuild:
+  Missing DEPEND on fonts should be added to new revisions, fixed this.
 
   13 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> xnview-1.70-r1.ebuild:
   Fix bug #140104.
diff --git a/x11-misc/xnview/files/digest-xnview-1.50 b/x11-misc/xnview/files/digest-xnview-1.50
index 87a3b5820729..2c570ba5e671 100644
--- a/x11-misc/xnview/files/digest-xnview-1.50
+++ b/x11-misc/xnview/files/digest-xnview-1.50
@@ -1,2 +1,3 @@
-MD5 299fda4a8b2fc06aad3da16e005c60a1 XnView-static-1.50.i386.rpm 1332093
 MD5 988a83f8798436d19a3c9da0fa949f1a XnView-static-1.50.ppc.rpm 1547839
+RMD160 96af8e4739e9d224045600b5cfcbaf033d1f5c1a XnView-static-1.50.ppc.rpm 1547839
+SHA256 9fb099166667be194a50b5751895cd4f578949b050dcebd8461e082e4ade9c6c XnView-static-1.50.ppc.rpm 1547839
diff --git a/x11-misc/xnview/files/digest-xnview-1.50-r1 b/x11-misc/xnview/files/digest-xnview-1.50-r1
new file mode 100644
index 000000000000..2c570ba5e671
--- /dev/null
+++ b/x11-misc/xnview/files/digest-xnview-1.50-r1
@@ -0,0 +1,3 @@
+MD5 988a83f8798436d19a3c9da0fa949f1a XnView-static-1.50.ppc.rpm 1547839
+RMD160 96af8e4739e9d224045600b5cfcbaf033d1f5c1a XnView-static-1.50.ppc.rpm 1547839
+SHA256 9fb099166667be194a50b5751895cd4f578949b050dcebd8461e082e4ade9c6c XnView-static-1.50.ppc.rpm 1547839
diff --git a/x11-misc/xnview/files/digest-xnview-1.70-r2 b/x11-misc/xnview/files/digest-xnview-1.70-r2
new file mode 100644
index 000000000000..652913695515
--- /dev/null
+++ b/x11-misc/xnview/files/digest-xnview-1.70-r2
@@ -0,0 +1,3 @@
+MD5 b5ab466eb572a6ea429a9c579644e582 XnView-x86-unknown-linux2.x-static-fc4.tgz 2638621
+RMD160 47043ad9ce78321bd37e76d51f8600547d3568a7 XnView-x86-unknown-linux2.x-static-fc4.tgz 2638621
+SHA256 a48fb036f3563c0a235077fbc948ced4d3cd0e3953ffcd9ed0e1f20e06b1e0fb XnView-x86-unknown-linux2.x-static-fc4.tgz 2638621
diff --git a/x11-misc/xnview/xnview-1.50-r1.ebuild b/x11-misc/xnview/xnview-1.50-r1.ebuild
new file mode 100644
index 000000000000..4b20bdbba07b
--- /dev/null
+++ b/x11-misc/xnview/xnview-1.50-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.50-r1.ebuild,v 1.1 2006/07/14 10:44:45 nelchael Exp $
+
+inherit rpm
+
+MY_PN=XnView-static
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XnView image viewer/converter"
+HOMEPAGE="http://www.xnview.com/"
+SRC_URI="mirror://gentoo/${MY_P}.ppc.rpm"
+
+SLOT="0"
+LICENSE="free-noncomm as-is"
+KEYWORDS="-* ~ppc"
+IUSE=""
+
+RDEPEND="|| ( (
+		x11-libs/libXau
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libXdmcp
+		|| ( media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi ) )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	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.50.ebuild b/x11-misc/xnview/xnview-1.50.ebuild
index aa48e05ec3d9..e6b6d666fa81 100644
--- a/x11-misc/xnview/xnview-1.50.ebuild
+++ b/x11-misc/xnview/xnview-1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.50.ebuild,v 1.14 2006/05/28 18:55:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.50.ebuild,v 1.15 2006/07/14 10:44:45 nelchael Exp $
 
 inherit rpm
 
@@ -9,8 +9,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="XnView image viewer/converter"
 HOMEPAGE="http://www.xnview.com/"
-SRC_URI="x86? ( mirror://gentoo/${MY_P}.i386.rpm )
-	ppc? ( mirror://gentoo/${MY_P}.ppc.rpm )"
+SRC_URI="mirror://gentoo/${MY_P}.ppc.rpm"
 
 SLOT="0"
 LICENSE="free-noncomm as-is"
diff --git a/x11-misc/xnview/xnview-1.70-r1.ebuild b/x11-misc/xnview/xnview-1.70-r1.ebuild
index d562dca91f20..af0ccbf99248 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-2006 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.5 2006/07/13 13:04:59 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70-r1.ebuild,v 1.6 2006/07/14 10:44:45 nelchael Exp $
 
 DESCRIPTION="XnView image viewer/converter"
 HOMEPAGE="http://www.xnview.com/"
@@ -17,8 +17,7 @@ RDEPEND="|| ( (
 		x11-libs/libXt
 		x11-libs/libXext
 		x11-libs/libXp
-		x11-libs/libXdmcp
-		|| ( media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi ) )
+		x11-libs/libXdmcp )
 	virtual/x11 )"
 DEPEND="${RDEPEND}
 		sys-libs/glibc"
diff --git a/x11-misc/xnview/xnview-1.70-r2.ebuild b/x11-misc/xnview/xnview-1.70-r2.ebuild
new file mode 100644
index 000000000000..37d00fe6cf46
--- /dev/null
+++ b/x11-misc/xnview/xnview-1.70-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70-r2.ebuild,v 1.1 2006/07/14 10:44:45 nelchael Exp $
+
+DESCRIPTION="XnView image viewer/converter"
+HOMEPAGE="http://www.xnview.com/"
+SRC_URI="x86? ( http://download.xnview.com/XnView-x86-unknown-linux2.x-static-fc4.tgz )"
+
+SLOT="0"
+LICENSE="free-noncomm as-is"
+KEYWORDS="-* ~x86"
+IUSE=""
+
+RDEPEND="|| ( (
+		x11-libs/libXau
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libXdmcp
+		|| ( media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi ) )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+		sys-libs/glibc"
+
+S="${WORKDIR}/XnView-1.70-x86-unknown-linux2.x-static-fc4"
+
+src_unpack() {
+
+	unpack "${A}"
+
+	einfo "Fixing RPATH"
+	cd "${S}"
+	sed -i -e 's#.:/usr/local/lib#/opt/XnView/lib\x00#g' bin/xnview
+	sed -i -e 's#.:/usr/local/lib#/opt/XnView/lib\x00#g' bin/nview
+	sed -i -e 's#.:/usr/local/lib#/opt/XnView/lib\x00#g' bin/nconvert
+
+}
+
+src_install() {
+
+	BASE_DIR=/opt/XnView
+
+	into /opt
+	dobin bin/{xnview,nview,nconvert}
+
+	cp app-defaults/XnView.ad app-defaults/XnView
+	insinto /usr/lib/X11/app-defaults/XnView
+	doins app-defaults/XnView
+	fperms 444 /usr/lib/X11/app-defaults/XnView
+
+	doman man/*.1
+
+	dodoc *.txt
+
+}