Fix bug 148224, thanks to James Rowe <jnrowe at ukfsn dot org> for the initial patch && add metadata.xml

(Portage version: 2.1.2-r1)

4 files changed, 27 insertions, 23 deletions

diff --git a/www-misc/wsmake/ChangeLog b/www-misc/wsmake/ChangeLog
index f37ce9ba7c6d..ca1816446d76 100644
--- a/www-misc/wsmake/ChangeLog
+++ b/www-misc/wsmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-misc/wsmake
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/ChangeLog,v 1.3 2004/11/06 16:23:13 pyrania Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/ChangeLog,v 1.4 2007/01/19 21:02:01 armin76 Exp $
+
+  19 Jan 2007; Raúl Porcel <armin76@gentoo.org> +metadata.xml,
+  wsmake-0.6.4.ebuild:
+  Fix bug 148224, thanks to James Rowe <jnrowe at ukfsn dot org> for the
+  initial patch && add metadata.xml
 
   06 Nov 2004; <pyrania@gentoo.org> wsmake-0.6.4.ebuild:
   Removed unneeded S=, made epatch aware.
diff --git a/www-misc/wsmake/files/digest-wsmake-0.6.4 b/www-misc/wsmake/files/digest-wsmake-0.6.4
index b7f82aa4ee03..7e31ffa8ddf9 100644
--- a/www-misc/wsmake/files/digest-wsmake-0.6.4
+++ b/www-misc/wsmake/files/digest-wsmake-0.6.4
@@ -1,4 +1,3 @@
 MD5 92a32f066ce2629c83b5ce1f22229282 wsmake-0.6.4.tar.bz2 351688
-MD5 a73f36e01798f7533153e784c6d52c5a user-manual.pdf 200778
-MD5 3de0bf4be5f1edf93dada88a4519773c user-manual.ps 264094
-MD5 72978fbf7906ff15c5cc054c57029b52 user-manual-html.tar.gz 73189
+RMD160 cfb48e73191b63cfb57fe318de8111d4feb11666 wsmake-0.6.4.tar.bz2 351688
+SHA256 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6 wsmake-0.6.4.tar.bz2 351688
diff --git a/www-misc/wsmake/metadata.xml b/www-misc/wsmake/metadata.xml
new file mode 100644
index 000000000000..20ce219711a2
--- /dev/null
+++ b/www-misc/wsmake/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+</pkgmetadata>
diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild
index d13460e202ef..62398beab36e 100644
--- a/www-misc/wsmake/wsmake-0.6.4.ebuild
+++ b/www-misc/wsmake/wsmake-0.6.4.ebuild
@@ -1,40 +1,35 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/wsmake-0.6.4.ebuild,v 1.3 2004/11/06 16:23:13 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/wsmake-0.6.4.ebuild,v 1.4 2007/01/19 21:02:01 armin76 Exp $
+
+inherit eutils
 
 DESCRIPTION="Website Pre-processor"
 HOMEPAGE="http://www.wsmake.org/"
-SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2
-http://ftp.wsmake.org/pub/wsmake6/docs/user-manual.pdf
-http://ftp.wsmake.org/pub/wsmake6/docs/user-manual.ps
-http://ftp.wsmake.org/pub/wsmake6/docs/user-manual-html.tar.gz"
+SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2"
 
 KEYWORDS="x86"
-LICENSE="GPL-2"
+LICENSE="GPL-2 Artistic"
 SLOT="0"
 IUSE=""
 
 src_unpack () {
-	unpack ${P}.tar.bz2
-	cd ${S}
+	unpack ${A} && cd "${S}"
 	#Apply patch to allow compiling
-	epatch ${FILESDIR}/${P}-bv.diff || die "epatch failed."
-	unpack user-manual-html.tar.gz
+	epatch "${FILESDIR}/${P}-bv.diff" || die "epatch failed."
 }
 
 src_compile () {
-	./configure --prefix=/usr  || die
-	emake || die
+	econf || die "econf failed"
+	emake || die "emake failed"
 	cd doc
 	tar -cf examples.tar examples || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS Artistic COPYING ChangeLog* DEVELOPERS LICENSE NEWS README TODO
-	cd user-manual
-	dohtml * stylesheet-images/*
-	cd ../doc
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS COPYING ChangeLog* DEVELOPERS LICENSE NEWS README TODO
+	cd doc
 	dodoc manual.txt examples.tar
 }