Updated x11-libs/gtk-fortran-2.9999-r1.ebuild, x11-libs/gtk-fortran-3.9999-r1.ebuild

* Updated x11-libs/gtk-fortran-2.9999-r1.ebuild, x11-libs/gtk-fortran-3.9999-r1.ebuild:
  * added slotting
  * allow parallel build
  * added 'doc' and 'static' USEflags
  * install gtkf-sketcher (3.x)

Package-Manager: portage-2.2.18

5 files changed, 119 insertions, 13 deletions

diff --git a/x11-libs/gtk-fortran/ChangeLog b/x11-libs/gtk-fortran/ChangeLog
index 280abe4..10a47d3 100644
--- a/x11-libs/gtk-fortran/ChangeLog
+++ b/x11-libs/gtk-fortran/ChangeLog
@@ -7,8 +7,9 @@
 
   19 Jun 2015; AstroFloyd <AstroFloyd@gmail.com> -gtk-fortran-2.9999.ebuild,
   +gtk-fortran-2.9999-r1.ebuild, -gtk-fortran-3.9999.ebuild,
-  +gtk-fortran-3.9999-r1.ebuild:
-  Revision bump
+  +gtk-fortran-3.9999-r1.ebuild, +files/Doxyfile.patch:
+  Revision bump: added slotting, allow parallel build, added 'doc' and 'static'
+	USEflags, install gtkf-sketcher (3.x)
 
 *gtk-fortran-3.9999 (22 Oct 2014)
 
diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index 0a82f4c..a993dbe 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,4 +1,5 @@
-EBUILD gtk-fortran-2.9999-r1.ebuild 589 SHA256 7d78e28dbfcdd5d6becdac19f8f6ad406c1a2739247f5634b83048c335217b6c SHA512 6c188e7f95bcd27990c49143776dce3b6f46ec4f02e94c8246234eccd12b112f34ef37603df65c504eb114229b4fe6c3f35cf2b416553b0b719929dbd3624127 WHIRLPOOL 49b0a9d711c9a8a264078f5cb812811bf7c0f0da57b70f89c625b2f1c296f5939891da9c889654f366b114410b1ea133412e4015d272f136cb3cdf09a0a24355
-EBUILD gtk-fortran-3.9999-r1.ebuild 601 SHA256 4ca456c048f0f0a365fd8f5354cc28a98ab3ddebc16964102445a446a96debcf SHA512 8684135bc2fb54073bb37ddc15489357c4f7beefa0b96b469e4c02e344b4653bf3a1dbc4d2d3bcccd544ec1fbec00a6c1b7c056189c298d1dfaebbe23759d7c7 WHIRLPOOL 7bc97a00c92f561253b927b9fd5fd624bb8f519c998e20aa4d0d4d3e4a663267990a40f0aef5ff0210e1161913614de292fbe9263fb4e1b9640e88dfb46365f2
-MISC ChangeLog 752 SHA256 4ac538684fee6799828fe0eb17d684c9cbd9571ff7bacbfd5696db54f7e7d779 SHA512 9010448331f00e5fdd2508adc276387b12445f22b406e60da2cac4de2bbea2e128619ea33b04e797d1eb77b03b1edf362385b0f3df96eaf4735a935b0aff77b0 WHIRLPOOL 4fb15f31eaaec1fa7aab93054b9d67422004a5c1c1bb1a6b70c63d43faf8da64b4531673f4ed25e505f519e8374cf969cef195f208a9326e397bfbdc8cdaff51
+AUX Doxyfile.patch 933 SHA256 e863ec53fe5c137968f002e41982b428cfe0baff91130c3f262753ad2f535b99 SHA512 9371637fb9ac0836c95251e6cb303556a8dfdc1ff900a7b5a8e8ee7fbfe75bc137fe95c3b001979ff9895d9048e62a15dd747acc3517ebd1e1c80e9b1df76dab WHIRLPOOL a1a134050318dfdf75510e7adbc8049630b9e6cf2e2f730554b279137720da4fe5eff74b8f65fe1dba08cd2cc57e236897073b6870198c4e6fce437c59e0b229
+EBUILD gtk-fortran-2.9999-r1.ebuild 2013 SHA256 ca8ff99fd91b67dfaa7dddff54717640210e9e0c6a774331e5cd93173cf5e88b SHA512 a69340eb2aeca232f39083382b182484821bf2afcd2e659a53d1099e396bd1a231f0c24235baf1c8781d1964833f956f6b0b0c45a40227dc6aef60cfed18a1ce WHIRLPOOL 8a9af67b6c3f603cceeee447a43f0c0a262903bc2119d1b4a0cef486716450f39176fba3b90eacac6fae3c6257cfc54c1457ae539e98fa3c915d148f2443ac0c
+EBUILD gtk-fortran-3.9999-r1.ebuild 2162 SHA256 472cc300cacd574ce64ac5c3bbc7d890fa657f0aaadd30b7b56a56bea1ab3e4a SHA512 005184e1391bb55c57aacd83f3e3df20a7ae26c3a3d26581cb12304a75cc104c55bd48d551a3f6966cee0cc062046384796aaff5825065ce2f05083a48aaffb1 WHIRLPOOL 616b6dd850ca805610742cb06aee9621a3aa412f38e7e9b88d8af5fe3a5f3853b8da6439f7de7ecc964620ebc3d4864582e9dc8c45d45ee6dd52fba070d77d50
+MISC ChangeLog 878 SHA256 06de312d06fa5c6d44046efd926042d910434166b735781650913335c3ffbe8d SHA512 2eaf61d70faf6428133fb4efdeeab1dad25bb50cc86c6d8266ac284bd2453cc33f89f61f70770f5a1af5ed780500e2ce6f468f3a6d670318726a2d138f3b20b6 WHIRLPOOL 0c6fb3011c2f36dd39cf1c87e957b387b790fcefdba9fff4717ec3ee9ac6193c30ef1e0d0c4cbd07e5985039d7e77b8d92e3fdc3ba43936586fc0fdf0977222b
 MISC metadata.xml 250 SHA256 e44c070cff68ec9a61d9a6304001c836fc4522a567a1759f959ef69e6abbe1c4 SHA512 716cf7255da4aeae4a8c3292e536297828f7e0cb37a65de5793f9cc2b4960dd6db46f089e3df6ab1d088005cff00ad77e3769ce928a21d35ea629de341c5a5dd WHIRLPOOL f035c67b4226ed088b3e84d194910cea9373834fc901083bb6010b13620f5d6ce09c1309014b577f2c383b0f60459b9188caf6b253990f4521d76baa77ff2cb5
