x11-libs/gtk-fortran: fully use the plplot USE flag

Package-Manager: portage-2.2.18

4 files changed, 14 insertions, 13 deletions

diff --git a/x11-libs/gtk-fortran/ChangeLog b/x11-libs/gtk-fortran/ChangeLog
index 10a47d3..21d8eb4 100644
--- a/x11-libs/gtk-fortran/ChangeLog
+++ b/x11-libs/gtk-fortran/ChangeLog
@@ -8,8 +8,8 @@
   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, +files/Doxyfile.patch:
-  Revision bump: added slotting, allow parallel build, added 'doc' and 'static'
-	USEflags, install gtkf-sketcher (3.x)
+  Revision bump: added slotting; allow parallel build; added 'doc', 'plplot'
+	and 'static' USE flags; 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 2761b71..8d69693 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,5 +1,5 @@
 AUX Doxyfile.patch 933 SHA256 e863ec53fe5c137968f002e41982b428cfe0baff91130c3f262753ad2f535b99 SHA512 9371637fb9ac0836c95251e6cb303556a8dfdc1ff900a7b5a8e8ee7fbfe75bc137fe95c3b001979ff9895d9048e62a15dd747acc3517ebd1e1c80e9b1df76dab WHIRLPOOL a1a134050318dfdf75510e7adbc8049630b9e6cf2e2f730554b279137720da4fe5eff74b8f65fe1dba08cd2cc57e236897073b6870198c4e6fce437c59e0b229
-EBUILD gtk-fortran-2.9999-r1.ebuild 2156 SHA256 5f38d2779d968b2005338eeb727ffa497632d1c0ac52f6d4c10ec6e425074f38 SHA512 ad44c3c18884e2d4d9e86f65152a96d43d95c12268fa02a4639ea437bb388f710f115a5333f109e2c4d88b2038650c0ec0cac14d0ae9213787110e30c56ad84d WHIRLPOOL 29bd1afd040fb9bffccd6458ffb3a66d7586ff5d286aac6b7e285c2c16f4bdad3e150ab6fa57d408d789348a7396274a90708e62d0f3d1258afca3722b923b8a
-EBUILD gtk-fortran-3.9999-r1.ebuild 2298 SHA256 93732a34386f2b93b2912f133fc3583f586a910fca606900fb747a87198ff5a0 SHA512 39e2ffe483f5a7678cd4e7cd99334db056311866a155af04c7b616672247b6d4ab2b146a7471a3727e99de06fad560a0ca0eccfadc7c33bfe41daaca17dce670 WHIRLPOOL f3d1c9f7a1f1f91251072943cb16f633dfdea685057aca6c93fb13ad32103c17da8a950e91c592db8617a22b1dec3292fbb273a5094e15a381d39483198aed6a
-MISC ChangeLog 878 SHA256 06de312d06fa5c6d44046efd926042d910434166b735781650913335c3ffbe8d SHA512 2eaf61d70faf6428133fb4efdeeab1dad25bb50cc86c6d8266ac284bd2453cc33f89f61f70770f5a1af5ed780500e2ce6f468f3a6d670318726a2d138f3b20b6 WHIRLPOOL 0c6fb3011c2f36dd39cf1c87e957b387b790fcefdba9fff4717ec3ee9ac6193c30ef1e0d0c4cbd07e5985039d7e77b8d92e3fdc3ba43936586fc0fdf0977222b
+EBUILD gtk-fortran-2.9999-r1.ebuild 2256 SHA256 168ab3be331717b5ba1645be42661224f2ad3284d3185b245eda8adf53fdc1b2 SHA512 c193789f178330273903fc456abdd285a31d8a89208499de5fe8f9e3a1b7ef6b2ba7c3e092334d9b504fbd163da1632e007989609edb84c8a5e481876ec0b526 WHIRLPOOL 255d300f880696cddd5f06b26d232630d9a4df4eb69332569343531ae8cece862f3688a43d19282f60176f43a094e79061e84db1941dafc7af6d1340d729a899
+EBUILD gtk-fortran-3.9999-r1.ebuild 2389 SHA256 555240567cf868cceaa78ad293cb7a6be478c31c0e58b74479ed91202343aa4e SHA512 5c64e6c55e860ca7b35f13441c3215166d24d995a139d97be357950c0324ae2b98dbc5108fd64886ad4c18444a0a745ec14ecd548cb39f9e413648eeb597fad3 WHIRLPOOL 7625545aa5d1e1371ab6cb7f3df67de4f88d8aadffc4bc1d5fc7aa9b810b1c731f2b708d2ad6a190d0b83a76b0874fda426d68d53931b65960643e5ef8569121
+MISC ChangeLog 889 SHA256 06ce138dcd08642b920767bdffa86321b312b3fe54df3c5d6a127163919cbd2c SHA512 a7105757fc8aa5bc818f3d018431b6a236489169b758b4fb119a70e87ca4ffb8ba3a436a78e6d24cc165efc43a15a54e396199e60da59b88195d0b533601c4e2 WHIRLPOOL c1b16076990314f3984478e0a14d96458475fcad45d79bffbd04045a4da3f39bf8815d35b178e4d60a10880ce677bccb5ac4a9831893b0e134d9e10497965c20
 MISC metadata.xml 373 SHA256 98506cb594b20d1110923136a74915a2d902a0aca773e3d402890e327dd88a3e SHA512 555e2557bb12668a8b86837b27b64c8eade75ff9152c84823e9c322471cb1e098d8417e759fcfaa999b87b0a8154e5faf38311e1298f3e9f4d83367b38e8a506 WHIRLPOOL 73470ae2bb10184a036387d526121459d3d2f2474ff02483d1ffa56de411060bd48d18d2cc5a8e0cbdf39e782b7a769875b0d8cb07899baebdbe9b95d846a915
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 a46d3dc..8544c40 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-2.9999-r1.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-2.9999-r1.ebuild
@@ -33,7 +33,8 @@ src_compile() {
 	cd "${CMAKE_BUILD_DIR}"
 	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
+	emake VERBOSE=1 usemodules manpage pkgconfig || die
+	use plplot && $(emake VERBOSE=1 plplot_extra_module || die "Creating plplot_extra_module failed")
 	use doc && $(emake VERBOSE=1 doc || die "Generating documentation failed")  # Doxygen documentation: ~135Mb!
 	#emake -j1 VERBOSE=1 all || die
 }
