Added metadata.xml. Cleaned install path. Marked 0.9.1 stable.

7 files changed, 61 insertions, 52 deletions

diff --git a/media-gfx/w3mimgfb/ChangeLog b/media-gfx/w3mimgfb/ChangeLog
index f191c2d7e2a9..96c4938c6e91 100644
--- a/media-gfx/w3mimgfb/ChangeLog
+++ b/media-gfx/w3mimgfb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/w3mimgfb
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/ChangeLog,v 1.3 2003/08/13 17:13:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/ChangeLog,v 1.4 2003/11/05 20:13:11 usata Exp $
+
+  06 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3mimgfb-0.7.1.ebuild,
+  w3mimgfb-0.8.ebuild, w3mimgfb-0.9.1.ebuild:
+  Cleanup installation path. Marked 0.9.1 stable.
 
 *w3mimgfb-0.9.1 (14 Aug 2003)
 
diff --git a/media-gfx/w3mimgfb/Manifest b/media-gfx/w3mimgfb/Manifest
index 4c0b6276651e..492bb261d306 100644
--- a/media-gfx/w3mimgfb/Manifest
+++ b/media-gfx/w3mimgfb/Manifest
@@ -1,7 +1,6 @@
-MD5 114b6888117b43ef91e40bfcbe98c4f3 ChangeLog 826
-MD5 f9de8397fd33347a9ce593714327f188 w3mimgfb-0.7.1.ebuild 822
-MD5 6aeea043005035f56fd2730ae0f8353c w3mimgfb-0.8.ebuild 820
-MD5 174f37ca5616ddee2f9b5c590f893b83 w3mimgfb-0.9.1.ebuild 1056
-MD5 03177f6c3ff748dd109287e5eeeb0933 files/digest-w3mimgfb-0.7.1 65
+MD5 10119aaaba0871b554b4b245f5e6dec0 ChangeLog 995
+MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
+MD5 216d4e56a0cf05908321c2b13f3f4d41 w3mimgfb-0.8.ebuild 1260
+MD5 25dde2f4a9832f0fbafe64bb65280cd8 w3mimgfb-0.9.1.ebuild 1262
 MD5 d99ba8e5acdf25cebb8d0c7d2786a3ec files/digest-w3mimgfb-0.8 62
 MD5 9a3da37d4a2b9e331d232580b09d7b3f files/digest-w3mimgfb-0.9.1 65
diff --git a/media-gfx/w3mimgfb/files/digest-w3mimgfb-0.7.1 b/media-gfx/w3mimgfb/files/digest-w3mimgfb-0.7.1
deleted file mode 100644
index 0dd9d0242902..000000000000
--- a/media-gfx/w3mimgfb/files/digest-w3mimgfb-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd2f4359573dc3a27408a3ad7a40cef8 w3mimgfb-0.7.1.tar.gz 12925
diff --git a/media-gfx/w3mimgfb/metadata.xml b/media-gfx/w3mimgfb/metadata.xml
new file mode 100644
index 000000000000..23d9f0beb302
--- /dev/null
+++ b/media-gfx/w3mimgfb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>usata@gentoo.org</email>
+  <name>Mamoru KOMACHI</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/w3mimgfb/w3mimgfb-0.7.1.ebuild b/media-gfx/w3mimgfb/w3mimgfb-0.7.1.ebuild
deleted file mode 100644
index 57300386cc38..000000000000
--- a/media-gfx/w3mimgfb/w3mimgfb-0.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.7.1.ebuild,v 1.2 2003/08/13 17:13:00 usata Exp $
-
-IUSE=""
-
-DESCRIPTION="Image viewer for w3m under frame buffer environment"
-SRC_URI="http://homepage3.nifty.com/slokar/fb/${P}.tar.gz"
-HOMEPAGE="http://homepage3.nifty.com/slokar/fb/w3mimg.html"
-
-SLOT="0"
-LICENSE="w3m BSD"
-KEYWORDS="x86"
-
-DEPEND=">=media-libs/stimg-0.1.0
-	virtual/textbrowser"
-
-src_compile() {
-	emake CC="${CC}" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	if [ -d /usr/lib/w3m ] ; then
-		exeinto /usr/lib/w3m
-		doexe w3mimgdisplayfb
-	fi
-	if [ -d /usr/lib/w3m-m17n ] ; then
-		exeinto /usr/lib/w3m-m17n
-		doexe w3mimgdisplayfb
-	fi
-
-	dodoc COPYING readme.txt
-}
diff --git a/media-gfx/w3mimgfb/w3mimgfb-0.8.ebuild b/media-gfx/w3mimgfb/w3mimgfb-0.8.ebuild
index 6aeb62230bac..e353ce02266f 100644
--- a/media-gfx/w3mimgfb/w3mimgfb-0.8.ebuild
+++ b/media-gfx/w3mimgfb/w3mimgfb-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.8.ebuild,v 1.2 2003/08/13 17:13:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.8.ebuild,v 1.3 2003/11/05 20:13:11 usata Exp $
 
 IUSE=""
 