diff --git a/x11-libs/gtk-fortran/files/Doxyfile.patch b/x11-libs/gtk-fortran/files/Doxyfile.patch
new file mode 100644
index 0000000..f019379
--- /dev/null
+++ b/x11-libs/gtk-fortran/files/Doxyfile.patch
@@ -0,0 +1,31 @@
+--- Doxyfile.orig	2015-06-19 14:49:02.649479634 +0200
++++ Doxyfile	2015-06-19 14:50:06.862405747 +0200
+@@ -103,7 +103,7 @@
+ SHOW_NAMESPACES        = YES
+ FILE_VERSION_FILTER    = 
+ LAYOUT_FILE            = 
+-QUIET                  = NO
++QUIET                  = YES
+ WARNINGS               = YES
+ WARN_IF_UNDOCUMENTED   = YES
+ WARN_IF_DOC_ERROR      = YES
+@@ -262,7 +262,7 @@
+ HIDE_UNDOC_RELATIONS   = YES
+ HAVE_DOT               = YES
+ DOT_NUM_THREADS        = 0
+-DOT_FONTNAME           = FreeSans.ttf
++DOT_FONTNAME           = 
+ DOT_FONTSIZE           = 10
+ DOT_FONTPATH           = 
+ CLASS_GRAPH            = YES
+@@ -272,8 +272,8 @@
+ TEMPLATE_RELATIONS     = NO
+ INCLUDE_GRAPH          = YES
+ INCLUDED_BY_GRAPH      = YES
+-CALL_GRAPH             = YES
+-CALLER_GRAPH           = YES
++CALL_GRAPH             = NO
++CALLER_GRAPH           = NO
+ GRAPHICAL_HIERARCHY    = YES
+ DIRECTORY_GRAPH        = YES
+ DOT_IMAGE_FORMAT       = png
diff --git a/x11-libs/gtk-fortran/gtk-fortran-2.9999-r1.ebuild b/x11-libs/gtk-fortran/gtk-fortran-2.9999-r1.ebuild
index fa3dfaa..075c41c 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-2.9999-r1.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-2.9999-r1.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-inherit cmake-utils fortran-2 git-2
+inherit eutils cmake-utils fortran-2 git-2
 
-DESCRIPTION="Cross-platform Fortran binding to create GUIs using GTK+"
+DESCRIPTION="Cross-platform Fortran binding to create GUIs for Fortran programs using GTK+"
 HOMEPAGE="https://github.com/jerryd/gtk-fortran/wiki"
 
 LICENSE="GPL-3"
@@ -17,9 +17,44 @@ EGIT_REPO_URI="https://github.com/jerryd/gtk-fortran.git"
 
 DEPEND=">=x11-libs/gtk+-2.24:2 x11-libs/cairo x11-libs/gdk-pixbuf"
 RDEPEND="${DEPEND}"
+IUSE="doc static"
 
