Made ebuilds use versioned rpms, rpm.eclass, and version bump

diff --git a/x11-misc/xnview/ChangeLog b/x11-misc/xnview/ChangeLog
index e8bff403e9b0ac1aa5b5cfa29be0ba90e718414a..7942d1a68e46d89ea96c6a71ded012cca45608d1 100644 (file)
--- a/x11-misc/xnview/ChangeLog
+++ b/x11-misc/xnview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xnview
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.3 2003/11/04 03:40:44 abhishek Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.4 2004/04/14 01:36:27 abhishek Exp $
+
+*xnview-1.68 (13 Apr 2004)
+
+  13 Apr 2004; Abhishek Amit <abhishek@gentoo.org> xnview-1.50.ebuild,
+  xnview-1.68.ebuild:
+  Made ebuilds use versioned rpms, rpm.eclass, and version bump
 
   03 Nov 2003; Abhishek Amit <abhishek@gentoo.org> metadata.xml:
   Added metadata.xml

diff --git a/x11-misc/xnview/Manifest b/x11-misc/xnview/Manifest
index c992868749fcb3483d85e9cc7f6d5cea24908a4a..c23475c0dfc157b415b11547b36348e970e49efb 100644 (file)
--- a/x11-misc/xnview/Manifest
+++ b/x11-misc/xnview/Manifest
@@ -1,5 +1,7 @@
-MD5 4f740b42cc2225fc8fb421a3505f016f files/digest-xnview-1.50 135
-MD5 fe2cf2952d86b4eed345d6a7e405d64b files/99XnView 44
-MD5 6f160b5ec19210d6594a4388ae5f5f07 xnview-1.50.ebuild 1248
-MD5 a6a02312bc38f7f5c8e9879bea81c2c4 ChangeLog 1028
+MD5 4659887c23e62b4dc77aa869ecf53dc1 xnview-1.50.ebuild 1065
+MD5 2e9cd2d65672ea5f3e9f2e9933e1431e ChangeLog 1214
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 86223d879c3f1babd6963932a577d45f xnview-1.68.ebuild 1021
+MD5 aace0ca3cd3cbc24d9f923948198d42f files/digest-xnview-1.50 73
+MD5 8906b1ca75ddac450c6030f18d60aefb files/digest-xnview-1.68 73
+MD5 fe2cf2952d86b4eed345d6a7e405d64b files/99XnView 44

diff --git a/x11-misc/xnview/files/digest-xnview-1.50 b/x11-misc/xnview/files/digest-xnview-1.50
index b31f6db43910a1250cd3e9534856a2444ec9ad79..fa6ff39ab6fcbe4bf54a47c83cfd039070854173 100644 (file)
--- a/x11-misc/xnview/files/digest-xnview-1.50
+++ b/x11-misc/xnview/files/digest-xnview-1.50
@@ -1,2 +1 @@
-MD5 988a83f8798436d19a3c9da0fa949f1a XnView-static.ppc.rpm 1547839
-MD5 299fda4a8b2fc06aad3da16e005c60a1 XnView-static.i386.rpm 1332093
+MD5 299fda4a8b2fc06aad3da16e005c60a1 XnView-static-1.50.i386.rpm 1332093

diff --git a/x11-misc/xnview/files/digest-xnview-1.68 b/x11-misc/xnview/files/digest-xnview-1.68
new file mode 100644 (file)
index 0000000..efc42b7
--- /dev/null
+++ b/x11-misc/xnview/files/digest-xnview-1.68
@@ -0,0 +1 @@
+MD5 1fa350616459405ca37bb809dce46dd8 XnView-static-1.68.i386.rpm 1515380

diff --git a/x11-misc/xnview/xnview-1.50.ebuild b/x11-misc/xnview/xnview-1.50.ebuild
index 5835cabbad4c0e53fff9b3ba03e98856bdcba4c8..a8e8d746c7df74f8f11fab02e4aecdb3f1faf480 100644 (file)
--- a/x11-misc/xnview/xnview-1.50.ebuild
+++ b/x11-misc/xnview/xnview-1.50.ebuild
@@ -1,44 +1,40 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.6 2003/09/05 23:18:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.50.ebuild,v 1.7 2004/04/14 01:36:27 abhishek Exp $
+
+inherit rpm
+
+MY_PN=XnView-static
+MY_P="${MY_PN}-${PV}"
 
-MY_P=XnView-static
-S=${WORKDIR}/usr
 DESCRIPTION="XnView image viewer/converter"
 HOMEPAGE="http://www.xnview.com/"
-SRC_URI="x86? ftp://www.zoo-logique.org/xnview/download/${MY_P}.i386.rpm
-       ppc? ftp://www.zoo-logique.org/xnview/download/${MY_P}.ppc.rpm"
+SRC_URI="x86? mirror://gentoo/${MY_P}.i386.rpm
+               ppc? mirror://gentoo/${MY_P}.ppc.rpm"
 
 SLOT="0"
 LICENSE="free-noncomm as-is"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="app-arch/rpm2targz"
 
-src_unpack() {
-       rpm2targz ${DISTDIR}/${A}
-
-       use x86 && MY_P=${MY_P}.i386
-       use ppc && MY_P=${MY_P}.ppc
-
-       tar zxvf ${WORKDIR}/${MY_P}.tar.gz &>/dev/null
-}
+S="${WORKDIR}/usr"
 
 src_install() {
        BASE_DIR=/opt/XnView
 
        into /opt
-       dobin ${S}/X11R6/bin/{xnview,nview,nconvert}
+       dobin X11R6/bin/{xnview,nview,nconvert}
 
        into ${BASE_DIR}
-       dolib lib/libformat.so.3.87
-       dosym ${BASE_DIR}/lib/libformat.so.3.87 ${BASE_DIR}/lib/libformat.so
+       dolib lib/libformat.so.*
+       dosym ${BASE_DIR}/lib/libformat.so.* ${BASE_DIR}/lib/libformat.so
 
        insinto /etc/env.d
        doins ${FILESDIR}/99XnView
 
        insinto /usr/lib/X11/app-defaults/XnView
-       doins ${S}/X11R6/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
@@ -46,5 +42,5 @@ src_install() {
        dodoc doc/XnView-${PV}/*.txt
 
        insinto ${BASE_DIR}/Filters/
-       doins usr/share/XnView/Filters/*.dat
+       doins share/XnView/Filters/*.dat
 }

diff --git a/x11-misc/xnview/xnview-1.68.ebuild b/x11-misc/xnview/xnview-1.68.ebuild
new file mode 100644 (file)
index 0000000..ec9513f
--- /dev/null
+++ b/x11-misc/xnview/xnview-1.68.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/14 01:36:27 abhishek 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"
+
+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.*
+       dosym ${BASE_DIR}/lib/libformat.so.* ${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
+}