Calculix

sci-libs/calculix-ccx/Manifest

@@ -1,25 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch 1090 BLAKE2B 9ce1e4fdc8946e8e16d04dcdc27723947256a17a91240bdea5f02f5e10a8363c87b12afe4a1fa128b7da69ed8b3f070d0899ccc6a2440d6ba6be5558d100f4ff SHA512 337c3b0144784d5e7e5819ba7cbc4743d1cbb1fe17b25a3eeb3dc1a1b5bb0cf2ee2d93e46f788a06a85636d09cfa79c2208f2acb0492d2abdd6cdce79272a45e
-DIST ccx_2.10.ps.tar.bz2 2542937 BLAKE2B d196a5c5e09d983b94e326701ad5a6a23fc350f3d753fe5138748b8eb19cdedd5be76a403c0ed6e423d42554dc15fdb2e98f2975d8d7dac291e1495f3fdd884d SHA512 1613585c202f3b41ce5b3f697504b686cb39aef969ac2da62e4957f814e3e6333cc7f92ba18e90f857ca7683112906d5d93b3956b999bdd4681810b676a7857d
-DIST ccx_2.10.src.tar.bz2 1005712 BLAKE2B 3450423fd6d57f188d9f9dff9c7c99ef4606ae66e7b39e694c11f3b3cf0c638d37c1e40e07a97e9b86bb199322ba9bee6ac06658bf28975cea456f0ef278e4d3 SHA512 bdd852a7fa5e327ed248058370bfaa5f029e4d98c9ee7d0e0a12f2bca480e5fc402a228e23c45f94149b2de427ebff32805f9c2a4ddbb223ff6333c26076743b
-DIST ccx_2.10.test.tar.bz2 9083192 BLAKE2B b493ef278fb8c6e60b81c2331349e9c187443c0658c76574d2814848b24461bc6a21f972666687b1f7b18babf683814cc5361303e39a62d08cf091d8efeda63a SHA512 9dac892b5d3d2070cc266ceeceec2aba205a81db6bb3b688a803f7768d0223c10c545cbd617628ed3ca39b13d154834eab3529a43f360991ad41d6a7771446f2
-EBUILD calculix-ccx-2.10.ebuild 1695 BLAKE2B cede7a2c42255dbb555f0944d19f22572ee219be37658403d6a3a004c43bee3f465142267cd9b9018d5e16a1766defdf7c4d1e7d7d759da13e974ab99cdbe8a7 SHA512 3eb6c52792f44331ebea0e1a63d7ced2e6019ff361a3ca534c328b4b74fb6be8b1894c469513bfb99cc91855338b5ec5d8dc2d3fbdb87d3fdca7a172e942c9c1
-MISC metadata.xml 350 BLAKE2B 71d1b6a3cdf463347f67d10af1172bd5f06198908cd62e3ddfb4595fde52cf4dfa8ed04b4189ee446dabed18864784c31a304c1eee83fa20b032b26b22fea0b5 SHA512 a6e2e51e75a85efe99749af606ab23b5e53afcfe077f24af471ab5aa6eb050e614bd0fb0a5ae330eaba82c7edd98e7e177dabc5f5fbcb4f3076c1940f71c21b1
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEKbqdX3+q71mbfP1xLiRqTnFapoMFAlvMTdwACgkQLiRqTnFa
-poPizRAAzvKT4sy0gBdefFhp3llBu0M5D71itwg/yHUDpwMFUuOD8Fe651+JMr3I
-753BNU7Zdd1smvDzNYD/iieayJHYJRxTiOTX7fFoGpzQQoHNIgSGcOkCN22EF/mv
-/9I5VLWn+19InNj38xyPWxHG51baYDi6OK1etyZTrp3oJCx/CT0TV3BXjCPGhJn3
-Y23iA8OYtJxGq0OThu5OYf1/Jrmd1RWKnBi4uDNdLoaTBR+xmKCYCdVOMjK5CYAX
-uJfC4VFuKtuddI8n+B/v0l6KH/GroqXtlc1omIhweFdjrZcXTIoxTH/MS1SXlkPT
-oINwWilE38cirRP3aWGcT2iwFmstrvgUucINClh9/BomT9ksF1h/1113V3hS7RuN
-KB3GtdKLyOBgkeT2Rn9ansf0mOzetipiuAVNMhe8kkyZaZV3tKaROVH1EPPG9F+D
-13X9pTIldxrqBH4w9t6jj/KLd1AHUsFsuZyGOHYIQ6eVx78n7b5JIR7B2+V/HMBP
-1pkYsKMDRHTOI3np7Xpw03BY8ZWjbw9xxjxr1FvqqZOWY81L6BTezHvcYiTb3F4P
-jn8INK2ank10ZVHCCbEUORwsUVOKTgngiaEJAV6NvTv1S+u+KhLOKIBO6l82qevP
-hFZiGxfLg+0ahhL/K51+6rqnGMP3WN9QKYUngMUlaAJOU0rsSMg=
-=LrkG
------END PGP SIGNATURE-----
+AUX 99calculix-ccx-2.14 1643 BLAKE2B 7e5b5383a9a95961fc102ce923bce0e8151a8d615582cd11f1abf748fa0ea38755bfceabab7346dd80271396305212c6e576eddfbc71d23d2a3f2ccf40e529cf SHA512 45c08428d893066297591cfc0547e1109c96bc7b10b61b9626acb710cd2ec820e21f1d846c52d259528e9220ed79f200dd4b1b453c2041fb5c7383dff904e7a0
+AUX calculix-ccx-2.14_Makefile-custom-flags.patch 980 BLAKE2B 4a2808883bc0b682352a730896bea208a49ee5dff400feae9e3ee11bc4b9b86864d0fb6d7006145de499c8ca63735b6b4c11cf2f22b948612eac6a5b7fda5c75 SHA512 85b15cfdcb00ca0049439049f91a2a24c5ce7bc024f7eca1744ad38c55ea2f8df86acde978d47f467009eb0460e751291ddc8bb897ad7bc7885ebda327d24277
+DIST ccx_2.14.htm.tar.bz2 2218811 BLAKE2B d5a0a4c5cd3762c4955b66479dbefd218ee99802fd80ec302c0d5e74036c8b1514478ca0336e46a31e79959e9fa68ea14725e319004d8320c9cdb297e08b3f66 SHA512 21da6c912dffcc8615e7540816b46779cee5d8c64ae90bca328b4571e35b735268c932d88032f36a49e34f08d210cc1f5a204b5607f22586bad8918ffd758231
+DIST ccx_2.14.src.tar.bz2 1160412 BLAKE2B c395e607814a2b40c0a24e7367b5556014157995855185c5cf6820cef5fef6735f7bef8faa0313de6c5ff30c82bb4a6b4e13497456e2ea3befff2e849b1c04be SHA512 2a8475b0d9e9298d3cf38c68df0f73699b29a2accaba035a755d06b76ff145ad8933fb85c0f8287f61e3c678b09ce56a7cf7033a5ec98b39c87c73ee7865691a
+DIST ccx_2.14.test.tar.bz2 9661509 BLAKE2B f0d996696e7d775214a696c31ef13b8c3c4831602e727945eb1bd264ff14be5f4508e282b37d103a4ea77a01ed3d1227ada6299f946e95835cca4ed99b01a11b SHA512 0e45861c147e0331d5ec686e2e9d60190baf675738fa7f219b46ba849a6feba1b5132f167e89c5743461fee83d2036e43074da442b83b9b308a3a78af1e17d45
+EBUILD calculix-ccx-2.14.ebuild 2262 BLAKE2B 5d735e4f62a966299b5ab92bffe1beb883a6759ebdc91105afd798f00cfe35c0b5d333b43c25b58a159e81b18a5e8adf37344c98812a21da90249c4e839e9ab8 SHA512 55264cb9d91c3ef4f56811c5ce587bcf749f7a66558812b6ab2e06755b8be9cbab2131b2ec2ee468776fc83552c1bdcca1b6945cd19cdb70104df1ec0030c590
+MISC metadata.xml 766 BLAKE2B e08bae38741128f119ae0eaca216dd6d1ba763562e482e18be3149eff58bb645a7f97cdf369496dc26f148c18fb119eea80747ca0fd0461f1290437b98caf573 SHA512 523c6c98d843fa0bcac61e1ec2b5bf28d7dc347abf4aad7b6aefc70b1fd3e6f2df15a14d7d23f62caf34f113531b204587a1b4e0d53348ea6a727de99518dc82

sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild → sci-libs/calculix-ccx/calculix-ccx-2.14.ebuild

@@ -3,37 +3,49 @@
 
 EAPI=6
 
-inherit eutils toolchain-funcs flag-o-matic fortran-2
+inherit flag-o-matic fortran-2 toolchain-funcs
 
 MY_P=ccx_${PV/_/}
 
-DESCRIPTION="A Free Software Three-Dimensional Structural Finite Element Program"
+DESCRIPTION="A Three-Dimensional Structural Finite Element Program (Solver)"
 HOMEPAGE="http://www.calculix.de/"
 SRC_URI="
 	http://www.dhondt.de/${MY_P}.src.tar.bz2
-	doc? ( http://www.dhondt.de/${MY_P}.ps.tar.bz2 )
+	doc? ( http://www.dhondt.de/${MY_P}.htm.tar.bz2 )
 	examples? ( http://www.dhondt.de/${MY_P}.test.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="arpack doc examples openmp threads"
+IUSE="arpack doc examples openmp taucs threads"
 
 RDEPEND="
-	arpack? ( >=sci-libs/arpack-3.1.3 )
-	>=sci-libs/spooles-2.2[threads=]
+	>=sci-libs/spooles-2.2:=[threads=]
+	virtual/blas
 	virtual/lapack
-	virtual/blas"
-DEPEND="${RDEPEND}
+	arpack? ( >=sci-libs/arpack-3.1.3:= )
+	taucs? (
+		>=sci-libs/taucs-2.2:=[cilk(+)]
+		|| ( sci-libs/parmetis[openmp=] sci-libs/metis[openmp=] )
+	)
+"
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
-	doc? ( app-text/ghostscript-gpl )"
+"
 
 S=${WORKDIR}/CalculiX/${MY_P}/src
 
 PATCHES=(
-	"${FILESDIR}/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch"
+	"${FILESDIR}/${P}_Makefile-custom-flags.patch"
 )
 
+DOCS=( BUGS LOGBOOK README.INSTALL TODO )
+
+pkg_setup() {
+	use openmp && tc-check-openmp
+}
+
 src_configure() {
 	# Technically we currently only need this when arpack is not used.
 	# Keeping things this way in case we change pkgconfig for arpack
@@ -53,6 +65,12 @@ src_configure() {
 		export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack)
 		append-cflags "-DARPACK"
 	fi
+
+	if use taucs; then
+		export TAUCSLIB="-ltaucs -lrefblas -lreflapack -lmetis"
+		append-cflags "-DTAUCS"
+	fi
+
 	export CC="$(tc-getCC)"
 	export FC="$(tc-getFC)"
 }
@@ -62,13 +80,26 @@ src_install () {
 	dosym ${MY_P} /usr/bin/ccx
 
 	if use doc; then
-		cd "${S}/../doc" || die
-		ps2pdf ${MY_P}.ps ${MY_P}.pdf || die "ps2pdf failed"
-		dodoc ${MY_P}.pdf
+		local HTML_DOCS=( "${S}"/../doc/ccx/. )
+		einstalldocs
 	fi
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins -r "${S}"/../test/*
 	fi
+
+	if use openmp && use threads; then
+		insinto /etc/env.d
+		doins "${FILESDIR}"/99${PF}
+	fi
+}
+
+pkg_postinst() {
+	if use openmp && use threads; then
+		einfo "An environment file has been installed into"
+		einfo "/etc/env.d/99calculix-ccx-2.14."
+		einfo "Refer to the documentation for details on how to"
+		einfo "tweak the variables defined in this file."
+	fi
 }

sci-libs/calculix-ccx/files/99calculix-ccx-2.14

@@ -0,0 +1,42 @@
+#
+# The following variables can be used to tweak parallel execution of
+# various aspects of CalculiX CrunchiX.
+# For examples of their usage, please see the documentation!
+#
+
+# OMP_NUM_THREADS is a general purpose variable to specify the number
+# of cores to be used in parallel.
+OMP_NUM_THREADS="8"
+
+# Any of the variables declared below can be used for special purposes
+# to override the values of OMP_NUM_THREADS. If any of them is declared,
+# it will take precedence over OMP_NUM_THREADS
+
+# CCX_NPROC_STIFFNESS is used when creating element stiffness matrices
+# in parallel. Default is 1.
+#CCX_NPROC_STIFFNESS="1"
+
+# CCX_NPROC_EQUATION_SOLVER is used to solve the system of equations using
+# the multithreaded version of sci-libs/spooles. Default is 1.
+#CCX_NPROC_EQUATION_SOLVER="1"
+
+# CCX_NPROC_RESULTS is used to create material tangent matrices and 
+# calculate the stresses at integration points in parallel. Default is 1.
+#CCX_NPROC_RESULTS="1"
+
+# CCX_NPROC_VIEWFACTOR is used to calculate the viewfactors for thermal
+# radiation computations in parallel. Default is 1.
+#CCX_NPROC_VIEWFACTOR="1"
+
+# CCX_NPROC_CFD is used to perform several operations in CFD calculations
+# (computational fluid dynamics) in parallel. Default is 1.
+#CCX_NPROC_CFD="1"
+
+# CCX_NPROC_BIOTSAVART is used to calculate the magnetic intensity by use
+# of the Biot-Savart law in parallel. Default is 1.
+#CCX_NPROC_BIOTSAVART="1"
+
+# CalculiX CrunchiX detects the number of available cores in many cases by
+# using a sysconf call. If this fails or does not work correctly for any 
+# reason, you can use NUMBER_OF_CPUS to override this value
+#NUMBER_OF_CPUS="8"

sci-libs/calculix-ccx/files/calculix-ccx-2.14_Makefile-custom-flags.patch

@@ -0,0 +1,34 @@
+diff --git a/Makefile b/Makefile
+index abdda33..97acbbd 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,6 @@
+
+-CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
+-FFLAGS = -Wall -O3 
+-
+-CC=cc
+-FC=gfortran
++CFLAGS := -Wall -DARCH="Linux" -DMATRIXSTORAGE -DNETWORKOUT $(CFLAGS)
++FFLAGS := -Wall $(FFLAGS)
+
+ .c.o :
+ 	$(CC) $(CFLAGS) -c $<
+@@ -18,15 +15,10 @@ OCCXF = $(SCCXF:.f=.o)
+ OCCXC = $(SCCXC:.c=.o)
+ OCCXMAIN = $(SCCXMAIN:.c=.o)
+
+-DIR=../../../SPOOLES.2.2
+-
+-LIBS = \
+-       $(DIR)/spooles.a \
+-	../../../ARPACK/libarpack_INTEL.a \
+-       -lpthread -lm -lc
++LIBS = $(ARPACKLIB) $(TAUCSLIB) $(LAPACK) -lm -lc -lspooles -lpthread
+
+ ccx_2.14: $(OCCXMAIN) ccx_2.14.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC)  -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS)
+
+ ccx_2.14.a: $(OCCXF) $(OCCXC)
+ 	ar vr $@ $?

sci-libs/calculix-ccx/metadata.xml

@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>[email protected]</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>[email protected]</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<longdescription>
+	CalculiX CrunchiX is a free 3D structural finite element (FEM) program
+	containing a pre- and postprocessor and a solver for FEM problems.
+	</longdescription>
 	<use>
-		<flag name="arpack"> Add sparse eigen value support via sci-libs/arpack </flag>
+		<flag name="arpack">
+			Add sparse eigen value support via <pkg>sci-libs/arpack</pkg>
+		</flag>
+		<flag name="taucs">
+			Add sparse linear solver support via <pkg>sci-libs/taucs</pkg>
+			(experimental)
+		</flag>
 	</use>
 </pkgmetadata>

sci-libs/calculix-cgx/Manifest

@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 01_cgx_2.10_Makefile_custom_cxx_flags.patch 2233 BLAKE2B e90a6d08ee9cb845ef46e8473d0b44ad802c5d93e3b7428bef0503cc27ea189be9d4f19aa06446eac8d8acf1c28c0307f01924ced583881046c4ee9c31f50fd9 SHA512 9f6b96eabbd27a9e68ede374481351adc2a601570f41ce5ab03843c1e6478266a79bb9da2653d7a028125f4bf89e2183b0cc80441433cfea2094d4ba890fd56c
-AUX 02_cgx_2.10_menu_fix-freeglut_2.8.1.patch 2049 BLAKE2B 1c8e53ec14a4a220a19a01b95f1cc79983a46e06bcb42c0d39c2e688eb2ee7bee70ba4a55161582da4180c7d1f317ed35421aa31c2651d7e2c25ee50f7112872 SHA512 aad6dba0d08519ecde58ac1863a005d74304455c5c78388d496ca30dd50bf7983be3a0688c7fe828f504f7fc2aaffe85361aa98725fd8e8cb813b36c896ec0d7
-DIST cgx_2.10.all.tar.bz2 1702964 BLAKE2B b634134ebc6e715db9151ec5cd2dd99b82ef336cadf05169bfac67737845e0681c7c509f866fae17e398f24dbdbe4410753dcf6b0bc4384e6df9654881d5ec6c SHA512 518c25f6de4eb43e5a554415776b8533eb1dbd27e44ed3069b4294e09d290de6815eb4f0cb2896f48e8d9b34d8a65925e108227437a49e6423682e112c5a5ea2
-DIST cgx_2.10.pdf 1178710 BLAKE2B 3817d7bc4bfe425234a41af6b92d61d8aeb7c46004b89074aecb2353e7a6d34a54e47bdb44435ffd3ebfa302f1c706d815e56983dd444c32fe56dddeb976bec5 SHA512 cedf7556e85f631aa475d25325587aea2ecad650c325762080524dd056ba1e247d677c9ae2bcb2736b9c0a402a9060dbdebff834d8c10e3d127ecc3af9106385
-EBUILD calculix-cgx-2.10.ebuild 1204 BLAKE2B 6547df2dad5d50ba42b4dd99b650434b2d3a548bed5efc98e50322b73181e77f1fb087668cf4f47c4cfdf8d5fc948f363263b556682ae197783af044d95f327e SHA512 2d5d9ff87177ad0e18bd337625b587d5cd83659ea51079c4378686e9fb0514f3c1f398e6b8fc78f6086d691855caee2350f976186f4a36c3df813ddd8167084a
-MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
+AUX calculix-cgx-2.14.1_Makefile-flags.patch 2124 BLAKE2B a4fd22fec716ca3a0013e1a00940965cfadd240e7d609e0a4e25504290030ba82662b8a5db86426487e18f46c6f1c7629300bcccfcec1bccab37762a5f2b3675 SHA512 d2e6df05adb10f19b919fec204c0601dd79d5751b5975fd766296807ba98567b094cbffc629e630a4ed3cec5b85b8d917abdb7bbb45d759d33692359bcf4049e
+AUX calculix-cgx-2.14.1_fix-externals.patch 1354 BLAKE2B fc6c8bb1788056d50a0cb06ed5cf26b43b6089124595d13686c770984864c8a3fe8e800624bac39f3c9bc3b2fa01554998a60e78b3cbf0e7efb49712dadf4f4b SHA512 73b731d43f73c5b0ed4ff57450cdc48bf48061710d7e6e9136ff3867fa80d9a3762812d735ca91668888c6c1a3494fb89dcd5dda447f08528d8671bf03dec32c
+DIST cgx_2.14.all.tar.bz2 5451218 BLAKE2B baee490a945eecd1adcca18c5821b6f4c421ec5e038c3318291a9a030f12110642bef1a13ed4cde25a4d0926629116048a041c30542d6ac0e0feb55558fb27c4 SHA512 ebc5c1adfdb182bba95f4d89a8fee4342f92b04e9398af431d59ee7202773621cf56d836c07012d33be1ca9a59cbbcdb09f301799b2886be503292c418a88e33
+DIST cgx_2.14.htm.tar.bz2 338235 BLAKE2B db0780393806cf9344b0f0aab721d7c1ad2671fe57c9f278dab09eacc13f26a38c3049ae715f8fba3da2d69c06619d829b26265b8801a3984ef2e5e393432140 SHA512 99eff4b02bf13084f661703db2207377b9d4cd8060da7eaf00fb8f6d0958acb2a41c21299ace1af9782c7cc4d74439967f9c682fc2d592c77fce051b6301496b
+EBUILD calculix-cgx-2.14.1.ebuild 1935 BLAKE2B e079e791ee5a244893c3bb590bb1979789f6c4724e118a568a5db3f2ec77a75d7e361f8c304ae420851f03e1387b010880da409e03c4dcfedbbe4a72208ea546 SHA512 7a15954967c055c308b25eda7bdc54cd38530107f5b8b097e2e8ecba59a6acbb7b58df543281fba1d79b36a6812679b01f60cf297a6076ecdc905074293a79bc
+MISC metadata.xml 749 BLAKE2B f99868f5c00acd06cf65be32656dc7506b6d2e99bf5e270e68a3de35c9ca1559d627e784202f11b91a35d4a309b560c30c900026c2b21715991e40fe7af808f9 SHA512 87f25fcd47778fc3609d72a833b3dcc30b72c9fe6a7d294b0daf8c756a5a05fc6c326bdcb002bad206a76fcc39a379b5e66be42c7171dd9e8c1ade73e439fb4d
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAEBCAAdFiEEKbqdX3+q71mbfP1xLiRqTnFapoMFAlvMTn8ACgkQLiRqTnFa
-poNGRBAA6zeVhMSM4e1tvRqxVBAZUwNzXan12Gw8Iba+WWa6X1rUqeCiYV21H+f8
-B6A4zbMC9H7LtW+wQccYkiLIy8tIHMBN/oYSBSDLt+ApsnPgW+QqFmJBJaQM4Z++
-hIxFu2ppp0GBYRiI8glhzXIBB9RCZpxMFgPsYvBZ2deal0O+ust0eVnwFgavXNRv
-15CyeXNF/VmaIAFZuRWIx5AOO0Rk6b2vf3FYWgtK9E45Jv838v3BwPe2Ea3mlgjv
-Z59q2FjcbraKat/iKvsxkhri/2Y1HjCjlX+IBVPnTo9ksD5i3hjffLzQiSiDcX3j
-8d6gZgHzYi6UsK6FSO0P08ReMEvVas8GMCIWchOZMhXa9gbX8i6jngsQHyPaijGH
-LBsZF5c3kBf9SvLar/snTOeEaiXTchwJerbKgiGDwTnqS5vVBJwbbfOmbOAxgCLi
-Fw4OQB6V0OCg8qxKjdh0mcSO02J1xDcqARjixHP4lCQtWU2/ruRcUkC2pxTNf3EZ
-z63suM/iOJFuLKZRERoEAFjEY5v00H097pKTsMKJidhpflvAjWLjns3ZC27ATuch
-WLm/QCYuc0kWlmq6Joy5BGwwCHkUawdHGWgRtTph5IUbhc/VyD5SfIOresd/c5K3
-lLrBgAhaGEShlDN4K9QG3Gqg/ZYxBtBYIA7hVo8lxtyi29uJm5k=
-=EDGx
+iQIzBAEBCAAdFiEEKbqdX3+q71mbfP1xLiRqTnFapoMFAlvMq24ACgkQLiRqTnFa
+poN2+A/9Ettno2SBKcGCXlxi2fTANovV/jmfOJbv3h7EsKWiDKwlQsqD1223dFc0
+OI9U1iNX85G3+x0azODd/7m9oygzjDtw+U5ZEDBe5qpad1jtxna/rN9j1/GVBVTo
+3ICd4J6acQjWFSgQKHtgMrKBWGm9Q8T95rLsTdTNLLjQODgfyvfOD2WL32yhMeEb
+c9nmQ7mNZ8P2WXlodZywYFK6XQzHo8MH0fpK55R5mRL0Ms1u6NvzacADc700YVHC
+i8jIpzYHNe9lblRbwDyBtljlo+F/xtgrSvyQdwcKswY6r/5nJ6U2sblzrFInHbjG
+nBpzykENHeR094WtJ+6VVf3Jxzl5zWl5XlsEQtIFCqP98tuh1ZOWMzT6/k7DlKDa
+gUaak1cH7IWz+ovZb7OwXy8eyxi2WMKYs4uaKhuzz76xR4pietFAhaWh+g1GJah1
+GxsCBtdkUqUhoIv0bGVxcJolXb/vclNcgUcNG0yfZGaZVdV+wBk1fQcQahqv8l3f
+MYr8eF+nIzFUKfA9gnkJjNAigJFpqYmgxuzf5wjmjgEEmW1ug7Lc6dqMAkoN67wt
+y97+uYLtMUUND9J0kxC3WAal/Y0dQd7wzN5+RVhxrj1gHE941vwaFC/4vbbNAYzJ
+PzBqvOFFGGoXLm5g1ixcK0ep4LpFAvtbAhP59Qv4UQaAu8nBef8=
+=Yf7B
 -----END PGP SIGNATURE-----