-# Cannot do a parallel build:
+src_prepare() {
+	epatch "${FILESDIR}"/Doxyfile.patch  # Quiet, no graphs
+}
+
+# Cannot do a parallel build.  make install will build 'all' in parallel, which fails.
+# Hence, do two partial parallel builds here, for the core stuff.
+# You could do a serial 'make all' to build the rest (examples, testers, etc.).
 src_compile() {
 	cd "${CMAKE_BUILD_DIR}"
-	emake -j1 VERBOSE=1 || die
+	emake VERBOSE=1 gtk-fortran_shared || die "Building shared library failed"  # Cannot be built at the same time as the static library
+	use static && $(emake VERBOSE=1 gtk-fortran_static || die "Building static library failed")
+	emake VERBOSE=1 usemodules plplot_extra_module manpage pkgconfig || die
+	use doc && $(emake VERBOSE=1 doc || die "Generating documentation failed")  # Doxygen documentation: ~135Mb!
+	#emake -j1 VERBOSE=1 all || die
+}
+
+# 'make install' will 'make all' in parallel, which fails, so do this by hand:
+src_install() {
+	cd "${CMAKE_BUILD_DIR}"
+	dolib src/libgtk-2-fortran.so.0.1 src/libgtk-2-fortran.so
+	use static && dolib src/libgtk-2-fortran.a  # The static library is always built, we just don't install it unless desired...
+
+	dobin src/gtk-2-fortran-modscan
+
+	insinto usr/include/gtk-2-fortran/
+	doins src/*.mod plplot/plplot_extra.mod
+
+	insinto usr/share/gtk-fortran/
+	doins src/gtk-2-fortran-index.csv src/gtk-2-enumerators.lis
+
+	dodoc "${S}"/README "${S}"/README-high-level
+
+	insinto usr/lib/pkgconfig/
+	doins src/gtk-2-fortran.pc
+
+	doman src/gtk-2-fortran-modscan.1
+
+	use doc && dohtml -r html/*
 }
diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.9999-r1.ebuild b/x11-libs/gtk-fortran/gtk-fortran-3.9999-r1.ebuild
index 5b989bf..3323b9c 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-3.9999-r1.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.9999-r1.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-inherit cmake-utils fortran-2 git-2
+inherit eutils cmake-utils fortran-2 git-2
 
-DESCRIPTION="Cross-platform Fortran binding to create GUIs using GTK+"
+DESCRIPTION="Cross-platform Fortran binding to create GUIs for Fortran programs using GTK+"
 HOMEPAGE="https://github.com/jerryd/gtk-fortran/wiki"
 
 LICENSE="GPL-3"
@@ -18,9 +18,47 @@ EGIT_BRANCH="gtk3"
 
 DEPEND="x11-libs/gtk+:3 x11-libs/cairo x11-libs/gdk-pixbuf"
 RDEPEND="${DEPEND}"
+IUSE="doc static"
 
-# Cannot do a parallel build:
+src_prepare() {
+	epatch "${FILESDIR}"/Doxyfile.patch  # Quiet, no graphs
+}
+
+# Cannot do a parallel build.  make install will build 'all' in parallel, which fails.
+# Hence, do two partial parallel builds here, for the core stuff.
+# You could do a serial 'make all' to build the rest (examples, testers, etc.).
 src_compile() {
 	cd "${CMAKE_BUILD_DIR}"
-	emake -j1 VERBOSE=1 || die
+	emake VERBOSE=1 gtk-fortran_shared || die "Building shared library failed"  # Cannot be built at the same time as the static library/gtkf-sketcher
+	emake VERBOSE=1 gtk-fortran_static || die "Building static library failed"  # The static library is built when gtkf-sketcher is built, so do this explicitly for clarity
+	emake VERBOSE=1 gtkf-sketcher usemodules plplot_extra_module manpage pkgconfig || die
+	if use doc
+	then
+		emake VERBOSE=1 doc || die "Generating documentation failed"  # Doxygen documentation: ~135Mb!
+	fi
+	#emake -j1 VERBOSE=1 all || die
+}
+
+# 'make install' will 'make all' in parallel, which fails, so do this by hand:
+src_install() {
+	cd "${CMAKE_BUILD_DIR}"
+	dolib src/libgtk-3-fortran.so.0.1 src/libgtk-3-fortran.so
+	use static && dolib src/libgtk-3-fortran.a  # The static library is always built, we just don't install it unless desired...
+
+	dobin src/gtk-3-fortran-modscan sketcher/gtkf-sketcher
+
+	insinto usr/include/gtk-3-fortran/
+	doins src/*.mod plplot/plplot_extra.mod
+
+	insinto usr/share/gtk-fortran/
+	doins src/gtk-3-fortran-index.csv src/gtk-3-enumerators.lis
+
+	dodoc "${S}"/README "${S}"/README-high-level
+
+	insinto usr/lib/pkgconfig/
+	doins src/gtk-3-fortran.pc
+
+	doman src/gtk-3-fortran-modscan.1
+
+	use doc && dohtml -r html/*
 }