From 4a818f1d62ce01bccc6244863f911486dd0de612 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 21 Jan 2012 16:06:15 +0000 Subject: Added doc support and fixed buildsystem for this Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- sci-libs/gts/ChangeLog | 6 ++- sci-libs/gts/Manifest | 12 ++--- sci-libs/gts/files/gts-20111025-autotools.patch | 63 ++++++++++++++++--------- sci-libs/gts/gts-20111025.ebuild | 9 ++-- 4 files changed, 56 insertions(+), 34 deletions(-) (limited to 'sci-libs/gts') 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 gts-20111025.ebuild, + files/gts-20111025-autotools.patch: + Added doc support and fixed buildsystem for this 21 Jan 2012; Justin Lecher gts-20111025.ebuild, files/gts-20111025-autotools.patch: diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest index 55ef7f6eeac3..b7f5d7d95de4 100644 --- a/sci-libs/gts/Manifest +++ b/sci-libs/gts/Manifest @@ -2,17 +2,17 @@ Hash: SHA512 AUX gts-20100321-examples.patch 472 RMD160 69737f927247c69849adff2cc9ac175f09d1178d SHA1 50acbc11281661ebf5488ed13b9acc6e6705e0db SHA256 e164f7eb970675b3333f709fc1a0a1225b0a6f7a16503fe9a2e3aac023826be7 -AUX gts-20111025-autotools.patch 1274 RMD160 87308a0b496df6a4cf290f43070d0cdaca6c76c4 SHA1 574d22352e25e611270a49e6b34eea8cfa7aea3f SHA256 4a495eb7f840c53bc2d85427240c7263d41a33ad898a3c9659bc1708ca6c292e +AUX gts-20111025-autotools.patch 1747 RMD160 18e542f7f37cee5643c77f00f1f0aa3d5f856172 SHA1 7451347ff602cec32737dc5533c2ccec94abe9c2 SHA256 241ac29ee9564edf93d808804a9184d42229668f0d7becbb9eabd4e6b90aad8b DIST gts-20100321.tar.gz 876320 RMD160 4ab3d3642408c57f213a186c823e9b4da4acf147 SHA1 02948e5c5db0574612cd3323662bd7a6966be53d SHA256 4b7fc999c3693c9dcc6dec444edc839c794cc1708ec0f13b6d0e2b9913b00e9f DIST gts-20111025.tar.gz 877437 RMD160 8d10cdd59516e3c323e49610dc821d004d9a0b86 SHA1 c8864eb945ca4f21e56b3c10efdc4c9e0fcb41ed SHA256 9070df762879139cc1f0c822e3d3ad545c75b209e762f8db38b049685e293075 EBUILD gts-20100321-r3.ebuild 1243 RMD160 35ed50cd614918161b86b46d2971c0b3d62c118d SHA1 5ce6acb4dfafcf91db5a5d58645c8fe50fc7036c SHA256 6f0a5cd77a3f563400fc90e45fb65bb9c066c46fec7f1b209dd05db5445270d3 -EBUILD gts-20111025.ebuild 1352 RMD160 c410587f449e80882f0f0f61dcd757c617e1fdcb SHA1 316a4ee47bcaec4b6f7ae55c37d7549d79d2312d SHA256 157e2458e947616136b9e94cba87781fe7d0e43b0e627dcb7d637d48d3baf854 -MISC ChangeLog 3850 RMD160 7a4fa7c8fc113dc8845a554791c07014fa533836 SHA1 f3847d6077bc7d624d1146660afcd6665fb45e8a SHA256 b466e51cb42c9a8697d31be679ebef699b1e62444e9231a0f056c2ccee17ef75 +EBUILD gts-20111025.ebuild 1368 RMD160 8553aa9ac1a7898dd5a0b5a6b171498419e33ebd SHA1 116e5b336e2221792a3cfb9ed504be15d2cb540c SHA256 1ae5c44ca05e84b9aa3baba26f73f60dc01e26538e5831ff981912d7151fc7ae +MISC ChangeLog 4008 RMD160 8a89fe4938df10381540dc5ffbfe797c1233ab8a SHA1 842deff801309fe9fe262ac47bea2199a62dfaff SHA256 a425ab6248bbedea955a1067e362067b1a8f93026843f0914b51edbd8f3915d0 MISC metadata.xml 328 RMD160 d0476ceb89877a7b1caa94159d442491e77118aa SHA1 78d18dcf9f1d970b161349902da034bca29ce293 SHA256 c65b1015ca27352fcf00d50fe76741a584e7af13f8d7bce3bf087c910b08006a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk8a1cIACgkQgAnW8HDreRYwHQCcDYX0+D+7qoD1vnh4nXrPPgd0 -h84AoL3dk4QzA4tiCCgAJ8D/uAr1IE88 -=sk7e +iEYEAREKAAYFAk8a4ogACgkQgAnW8HDreRYhVwCfc1wvBIJ7OoXtnwf1kCEu6tfq +e9sAnRZ9NoK6cII598lkIhSQM8rNFyM4 +=I1BL -----END PGP SIGNATURE----- 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 -- cgit v1.2.3-65-gdbad