Fix some issues, see bug #162349 for a list.

Package-Manager: portage-2.1.2-r4

diff --git a/x11-misc/xnview/ChangeLog b/x11-misc/xnview/ChangeLog
index 5c01f28ed9416875f468d3fff6d7a553177dca77..dac4b4456f90231d2e982945dc4116a04ca58ba3 100644 (file)
--- a/x11-misc/xnview/ChangeLog
+++ b/x11-misc/xnview/ChangeLog
@@ -1,6 +1,9 @@
 # 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.24 2006/07/16 17:28:52 nelchael Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.25 2007/01/28 19:52:36 nelchael Exp $
+
+  28 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org> xnview-1.70-r2.ebuild:
+  Fix some issues, see bug #162349 for a list.
 
   16 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> xnview-1.50-r1.ebuild,
   xnview-1.70-r2.ebuild:

diff --git a/x11-misc/xnview/Manifest b/x11-misc/xnview/Manifest
index 8581496ae3cc945f6487a3e123e055a05f45d9e0..75d4f492b056589f3aedd9be8a13f585e6076a4b 100644 (file)
--- a/x11-misc/xnview/Manifest
+++ b/x11-misc/xnview/Manifest
@@ -11,14 +11,14 @@ EBUILD xnview-1.50-r1.ebuild 1337 RMD160 544d6b0760a973ff17cf544f004f7a3de10d1cd
 MD5 bc6029027d25e50f97c57db5b474cb24 xnview-1.50-r1.ebuild 1337
 RMD160 544d6b0760a973ff17cf544f004f7a3de10d1cd7 xnview-1.50-r1.ebuild 1337
 SHA256 f2b794b405edeaef3d5d70e0e66e1b6d59daf25e8aa9dad86aee5ec046c4574a xnview-1.50-r1.ebuild 1337
-EBUILD xnview-1.70-r2.ebuild 1333 RMD160 3d24f191e630fe7256960fd9b166c422c3f71f5a SHA1 1941c06b478ff45f87afbc50fd02f516cb6608a9 SHA256 fc93348e004bffe7cfce6ee11f498fc7fd82950a2cc3216800f9996a87e6aebe
-MD5 6914cc586e79add50436a8f7c06ec5f6 xnview-1.70-r2.ebuild 1333
-RMD160 3d24f191e630fe7256960fd9b166c422c3f71f5a xnview-1.70-r2.ebuild 1333
-SHA256 fc93348e004bffe7cfce6ee11f498fc7fd82950a2cc3216800f9996a87e6aebe xnview-1.70-r2.ebuild 1333
-MISC ChangeLog 3852 RMD160 7fbcacbebbdc8ad2309ff5b92eba5ae6f5bf8b82 SHA1 ed09a2bdf6425d152c85d7c7f6152a1bad8d6ad3 SHA256 6e28a5d43be66bd769312d0b5841e4c75f3c7a344fb432655553e0c35f61d09e
-MD5 735370a65090c6da8b9a0479c654ccf6 ChangeLog 3852
-RMD160 7fbcacbebbdc8ad2309ff5b92eba5ae6f5bf8b82 ChangeLog 3852
-SHA256 6e28a5d43be66bd769312d0b5841e4c75f3c7a344fb432655553e0c35f61d09e ChangeLog 3852
+EBUILD xnview-1.70-r2.ebuild 1302 RMD160 6100d5fd6f7561d72982f7bb1d2b6f080ec7a5c1 SHA1 c06d20b73a594751d27a9edf01a8cec50b02d3ac SHA256 6f446fbe96d68e2ba8410cc2f982d8aeafa43c19994cae7b61e8dd6f0fd03cee
+MD5 9e63f5701e286b67a427aefbd55705ed xnview-1.70-r2.ebuild 1302
+RMD160 6100d5fd6f7561d72982f7bb1d2b6f080ec7a5c1 xnview-1.70-r2.ebuild 1302
+SHA256 6f446fbe96d68e2ba8410cc2f982d8aeafa43c19994cae7b61e8dd6f0fd03cee xnview-1.70-r2.ebuild 1302
+MISC ChangeLog 3976 RMD160 2d67649d1745b86f125c839b54e067ef2a5a42cb SHA1 04b19fd6e215d8bf89a44051e64a92d342c65154 SHA256 c385c9fade78284bff3ffa1419b2fa61e0790837593f0f88992f313fcbf26997
+MD5 b0371f0ae8e341c9e156279565de6f9f ChangeLog 3976
+RMD160 2d67649d1745b86f125c839b54e067ef2a5a42cb ChangeLog 3976
+SHA256 c385c9fade78284bff3ffa1419b2fa61e0790837593f0f88992f313fcbf26997 ChangeLog 3976
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -30,9 +30,9 @@ MD5 b579fc4470bf1b05b05f0ed54d94e8e6 files/digest-xnview-1.70-r2 310
 RMD160 4bcb8e9f305c608f97912349cbcc7dee9965ebd3 files/digest-xnview-1.70-r2 310
 SHA256 ed800da70ceccdce7b4db49d150cf810872ad6326ad2f165fba8b0f67c023c94 files/digest-xnview-1.70-r2 310
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFEundhgo/w9rxVVVERAu9/AKCqoOvf1Nnkr39FXX7a4k+Vsuw2EwCglI7U
-JihjP3MIWimxeFtCLFobDRM=
-=RZTx
+iD8DBQFFvP8Kgo/w9rxVVVERAiO8AJ9Pl0lVO1NlZLF32L/YJwuMm2vzIgCgqgkm
+sPT1tSryeMoR6dIhLofHpcE=
+=lqHq
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/xnview/xnview-1.70-r2.ebuild b/x11-misc/xnview/xnview-1.70-r2.ebuild
index 3597a5d6e2831ac824ccc90c3dc37803bed89d79..3fde4afdaff6b9fefbd589b29f3da79342c6aa53 100644 (file)
--- a/x11-misc/xnview/xnview-1.70-r2.ebuild
+++ b/x11-misc/xnview/xnview-1.70-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3 2006/07/16 17:28:52 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70-r2.ebuild,v 1.4 2007/01/28 19:52:36 nelchael Exp $
 
 DESCRIPTION="XnView image viewer/converter"
 HOMEPAGE="http://www.xnview.com/"
@@ -11,19 +11,17 @@ 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"
-
+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"
+DEPEND=""
+
+RESTRICT="strip"
 S="${WORKDIR}/XnView-1.70-x86-unknown-linux2.x-static-fc4"
 
 src_unpack() {
@@ -40,18 +38,17 @@ src_unpack() {
 
 src_install() {
 
-       BASE_DIR=/opt/XnView
-
-       into /opt
-       dobin bin/{xnview,nview,nconvert}
+       into /opt/XnView
+       for x in xnview nview nconvert ; do
+               dobin bin/${x}
+               dosym /opt/XnView/bin/${x} /opt/bin/${x}
+       done
 
-       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
+       insinto /usr/share/X11/app-defaults
+       newins app-defaults/XnView.ad XnView
+       fperms 444 /usr/share/X11/app-defaults/XnView
 
        dodoc *.txt
+       doman man/*.1
 
 }