Use findlib eclass, add documentation (doc USE flag).

5 files changed, 26 insertions, 42 deletions

diff --git a/dev-ml/pxp/ChangeLog b/dev-ml/pxp/ChangeLog
index e3e752621f6e..9a0c44ab434f 100644
--- a/dev-ml/pxp/ChangeLog
+++ b/dev-ml/pxp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/pxp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/ChangeLog,v 1.4 2004/08/18 20:27:01 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/ChangeLog,v 1.5 2004/08/25 13:29:32 mattam Exp $
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -pxp-1.1.5.ebuild,
+  pxp-1.1.6.ebuild:
+  Move to findlib eclass, add doc USE flag.
 
 *pxp-1.1.6 (18 Aug 2004)
 
diff --git a/dev-ml/pxp/Manifest b/dev-ml/pxp/Manifest
index 1496a78cba28..33ce72e4242f 100644
--- a/dev-ml/pxp/Manifest
+++ b/dev-ml/pxp/Manifest
@@ -1,5 +1,4 @@
-MD5 19c0b86c4fae44dad2a8159f2f0b8f91 ChangeLog 587
-MD5 0b38c2adab83e50346f68e206e7e7027 pxp-1.1.5.ebuild 827
-MD5 1e31810594ce4405be04738866a50361 pxp-1.1.6.ebuild 823
+MD5 8452d9ea6ea2ce180a9a62ef880e1f23 ChangeLog 722
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 3eca8c48d43cab85d8eaf861a6ee6af6 pxp-1.1.6.ebuild 958
 MD5 cc510152563ebbd7b5b9f13f5bbbf3aa files/digest-pxp-1.1.6 61
-MD5 63a6f71f962f5b710fc1d5c789dd4733 files/digest-pxp-1.1.5 61
diff --git a/dev-ml/pxp/files/digest-pxp-1.1.5 b/dev-ml/pxp/files/digest-pxp-1.1.5
deleted file mode 100644
index cd5c4cb8383a..000000000000
--- a/dev-ml/pxp/files/digest-pxp-1.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d462c59148db685309bf9a05f939c184 pxp-1.1.5.tar.gz 613596
diff --git a/dev-ml/pxp/pxp-1.1.5.ebuild b/dev-ml/pxp/pxp-1.1.5.ebuild
deleted file mode 100644
index 99bcbf4634b9..000000000000
--- a/dev-ml/pxp/pxp-1.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.5.ebuild,v 1.8 2004/07/13 06:33:06 mr_bones_ Exp $
-
-DESCRIPTION="validating XML parser library for O'Caml"
-HOMEPAGE="http://www.ocaml-programming.de/packages/documentation/pxp/index_dev.html"
-SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=dev-ml/pcre-ocaml-4.31
-	>=dev-ml/ocamlnet-0.94
-	>=dev-ml/findlib-0.8"
-
-src_compile() {
-	#the included configure does not support  many standard switches and is quite picky
-	./configure || die
-	make all opt || die
-}
-
-src_install() {
-	local destdir=`ocamlfind printconf destdir`
-	dodir ${destdir}
-	make OCAMLFIND_DESTDIR=${D}${destdir} install || die
-}
diff --git a/dev-ml/pxp/pxp-1.1.6.ebuild b/dev-ml/pxp/pxp-1.1.6.ebuild
index 153e2292e00e..8d8f139976aa 100644
--- a/dev-ml/pxp/pxp-1.1.6.ebuild
+++ b/dev-ml/pxp/pxp-1.1.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.6.ebuild,v 1.1 2004/08/18 20:27:01 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.6.ebuild,v 1.2 2004/08/25 13:29:32 mattam Exp $
+
+inherit findlib
 
 DESCRIPTION="validating XML parser library for O'Caml"
 HOMEPAGE="http://www.ocaml-programming.de/packages/documentation/pxp/index_dev.html"
@@ -9,11 +11,11 @@ SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86"
-IUSE=""
+IUSE="doc"
 
-DEPEND=">=dev-ml/pcre-ocaml-4.31
-	>=dev-ml/ocamlnet-0.94
-	>=dev-ml/findlib-0.8"
+DEPEND="dev-lang/ocaml
+>=dev-ml/pcre-ocaml-4.31
+>=dev-ml/ocamlnet-0.94"
 
 src_compile() {
 	#the included configure does not support many standard switches and is quite picky
@@ -22,7 +24,15 @@ src_compile() {
 }
 
 src_install() {
-	local destdir=`ocamlfind printconf destdir`
-	dodir ${destdir}
-	make OCAMLFIND_DESTDIR=${D}${destdir} install || die
+	findlib_src_install
+
+	cd doc
+	dodoc ABOUT-FINDLIB DEV EXTENSIONS README RELEASE-NOTES SPEC design.txt
+
+	if use doc; then
+		dodoc manual/ps/pxp.ps
+		dohtml manual/html/*
+		insinto /usr/share/doc/${PF}/html/pic
+		doins manual/html/pic/*
+	fi
 }