Cleanup documentation.

(Portage version: 2.1.2-r1)

3 files changed, 37 insertions, 21 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index f98c05b56124..7e9e0c6ad8e7 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/yap
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.7 2006/12/03 04:00:43 keri Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.8 2007/01/20 20:56:56 keri Exp $
+
+  20 Jan 2007; keri <keri@gentoo.org> files/yap-5.1.1-multilib.patch,
+  yap-5.1.1.ebuild:
+  Cleanup documentation.
 
   03 Dec 2006; keri <keri@gentoo.org> +files/yap-5.1.1-multilib.patch,
   yap-5.1.1.ebuild:
diff --git a/dev-lang/yap/files/yap-5.1.1-multilib.patch b/dev-lang/yap/files/yap-5.1.1-multilib.patch
index a88c08c7ed53..fb7d17f2241b 100644
--- a/dev-lang/yap/files/yap-5.1.1-multilib.patch
+++ b/dev-lang/yap/files/yap-5.1.1-multilib.patch
@@ -1,6 +1,6 @@
 diff -ur Yap-5.1.1.orig/CLPBN/Makefile.in Yap-5.1.1/CLPBN/Makefile.in
 --- Yap-5.1.1.orig/CLPBN/Makefile.in	2006-01-18 03:45:28.000000000 +1300
-+++ Yap-5.1.1/CLPBN/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/CLPBN/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for libraries
@@ -12,7 +12,7 @@ diff -ur Yap-5.1.1.orig/CLPBN/Makefile.in Yap-5.1.1/CLPBN/Makefile.in
  #
 diff -ur Yap-5.1.1.orig/LGPL/JPL/Makefile.in Yap-5.1.1/LGPL/JPL/Makefile.in
 --- Yap-5.1.1.orig/LGPL/JPL/Makefile.in	2005-03-13 19:26:11.000000000 +1300
-+++ Yap-5.1.1/LGPL/JPL/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/LGPL/JPL/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for binary libraries
@@ -24,7 +24,7 @@ diff -ur Yap-5.1.1.orig/LGPL/JPL/Makefile.in Yap-5.1.1/LGPL/JPL/Makefile.in
  #
 diff -ur Yap-5.1.1.orig/LGPL/JPL/java/Makefile.in Yap-5.1.1/LGPL/JPL/java/Makefile.in
 --- Yap-5.1.1.orig/LGPL/JPL/java/Makefile.in	2006-03-23 03:00:28.000000000 +1200
-+++ Yap-5.1.1/LGPL/JPL/java/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/LGPL/JPL/java/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -15,7 +15,7 @@
  #
  # where YAP should look for binary libraries
@@ -36,7 +36,7 @@ diff -ur Yap-5.1.1.orig/LGPL/JPL/java/Makefile.in Yap-5.1.1/LGPL/JPL/java/Makefi
  #
 diff -ur Yap-5.1.1.orig/LGPL/JPL/src/Makefile.in Yap-5.1.1/LGPL/JPL/src/Makefile.in
 --- Yap-5.1.1.orig/LGPL/JPL/src/Makefile.in	2006-03-23 03:00:28.000000000 +1200
-+++ Yap-5.1.1/LGPL/JPL/src/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/LGPL/JPL/src/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -19,7 +19,7 @@
  #
  # where YAP should look for libraries
@@ -48,7 +48,7 @@ diff -ur Yap-5.1.1.orig/LGPL/JPL/src/Makefile.in Yap-5.1.1/LGPL/JPL/src/Makefile
  CC=@CC@
 diff -ur Yap-5.1.1.orig/LGPL/clp/Makefile.in Yap-5.1.1/LGPL/clp/Makefile.in
 --- Yap-5.1.1.orig/LGPL/clp/Makefile.in	2005-10-29 06:53:27.000000000 +1300
-+++ Yap-5.1.1/LGPL/clp/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/LGPL/clp/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for binary libraries
@@ -60,7 +60,16 @@ diff -ur Yap-5.1.1.orig/LGPL/clp/Makefile.in Yap-5.1.1/LGPL/clp/Makefile.in
  #
 diff -ur Yap-5.1.1.orig/Makefile.in Yap-5.1.1/Makefile.in
 --- Yap-5.1.1.orig/Makefile.in	2006-04-13 23:34:33.000000000 +1200
-+++ Yap-5.1.1/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/Makefile.in	2007-01-21 09:49:01.000000000 +1300
+@@ -4,7 +4,7 @@
+ #
+ prefix = @prefix@
+ ROOTDIR = $(prefix)
+-EROOTDIR = @exec_prefix@
++EROOTDIR = @prefix@
+ #
+ # where the binary should be
+ #
 @@ -12,8 +12,8 @@
  #
  # where YAP should look for binary libraries
@@ -74,7 +83,7 @@ diff -ur Yap-5.1.1.orig/Makefile.in Yap-5.1.1/Makefile.in
  #
 diff -ur Yap-5.1.1.orig/library/Makefile.in Yap-5.1.1/library/Makefile.in
 --- Yap-5.1.1.orig/library/Makefile.in	2006-04-11 07:24:52.000000000 +1200