@@ -47,7 +48,8 @@ src_install() {
 	dobin src/gtk-2-fortran-modscan
 
 	insinto usr/include/gtk-2-fortran/
-	doins src/*.mod plplot/plplot_extra.mod
+	doins src/*.mod
+	use plplot && doins plplot/plplot_extra.mod
 
 	insinto usr/share/gtk-fortran/
 	doins src/gtk-2-fortran-index.csv src/gtk-2-enumerators.lis
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 9b60a59..8205c8a 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-3.9999-r1.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.9999-r1.ebuild
@@ -34,11 +34,9 @@ src_compile() {
 	cd "${CMAKE_BUILD_DIR}"
 	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 VERBOSE=1 gtkf-sketcher usemodules manpage pkgconfig || die
+	use plplot && $(emake VERBOSE=1 plplot_extra_module || die "Creating plplot_extra_module failed")
+	use doc && $(emake VERBOSE=1 doc || die "Generating documentation failed")  # Doxygen documentation: ~135Mb!
 	#emake -j1 VERBOSE=1 all || die
 }
 
@@ -51,7 +49,8 @@ src_install() {
 	dobin src/gtk-3-fortran-modscan sketcher/gtkf-sketcher
 
 	insinto usr/include/gtk-3-fortran/
-	doins src/*.mod plplot/plplot_extra.mod
+	doins src/*.mod
+	use plplot && doins plplot/plplot_extra.mod
 
 	insinto usr/share/gtk-fortran/
 	doins src/gtk-3-fortran-index.csv src/gtk-3-enumerators.lis