Version bump, see bug #128241.

(Portage version: 2.1_pre7-r5)

6 files changed, 55 insertions, 49 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index e2556ecb6e67..1f678384e41a 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xosview
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.28 2006/02/07 21:12:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.29 2006/04/14 18:27:10 nelchael Exp $
+
+*xosview-1.8.3 (14 Apr 2006)
+
+  14 Apr 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xosview-1.8.2.ebuild,
+  +xosview-1.8.3.ebuild:
+  Version bump, see bug #128241.
 
   07 Feb 2006; Simon Stelling <blubb@gentoo.org> xosview-1.8.2-r1.ebuild:
   stable on amd64
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index bf25d94f4e7a..02528d2fcd82 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -7,6 +7,9 @@ SHA256 2c6914adb3af2a0c05c252d915fc0f9daa0e00464109647d91e9d868b8a40a4f files/di
 MD5 efaaa39f5b7d26d1feffe219417ed633 files/digest-xosview-1.8.2-r1 65
 RMD160 96db2522b6fb6e4e125ff2b94c171b4a914e705c files/digest-xosview-1.8.2-r1 65
 SHA256 2c6914adb3af2a0c05c252d915fc0f9daa0e00464109647d91e9d868b8a40a4f files/digest-xosview-1.8.2-r1 65
+MD5 8c6c1708135ded34438c8f4bc5139405 files/digest-xosview-1.8.3 241
+RMD160 04d1608e43b1de54cb92a9608bcfd09ac9b58e98 files/digest-xosview-1.8.3 241
+SHA256 d368c4c5870b977f44d160c9502d28bd84e22e3528731a52deb848f5dddf4822 files/digest-xosview-1.8.3 241
 MD5 e5d743e89fadcc4cc2facb642650e018 files/xosview-emptyxpaths.patch 1861
 RMD160 e3c1d82654843335db656a12cb820f74e5a53692 files/xosview-emptyxpaths.patch 1861
 SHA256 64e87a9c6e03e682be98986fa4fef68b57a779d93908f5bf9c8b2d4efd0930b8 files/xosview-emptyxpaths.patch 1861
@@ -22,3 +25,6 @@ SHA256 928053f3d36522abdcc879a4dd7fe9a85d77183c540982cb1a68d12c3c0b591e xosview-
 MD5 82cf5bbe339f4848d4e5230bbcef2859 xosview-1.8.2.ebuild 1223
 RMD160 45fb2dcf38dc1aa4ab738a3df41513888fc82e58 xosview-1.8.2.ebuild 1223
 SHA256 b0703d8afe08ada29a7775881117adba4d13300bba81037f1bb3c30f1cc1bbab xosview-1.8.2.ebuild 1223
+MD5 1500cab3fa1c9de3787d920f8c7d25c6 xosview-1.8.3.ebuild 962
+RMD160 ce9860bb189a4647d8ba60cdc859f0f384ae29cc xosview-1.8.3.ebuild 962
+SHA256 928053f3d36522abdcc879a4dd7fe9a85d77183c540982cb1a68d12c3c0b591e xosview-1.8.3.ebuild 962
diff --git a/x11-misc/xosview/files/digest-xosview-1.8.2 b/x11-misc/xosview/files/digest-xosview-1.8.2
deleted file mode 100644
index 1627abd4cc5e..000000000000
--- a/x11-misc/xosview/files/digest-xosview-1.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc8b261b1f8d82da29239f1cc2ee55e9 xosview-1.8.2.tar.gz 248859
diff --git a/x11-misc/xosview/files/digest-xosview-1.8.3 b/x11-misc/xosview/files/digest-xosview-1.8.3
new file mode 100644
index 000000000000..0ac3dbaabd75
--- /dev/null
+++ b/x11-misc/xosview/files/digest-xosview-1.8.3
@@ -0,0 +1,3 @@
+MD5 88cf9fecfcc27a42d132d1f983c1f091 xosview-1.8.3.tar.gz 259793
+RMD160 595e812dee686ccaa5d95eb537782679d752271b xosview-1.8.3.tar.gz 259793
+SHA256 3aa28fb12552ea106e06f6958e1a0913bde8b0bb1491c091a3f1849717736b66 xosview-1.8.3.tar.gz 259793
diff --git a/x11-misc/xosview/xosview-1.8.2.ebuild b/x11-misc/xosview/xosview-1.8.2.ebuild
deleted file mode 100644
index 583608dadd87..000000000000
--- a/x11-misc/xosview/xosview-1.8.2.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/xosview/xosview-1.8.2.ebuild,v 1.11 2005/11/01 15:13:17 nelchael Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="X11 operating system viewer"
-SRC_URI="mirror://sourceforge/xosview/${P}.tar.gz"
-HOMEPAGE="http://xosview.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2 BSD"
-KEYWORDS="x86 alpha ppc amd64 sparc ppc64"
-
-DEPEND="virtual/x11"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/xosview-emptyxpaths.patch"
-}
-
-src_compile() {
-	# 2.6 kernel compatibility has been fixed upstream...
-	#if [ `uname -r | cut -d. -f1` -eq 2 -a `uname -r | cut -d. -f2` -ge 5 -a `uname -r | cut -d. -f2` -le 6 ] ; then
-	#	einfo "You are running `uname -r`"
-	#	einfo "Using 2.5/2.6 kernel compatibility patch"
-	#	epatch ${FILESDIR}/xosview-1.8.1-kernel-2.5+.diff || die "patch failed"
-	#fi
-
-	use ppc64 && gnuconfig_update
-
-	econf || die "configuration failed"
-	emake || die "compilation failed"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe xosview
-	insinto /etc/X11/app-defaults
-	cp Xdefaults XOsview
-	doins XOsview
-	into /usr
-	doman *.1
-	dodoc CHANGES README README.linux TODO
-}
diff --git a/x11-misc/xosview/xosview-1.8.3.ebuild b/x11-misc/xosview/xosview-1.8.3.ebuild
new file mode 100644
index 000000000000..38587113a9df
--- /dev/null
+++ b/x11-misc/xosview/xosview-1.8.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.1 2006/04/14 18:27:10 nelchael Exp $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="X11 operating system viewer"
+SRC_URI="mirror://sourceforge/xosview/${P}.tar.gz"
+HOMEPAGE="http://xosview.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2 BSD"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/xosview-emptyxpaths.patch"
+	epatch "${FILESDIR}/xosview-resdir.patch"
+	gnuconfig_update # for ppc64, but no reason to restrict it
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe xosview
+	insinto /etc/X11/app-defaults
+	newins Xdefaults XOsview
+	doman *.1
+	dodoc CHANGES README README.linux TODO
+}