@@ -20,14 +20,32 @@ src_compile() {
 }
 
 src_install() {
-	if [ -d /usr/lib/w3m ] ; then
+
+	local realbin
+
+	if has_version '<net-www/w3m-0.4.2' ; then
 		exeinto /usr/lib/w3m
 		doexe w3mimgdisplayfb
+	elif has_version '>=net-www/w3m-0.4.2-r1' ; then
+		exeinto /usr/libexec/w3m
+		doexe w3mimgdisplayfb
 	fi
-	if [ -d /usr/lib/w3m-m17n ] ; then
+	if has_version '<net-www/w3m-m17n-0.4.2' ; then
 		exeinto /usr/lib/w3m-m17n
 		doexe w3mimgdisplayfb
+	elif has_version '>=net-www/w3m-m17n-0.4.2' ; then
+		exeinto /usr/libexec/w3m-m17n
+		doexe w3mimgdisplayfb
 	fi
 
+	for exe in /usr/lib{,exec}/w3m{,-m17n}/w3mimgdisplayfb ; do
+		if [ -n "$realexe" ] ; then
+			rm ${D}$exe
+			dohard $realexe $exe
+		elif [ -x ${D}$exe ] ; then
+			realexe=$exe
+		fi
+	done
+
 	dodoc COPYING readme.txt
 }
diff --git a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
index 5c09323807f1..03838c4c7792 100644
--- a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
+++ b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild,v 1.1 2003/08/13 17:13:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild,v 1.2 2003/11/05 20:13:11 usata Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://homepage3.nifty.com/slokar/fb/w3mimg.html"
 
 SLOT="0"
 LICENSE="w3m BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND=">=media-libs/stimg-0.1.0
 	virtual/textbrowser"
@@ -20,19 +20,32 @@ src_compile() {
 }
 
 src_install() {
-	if has_version 'net-www/w3m' && has_version 'net-www/w3m-m17n' ; then
+
+	local realbin
+
+	if has_version '<net-www/w3m-0.4.2' ; then
 		exeinto /usr/lib/w3m
 		doexe w3mimgdisplayfb
-		dodir /usr/lib/w3m-m17n
-		dohard /usr/lib/w3m/w3mimgdisplayfb \
-			/usr/lib/w3m-m17n/w3mimgdisplayfb
-	elif has_version 'net-www/w3m' ; then
-		exeinto /usr/lib/w3m
+	elif has_version '>=net-www/w3m-0.4.2-r1' ; then
+		exeinto /usr/libexec/w3m
 		doexe w3mimgdisplayfb
-	elif has_version 'net-www/w3m-m17n' ; then
+	fi
+	if has_version '<net-www/w3m-m17n-0.4.2' ; then
 		exeinto /usr/lib/w3m-m17n
 		doexe w3mimgdisplayfb
+	elif has_version '>=net-www/w3m-m17n-0.4.2' ; then
+		exeinto /usr/libexec/w3m-m17n
+		doexe w3mimgdisplayfb
 	fi
 
+	for exe in /usr/lib{,exec}/w3m{,-m17n}/w3mimgdisplayfb ; do
+		if [ -n "$realexe" ] ; then
+			rm ${D}$exe
+			dohard $realexe $exe
+		elif [ -x ${D}$exe ] ; then
+			realexe=$exe
+		fi
+	done
+
 	dodoc COPYING readme.txt
 }