-+++ Yap-5.1.1/library/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/library/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for binary libraries
@@ -86,7 +95,7 @@ diff -ur Yap-5.1.1.orig/library/Makefile.in Yap-5.1.1/library/Makefile.in
  #
 diff -ur Yap-5.1.1.orig/library/Tries/Makefile.in Yap-5.1.1/library/Tries/Makefile.in
 --- Yap-5.1.1.orig/library/Tries/Makefile.in	2004-08-12 04:14:54.000000000 +1200
-+++ Yap-5.1.1/library/Tries/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/library/Tries/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -18,7 +18,7 @@
  #
  # where YAP should look for libraries
@@ -98,7 +107,7 @@ diff -ur Yap-5.1.1.orig/library/Tries/Makefile.in Yap-5.1.1/library/Tries/Makefi
  CC=@CC@
 diff -ur Yap-5.1.1.orig/library/mpi/Makefile.in Yap-5.1.1/library/mpi/Makefile.in
 --- Yap-5.1.1.orig/library/mpi/Makefile.in	2002-02-27 06:25:33.000000000 +1300
-+++ Yap-5.1.1/library/mpi/Makefile.in	2006-12-03 15:01:52.000000000 +1300
++++ Yap-5.1.1/library/mpi/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -20,8 +20,8 @@
  #
  # where YAP should look for binary libraries
@@ -112,7 +121,7 @@ diff -ur Yap-5.1.1.orig/library/mpi/Makefile.in Yap-5.1.1/library/mpi/Makefile.i
  #
 diff -ur Yap-5.1.1.orig/library/random/Makefile.in Yap-5.1.1/library/random/Makefile.in
 --- Yap-5.1.1.orig/library/random/Makefile.in	2002-11-13 08:53:52.000000000 +1300
-+++ Yap-5.1.1/library/random/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/library/random/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries
@@ -124,7 +133,7 @@ diff -ur Yap-5.1.1.orig/library/random/Makefile.in Yap-5.1.1/library/random/Make
  CC=@CC@
 diff -ur Yap-5.1.1.orig/library/regex/Makefile.in Yap-5.1.1/library/regex/Makefile.in
 --- Yap-5.1.1.orig/library/regex/Makefile.in	2004-10-01 09:16:20.000000000 +1200
-+++ Yap-5.1.1/library/regex/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/library/regex/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries
@@ -136,7 +145,7 @@ diff -ur Yap-5.1.1.orig/library/regex/Makefile.in Yap-5.1.1/library/regex/Makefi
  CC=@CC@
 diff -ur Yap-5.1.1.orig/library/system/Makefile.in Yap-5.1.1/library/system/Makefile.in
 --- Yap-5.1.1.orig/library/system/Makefile.in	2002-11-13 08:53:52.000000000 +1300
-+++ Yap-5.1.1/library/system/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/library/system/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries
@@ -148,7 +157,7 @@ diff -ur Yap-5.1.1.orig/library/system/Makefile.in Yap-5.1.1/library/system/Make
  CC=@CC@
 diff -ur Yap-5.1.1.orig/library/yap2swi/Makefile.in Yap-5.1.1/library/yap2swi/Makefile.in
 --- Yap-5.1.1.orig/library/yap2swi/Makefile.in	2004-08-12 04:14:54.000000000 +1200
-+++ Yap-5.1.1/library/yap2swi/Makefile.in	2006-12-03 15:00:52.000000000 +1300
++++ Yap-5.1.1/library/yap2swi/Makefile.in	2007-01-21 09:49:01.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries
diff --git a/dev-lang/yap/yap-5.1.1.ebuild b/dev-lang/yap/yap-5.1.1.ebuild
index f9859214abe4..1aab233be2c6 100644
--- a/dev-lang/yap/yap-5.1.1.ebuild
+++ b/dev-lang/yap/yap-5.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.1.ebuild,v 1.4 2006/12/03 04:00:43 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.1.ebuild,v 1.5 2007/01/20 20:56:56 keri Exp $
 
 inherit autotools eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="Artistic LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="debug doc gmp java mpi mysql odbc readline static tk threads"
+IUSE="debug doc examples gmp java mpi mysql odbc readline static tk threads"
 
 DEPEND="gmp? ( dev-libs/gmp )
 	java? ( virtual/jdk )
@@ -41,6 +41,7 @@ src_unpack() {
 src_compile() {
 	eautoconf
 	econf \
+		--libdir=/usr/$(get_libdir) \
 		--enable-low-level-tracer \
 		--enable-rational-trees \
 		--enable-coroutining \
@@ -76,13 +77,15 @@ src_install() {
 		doexe misc/tkyap
 	fi
 
+	dodoc changes*.html README
+
 	if use doc ; then
 		dodoc docs/yap.html
+	fi
+
+	if use examples ; then
 		docinto examples
 		dodoc CLPBN/clpbn/examples/cg.yap
 		dodoc CLPBN/clpbn/examples/School/*
 	fi
-
-	doinfo docs/*.info*
-	dodoc changes4.3.html INSTALL README
 }