summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/gts')
-rw-r--r--sci-libs/gts/ChangeLog6
-rw-r--r--sci-libs/gts/files/gts-20111025-autotools.patch63
-rw-r--r--sci-libs/gts/gts-20111025.ebuild9
3 files changed, 50 insertions, 28 deletions
diff --git a/sci-libs/gts/ChangeLog b/sci-libs/gts/ChangeLog
index 59caa3522780..e760f0ab2be4 100644
--- a/sci-libs/gts/ChangeLog
+++ b/sci-libs/gts/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/gts
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.22 2012/01/21 15:11:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.23 2012/01/21 16:06:15 jlec Exp $
+
+ 21 Jan 2012; Justin Lecher <jlec@gentoo.org> gts-20111025.ebuild,
+ files/gts-20111025-autotools.patch:
+ Added doc support and fixed buildsystem for this
21 Jan 2012; Justin Lecher <jlec@gentoo.org> gts-20111025.ebuild,
files/gts-20111025-autotools.patch:
diff --git a/sci-libs/gts/files/gts-20111025-autotools.patch b/sci-libs/gts/files/gts-20111025-autotools.patch
index 7660f789f7a7..acc7605337cc 100644
--- a/sci-libs/gts/files/gts-20111025-autotools.patch
+++ b/sci-libs/gts/files/gts-20111025-autotools.patch
@@ -1,6 +1,39 @@
---- examples/Makefile.am.orig
-+++ examples/Makefile.am
-@@ -16,9 +18,7 @@ endif
+ doc/Makefile.am | 6 +++---
+ examples/Makefile.am | 4 +---
+ src/Makefile.am | 4 ++--
+ 3 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index ea9a468..9cd0341 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -9,7 +9,7 @@ DOC_MODULE=gts
+ DOC_MAIN_SGML_FILE=gts-docs.sgml
+
+ # The directory containing the source code (if it contains documentation).
+-DOC_SOURCE_DIR=../src
++DOC_SOURCE_DIR=$(top_srcdir)/src
+
+ TARGET_DIR=html/$(DOC_MODULE)
+
+@@ -21,10 +21,10 @@ scan:
+ templates: scan
+ gtkdoc-mktmpl --module=$(DOC_MODULE)
+
+-sgml:
++sgml: scan
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+
+-html:
++html: sgml
+ if ! test -d html ; then mkdir html ; fi
+ -cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index a4b2fc6..63646e8 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -16,9 +16,7 @@ endif
bin_PROGRAMS = \
transform \
delaunay \
@@ -11,9 +44,11 @@
set \
volume \
cleanup \
---- src/Makefile.am.orig 2012-01-20 18:00:55.000000000 +0000
-+++ src/Makefile.am 2012-01-20 18:07:32.000000000 +0000
-@@ -66,10 +66,10 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3e3c5b3..1b0f286 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -66,10 +66,10 @@ predicates.o: predicates.c predicates_init.h predicates.h
$(COMPILE) -c $(srcdir)/predicates.c
predicates_init: predicates_init.c rounding.h
@@ -26,19 +61,3 @@
CLEANFILES = $(BUILT_SOURCES)
- gts-snapshot-111025/doc/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gts-snapshot-111025/doc/Makefile.am b/gts-snapshot-111025/doc/Makefile.am
-index ea9a468..cd5a606 100644
---- doc/Makefile.am
-+++ doc/Makefile.am
-@@ -9,7 +9,7 @@ DOC_MODULE=gts
- DOC_MAIN_SGML_FILE=gts-docs.sgml
-
- # The directory containing the source code (if it contains documentation).
--DOC_SOURCE_DIR=../src
-+DOC_SOURCE_DIR=$(top_srcdir)/src
-
- TARGET_DIR=html/$(DOC_MODULE)
-
diff --git a/sci-libs/gts/gts-20111025.ebuild b/sci-libs/gts/gts-20111025.ebuild
index 6a6ebcfbf062..346bdc00bb22 100644
--- a/sci-libs/gts/gts-20111025.ebuild
+++ b/sci-libs/gts/gts-20111025.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20111025.ebuild,v 1.2 2012/01/21 15:11:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20111025.ebuild,v 1.3 2012/01/21 16:06:15 jlec Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples static-libs test"
+IUSE="doc examples static-libs test"
RDEPEND="virtual/fortran
dev-libs/glib:2
@@ -32,7 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
src_compile() {
autotools-utils_src_compile
-# use doc && autotools-utils_src_compile -j1 -C doc scan sgml html
+ use doc && autotools-utils_src_compile -C doc html
}
src_test() {
@@ -43,14 +43,13 @@ src_test() {
}
src_install() {
+ use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}"/doc/html/)
autotools-utils_src_install
# rename to avoid collisions
mv "${ED}"/usr/bin/{,gts-}split || die
mv "${ED}"/usr/bin/{,gts-}merge || die
-# use doc && dohtml doc/html/*
-
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins examples/*.c