diff options
Diffstat (limited to 'sci-geosciences')
40 files changed, 914 insertions, 563 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex bc0ae6e13679..2d6dc3fcab18 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest index ee72503df9c6..14f41e98baa2 100644 --- a/sci-geosciences/gnome-maps/Manifest +++ b/sci-geosciences/gnome-maps/Manifest @@ -1,5 +1,5 @@ -DIST gnome-maps-3.34.3.tar.xz 3976776 BLAKE2B e01c18be2b48b90f88159828a046e3c422a56557f198595985ba39053ffdc85d60eebbf21d37ab1e4bb2eae8d1ad93c76b199650b713eba7a937674be38c845f SHA512 63261fb77ea1260aacaf502950f89ba6e5294271526b25302258df4fb40f4e04e3a4697750b2f7238f45a8d4bdbe9e583d45a4de02ce178e8f6716b44a7c8ba0 +DIST gnome-maps-3.36.4.1.tar.xz 4006432 BLAKE2B c5c51faccee3e67be08279748dde270716ddf773266f678d1fa573ad4dbf9af95ea53c5c4e548e1c2eb296030371bd693f301ad3a43d2d88e00ac77121ca7834 SHA512 e63f8fe0b0c9226e8393bba4f4db6bc655a45cc869bb247ae51bdb06d69ca29785c562f98294c079cc3fc5c56276f10152c8c8e0ec8d46399918d9cd155e63d6 DIST gnome-maps-3.36.4.tar.xz 4006520 BLAKE2B 4fb76e23580556c357c5a4a246a250521472a4b264264ea0e6172b2a61583f63e297fef29060b1b30a8978e509820d22eda2e6d56eda69f97e25e9795dcf38b2 SHA512 530ccc0a25c0a1fee2411ecc4034981210836664acc7adc6aa9cff9304e2499c1205f9c27b6b692fdee152fe1750541a1966d59a60958f3592682a5e110d490f -EBUILD gnome-maps-3.34.3.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af +EBUILD gnome-maps-3.36.4.1.ebuild 1395 BLAKE2B 9e3bda52a28a2a22dd9c4bdb1ab74a5fc4711f0e32334fea0857a3e0929d5948e6d79ba495df40f184c01ab89db42b870fb8d1215dd53ce31b7e424ab80503b5 SHA512 24fe4a2e948be7b42a97a7a870d3b0b5727c4d8ca611d564e24c7acf8b0a7f227b0a6560d8d4b4b0316e8320c1d6c2cb6fb47b40e9a81a90f1bd1d58685eacb1 EBUILD gnome-maps-3.36.4.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild index 7927bfa15a56..cb8141452d75 100644 --- a/sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild +++ b/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps" LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" # Pure introspection dependencies found by grepping imports.gi in ${S} RDEPEND=" diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 2ac6e295ce23..962a59cd9608 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -3,6 +3,6 @@ AUX gpsd-3.3-setup.py 448 BLAKE2B 159a212afe7600a9835a03bd87130820a154147aab83c3 AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e -EBUILD gpsd-3.21.ebuild 5658 BLAKE2B e22ae37add6ff5ac203fbb48448816f475ee20d9990c9c54664e669c4d45da6a100043e986e2976582c4648a5793011935a6e6366d99357b36c3545aa2065853 SHA512 951727357db685523d7c7ab179ab887a534b8f46fe12056da635567d1bc8b9b1077121abd3a6a2a98ce460891dfa327dc77ccd884417abb685ee2af1f4f4f67b +EBUILD gpsd-3.21.ebuild 5665 BLAKE2B 49137ef5cbddaf1992aa69b24f03cd0bce02d87d934c4ee274fb911ce96500ffba62da839e1490c34dcb7101c6359ef4a2655cdf0ba872581d5aa27434d1698b SHA512 76d769fc8ada34828a94b73e8f11fc509e7d871871472579c37db61108e95bda09cc12be129033323ec863db58dd58558a94cdfa033dc8711559336d723acb15 EBUILD gpsd-9999.ebuild 5522 BLAKE2B 9127fcc0421eabd1eca09f8bbd6494a008a0990aa4669d80d87024df6f421638a9662b937a12ea03cae4c7e189c00bdbe4a3fc78fe4529634ef4ff12cd8b11e0 SHA512 8375fdb71754aeecb7c58fe02e8082db4a0f57c9b04809d4fdf88756cf35c7c6a2eff34ed6e806b6843c88b662362441a98d7d20529d2aa0e1ad64bbce5178cf MISC metadata.xml 950 BLAKE2B 1187055e96b7b5f0288f76fafbe2b1afd29729365fbf30b7e8120830db76193aa544815fd348058ef59351d1c097747684ae022b0ec7df0f655c0a9e3f4d7449 SHA512 87fdd329ffe13ec6aee16b877b355b2aac2267e8262b30ab5ab04307bc50797e1e3da8328a540a0484b06cbbd2f643f084e556ce32cc01b37c97d0f8f1b6be2a diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild index c5109b205bda..adb5b777c2b3 100644 --- a/sci-geosciences/gpsd/gpsd-3.21.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86" + KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86" fi DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index 19c059c6d9d3..85fd10273c21 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,7 +1,8 @@ +AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f -DIST gpxsee-7.30.tar.gz 5371435 BLAKE2B 49f257dc50201b2fd5a621d51fba67fd8511399c2fb97bd30087e0daedb3db78b678d658bfc6e5c3faedeea84940a8fb1ebe7df16cf3002e40d934c3798ce44a SHA512 b1771cc63df538e6ed5b9c7f47a0aaf4f31969a03a1727870372a249c36f3504adfbb31fdc321cc0da3547f02be7f33639f6e5569a83c98092f2d9a998690c00 -DIST gpxsee-7.31.tar.gz 5377234 BLAKE2B 5f968ad4846a458809b135bd37a978b742a17866a1041d73d6aa14eb5c36f516ae5fade7d8988ef82a0bdb9208e3122f70e5fc982469288fd58f68aa19f6623e SHA512 616dff64295fb83ce10ede3ec79a308682659bef9f0ca25aaafd50c231d84bb7bf8fc4b658fb8c1210db8e14d1941d07f8dfaef50e0c033a988d1f838a483203 +DIST gpxsee-7.35.tar.gz 5403169 BLAKE2B 901c77aa0fd0a54976a8d88daa98acc0125dacae7b9e45455ed79f2c633f33a6311dd3c9a388eae1350dac82ac1e02b811680b15f161cb8a523878698d993aae SHA512 d3346e2ed8593d5b57c2484a2153c9900289380a79799dbbe587879c9fc0b3e95d21f14d178e7e2a4b586062cc22c4ba1d90b3e66e73f0c334360f3b04625f8e +DIST gpxsee-7.36.tar.gz 5404628 BLAKE2B 252acab21aed260eb6f01b9ee38f3c7a88067953b9e481cf2c6e77fcfd52c14fb995c69330dd381fbb3d2b9f7ea5bd345f6d2d3ae8b5be0f6b020680ef9e5f21 SHA512 8a0c718e80544506a6e393fd9b95a2d29092332d8c9fe141351cc1e3553759c909aaac12953a0206dca47f855b8516ecdaacaee577b1ce3dd0e75be2595e4062 EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b -EBUILD gpxsee-7.30.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb -EBUILD gpxsee-7.31.ebuild 1335 BLAKE2B 1e97ef5dabc2123b48944c4c4a3aac0b3d27aa7320a0f48281d29dbb83e45d637d9821edc37fe2e4e168101fdfe13f2af7436d7676067c2266ceb1671265fd80 SHA512 d1bce4cadc339ae25676ea1d39a23b00578faf365d48a08319b32b00deae83521545f428ea366316e7796b33a4656a48c7a4e093ea3eb6b1202fa414077c5ef2 +EBUILD gpxsee-7.35.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b +EBUILD gpxsee-7.36.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4 diff --git a/sci-geosciences/gpxsee/files/gpxsee-7.33.patch b/sci-geosciences/gpxsee/files/gpxsee-7.33.patch new file mode 100644 index 000000000000..00b5ec1286b0 --- /dev/null +++ b/sci-geosciences/gpxsee/files/gpxsee-7.33.patch @@ -0,0 +1,10 @@ +diff -U2 -r GPXSee-7.33.orig/gpxsee.pro GPXSee-7.33/gpxsee.pro +--- GPXSee-7.33.orig/gpxsee.pro 2020-10-08 03:57:53.000000000 +0700 ++++ GPXSee-7.33/gpxsee.pro 2020-10-15 22:26:51.786533119 +0700 +@@ -446,5 +446,5 @@ + + unix:!macx { +- isEmpty(PREFIX):PREFIX = /usr/local ++ PREFIX = /usr + DEFINES += PREFIX=\\\"$$PREFIX\\\" + diff --git a/sci-geosciences/gpxsee/gpxsee-7.31.ebuild b/sci-geosciences/gpxsee/gpxsee-7.35.ebuild index d8d327e9144e..d9d146091a25 100644 --- a/sci-geosciences/gpxsee/gpxsee-7.31.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-7.35.ebuild @@ -29,6 +29,8 @@ BDEPEND="dev-qt/linguist-tools:5" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + src_prepare() { default @@ -48,19 +50,6 @@ src_compile() { } src_install() { - local lang - dobin ${PN} + emake INSTALL_ROOT="${D}" install dodoc README.md - insinto /usr/share/${PN} - doins -r pkg/maps pkg/csv - - insinto /usr/share/${PN}/translations - for lang in lang/*.qm; do - [ -f "${lang}" ] && doins "${lang}" - done - - domenu pkg/${PN}.desktop - insinto /usr/share/mime/packages - doins pkg/${PN}.xml - doicon icons/${PN}.png } diff --git a/sci-geosciences/gpxsee/gpxsee-7.30.ebuild b/sci-geosciences/gpxsee/gpxsee-7.36.ebuild index c5b1bd5f1e11..d9d146091a25 100644 --- a/sci-geosciences/gpxsee/gpxsee-7.30.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-7.36.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PLOCALES="cs da de en es fi fr hu nb pl pt_BR ru sv tr uk" +PLOCALES="cs da de en es fi fr hu it nb pl pt_BR ru sv tr uk" inherit desktop qmake-utils l10n xdg MY_PN="GPXSee" @@ -29,6 +29,8 @@ BDEPEND="dev-qt/linguist-tools:5" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + src_prepare() { default @@ -48,19 +50,6 @@ src_compile() { } src_install() { - local lang - dobin ${PN} + emake INSTALL_ROOT="${D}" install dodoc README.md - insinto /usr/share/${PN} - doins -r pkg/maps pkg/csv - - insinto /usr/share/${PN}/translations - for lang in lang/*.qm; do - [ -f "${lang}" ] && doins "${lang}" - done - - domenu pkg/${PN}.desktop - insinto /usr/share/mime/packages - doins pkg/${PN}.xml - doicon icons/${PN}.png } diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest new file mode 100644 index 000000000000..56dfe48e82da --- /dev/null +++ b/sci-geosciences/grass/Manifest @@ -0,0 +1,6 @@ +AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c +DIST grass-7.8.3.tar.gz 60292787 BLAKE2B e62fdeb5fa8cc64e59eff1a5cb33dbede7a62a30ed6ef08ced5d11e452e7b0109889105ae88ea28fb667b54fceca69729771eca6acf3e8d281487b1e53b1a3aa SHA512 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84 +DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1 +EBUILD grass-7.8.3.ebuild 7009 BLAKE2B 2f00bedbadc55b5d323db7918935702b135c14a2e2e2ca536a48bd322ba38186b1f2d511b52d4ebc84ba534bc5d70448bc9b65de7796f16bda8bc3f22b3080f4 SHA512 07d5b4c87ad1b2eb5b2a2193780232f87c6f73e09040e80dbb4d2fb246bbb710f1a79459a7d3e57b35cb715bf0213856ced0a3b146f8e24534bc0b92c6f92dbc +EBUILD grass-7.8.4.ebuild 6957 BLAKE2B a7f1fb6788c5aaeac1ec21d409ecf77f8eb9a4f5db4089f94ccd1061e12f7f4d26683b596d39087b1e962b4c83948e8e67508648a4c7049d8916ecdbb16b5e7b SHA512 b734454bfb4e84fc18e6514dbda06374f428ac76db1870dce6dde47608e914874c4892532c884f3af60eaeb6811549535c7750b91b804bce200de3a261974c87 +MISC metadata.xml 1058 BLAKE2B fcaa70c36866e086db663b4f5fb00f7a0ba4d725af2c69752e060134203758bf8b094f958dae363c9343f60ced6f9958d59ad5cab775affbf4234ae39b227e92 SHA512 eefd4994f62f769eb2359c20871d2ad816713186e6b536afa4493d363b086a37d156a8220f54432fc94199854ba98a97eb995e1e00f228f0ea4add1f395ae6e0 diff --git a/sci-geosciences/grass/files/grass-7.8-flock.patch b/sci-geosciences/grass/files/grass-7.8-flock.patch new file mode 100644 index 000000000000..4070f228dbb0 --- /dev/null +++ b/sci-geosciences/grass/files/grass-7.8-flock.patch @@ -0,0 +1,17 @@ +diff -Naur grass-7.8.3.org/include/Make/HtmlRules.make grass-7.8.3/include/Make/HtmlRules.make +--- grass-7.8.3.org/include/Make/HtmlRules.make 2020-05-05 10:51:50.000000000 +0200 ++++ grass-7.8.3/include/Make/HtmlRules.make 2020-10-10 13:43:42.800880621 +0200 +@@ -11,10 +11,10 @@ + endif + + $(HTMLDIR)/%.png: %.png | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ + + $(HTMLDIR)/%.jpg: %.jpg | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ + + $(HTMLDIR)/%.gif: %.gif | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ diff --git a/sci-geosciences/grass/grass-7.8.3.ebuild b/sci-geosciences/grass/grass-7.8.3.ebuild new file mode 100644 index 000000000000..e8911d37392c --- /dev/null +++ b/sci-geosciences/grass/grass-7.8.3.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_REQ_USE="sqlite" # bug 572440 +WANT_AUTOCONF="2.1" +WX_GTK_VER=3.0 + +inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs wxwidgets xdg + +MY_PM=${PN}$(ver_cut 1-2 ${PV}) +MY_PM=${MY_PM/.} +MY_P=${P/_rc/RC} + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/" +SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/7.8.0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +RDEPEND=" + ${PYTHON_DEPS} + >=app-admin/eselect-1.2 + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + sci-libs/gdal + sys-libs/gdbm + sys-libs/ncurses:0= + sci-libs/proj + sci-libs/xdrfile + sys-libs/zlib + blas? ( + virtual/cblas[eselect-ldso(+)] + virtual/blas[eselect-ldso(+)] + ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos ) + lapack? ( virtual/lapack[eselect-ldso(+)] ) + liblas? ( sci-geosciences/liblas ) + mysql? ( dev-db/mysql-connector-c:= ) + netcdf? ( sci-libs/netcdf ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng:0= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:0= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:0= ) + truetype? ( media-libs/freetype:2 ) + X? ( + dev-python/wxpython:4.0 + x11-libs/cairo[X,opengl?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + ) + zstd? ( app-arch/zstd )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + X? ( dev-lang/swig )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-7.8-flock.patch" +) + +pkg_setup() { + if use lapack; then + local mylapack=$(eselect lapack show) + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas=$(eselect blas show) + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die + + default + eautoreconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + shopt -s nullglob + local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl + + eapply_user +} + +src_configure() { + if use X; then + local WX_BUILD=yes + setup-wxwidgets + fi + + addwrite /dev/dri/renderD128 + + local myeconfargs=( + --enable-shared + --disable-w11 + --without-opendwg + --with-regex + --with-gdal="${EPREFIX}"/usr/bin/gdal-config + --with-proj-includes="${EPREFIX}"/usr/include/proj + --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) + --with-proj-share="${EPREFIX}"/usr/share/proj/ + $(use_with cxx) + $(use_with tiff) + $(use_with png) + $(use_with postgres) + $(use_with mysql) + $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) + $(use_with sqlite) + $(use_with opengl) + $(use_with odbc) + $(use_with fftw) + $(use_with blas) + $(use_with lapack) + $(use_with X cairo) + $(use_with truetype freetype) + $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) + $(use_with nls) + $(use_with readline) + $(use_with threads pthread) + $(use_with openmp) + $(use_with opencl) + $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with X wxwidgets "${WX_CONFIG}") + $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) + $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) + $(use_with X x) + $(use_with zstd) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${ED}" \ + INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \ + prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \ + PREFIX="${ED}"/usr/ \ + install + + pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die + + local HTML_DOCS=( docs/html/. ) + einstalldocs + + # manuals + dodir /usr/share/man/man1 + rm -rf man/ || die + + # translations + if use nls; then + insinto /usr/share/locale + doins -r locale/. + fi + + popd >/dev/null || die + + # link libraries in the ~standard~ place + local f file + for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do + file="${f##*/}" + dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} + done + + # link headers in the ~standard~ place + dodir /usr/include/ + dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass + + # fix paths in addons makefile includes + local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ + for f in "${scriptMakeDir}"/*; do + file="${f##*/}" + echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die + sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die + done + + # get proper folder for grass path in script + local gisbase=/usr/$(get_libdir)/${MY_PM} + sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ +GISBASE = os.path.normpath(\"${gisbase}\"):" \ + -i "${ED}"/usr/bin/${MY_PM} || die + + # get proper fonts path for fontcap + sed -i \ + -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ + "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die + + # set proper python interpreter + sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\ +os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \ + -i "${ED}"/usr/bin/${MY_PM} || die + + if use X; then + local GUI="-gui" + [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die +} + +pkg_postinst() { + use X && xdg_pkg_postinst +} + +pkg_postrm() { + use X && xdg_pkg_postrm +} diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild new file mode 100644 index 000000000000..b2b81638ae34 --- /dev/null +++ b/sci-geosciences/grass/grass-7.8.4.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_REQ_USE="sqlite" # bug 572440 +WANT_AUTOCONF="2.1" +WX_GTK_VER="3.0-gtk3" + +inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs wxwidgets xdg + +MY_PM=${PN}$(ver_cut 1-2 ${PV}) +MY_PM=${MY_PM/.} +MY_P=${P/_rc/RC} + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/" +SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/7.8.0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +RDEPEND=" + ${PYTHON_DEPS} + >=app-admin/eselect-1.2 + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + sci-libs/gdal + sys-libs/gdbm + sys-libs/ncurses:0= + sci-libs/proj + sci-libs/xdrfile + sys-libs/zlib + blas? ( + virtual/cblas[eselect-ldso(+)] + virtual/blas[eselect-ldso(+)] + ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos ) + lapack? ( virtual/lapack[eselect-ldso(+)] ) + liblas? ( sci-geosciences/liblas ) + mysql? ( dev-db/mysql-connector-c:= ) + netcdf? ( sci-libs/netcdf ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng:0= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:0= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:0= ) + truetype? ( media-libs/freetype:2 ) + X? ( + dev-python/wxpython:4.0 + x11-libs/cairo[X,opengl?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + ) + zstd? ( app-arch/zstd )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + X? ( dev-lang/swig )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-7.8-flock.patch" +) + +pkg_setup() { + if use lapack; then + local mylapack=$(eselect lapack show) + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas=$(eselect blas show) + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die + + default + eautoreconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + shopt -s nullglob + local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl + + eapply_user +} + +src_configure() { + if use X; then + local WX_BUILD=yes + setup-wxwidgets + fi + + addwrite /dev/dri/renderD128 + + local myeconfargs=( + --enable-shared + --disable-w11 + --without-opendwg + --with-regex + --with-gdal="${EPREFIX}"/usr/bin/gdal-config + --with-proj-includes="${EPREFIX}"/usr/include/proj + --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) + --with-proj-share="${EPREFIX}"/usr/share/proj/ + $(use_with cxx) + $(use_with tiff) + $(use_with png) + $(use_with postgres) + $(use_with mysql) + $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) + $(use_with sqlite) + $(use_with opengl) + $(use_with odbc) + $(use_with fftw) + $(use_with blas) + $(use_with lapack) + $(use_with X cairo) + $(use_with truetype freetype) + $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) + $(use_with nls) + $(use_with readline) + $(use_with threads pthread) + $(use_with openmp) + $(use_with opencl) + $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with X wxwidgets "${WX_CONFIG}") + $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) + $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) + $(use_with X x) + $(use_with zstd) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${ED}" \ + INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \ + prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \ + PREFIX="${ED}"/usr/ \ + install + + pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die + + local HTML_DOCS=( docs/html/. ) + einstalldocs + + # translations + if use nls; then + insinto /usr/share/locale + doins -r locale/. + fi + + popd >/dev/null || die + + # link libraries in the ~standard~ place + local f file + for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do + file="${f##*/}" + dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} + done + + # link headers in the ~standard~ place + dodir /usr/include/ + dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass + + # fix paths in addons makefile includes + local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ + for f in "${scriptMakeDir}"/*; do + file="${f##*/}" + echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die + sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die + done + + # get proper folder for grass path in script + local gisbase=/usr/$(get_libdir)/${MY_PM} + sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ +GISBASE = os.path.normpath(\"${gisbase}\"):" \ + -i "${ED}"/usr/bin/${MY_PM} || die + + # get proper fonts path for fontcap + sed -i \ + -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ + "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die + + # set proper python interpreter + sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\ +os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \ + -i "${ED}"/usr/bin/${MY_PM} || die + + if use X; then + local GUI="-gui" + [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die +} + +pkg_postinst() { + use X && xdg_pkg_postinst +} + +pkg_postrm() { + use X && xdg_pkg_postrm +} diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml new file mode 100644 index 000000000000..0f889711e12a --- /dev/null +++ b/sci-geosciences/grass/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>sci-geosciences@gentoo.org</email> + <name>Gentoo Geosciences Project</name> + </maintainer> + <longdescription> + The original GIS, yes the first one, developed by the US + Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation + Project for more info http://grass.itc.it/gdp/index.php + </longdescription> + <use> + <flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag> + <flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag> + <flag name="opencl">Enable OpenCL support</flag> + </use> +</pkgmetadata> diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest deleted file mode 100644 index fa57c739930c..000000000000 --- a/sci-geosciences/mapnik/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX mapnik-2.2.0-configure-only-once.patch 737 BLAKE2B 66233c05272cf12c62c04bd87b5c3ab74894ed2887e6d33f5fe82217344a341ade76c3c9df138baa31629a75bc7c65083baf0470e705fbbd48ae830e36402b0c SHA512 30f044c8501536599d625646dc8930d3cdcd14fc1ef6c3ee64c8226fe03a6d0f3cbc5d175f6aff7bc7dc0575206dcd23288828cb6edad264aed3b2b4d9e7874b -AUX mapnik-2.2.0-dont-run-ldconfig.patch 243 BLAKE2B 8dffa522b7f8cc7a080ebeb3175c953a7a8f457d5c9288a7857aebc1f76cc8b032c11bd46678e2bd50f59ee0e19e7f7172766658640b4a06530ad0163f600e33 SHA512 dd42f09654de246ff6be4cf68fc2b08bb5ec2ae6515e722e89337081ff4b89c8b269fa70d3393f3c6156a539d7a9b1d1f516e9d6ff7f35639669fcfcd20a26ff -AUX mapnik-3.0.18-icu-61.patch 2148 BLAKE2B 3dfc1a8fe598c13317576a31bd758bd28cf24140b02fd46eaf97e9bbb9cc10c56ad5f2b68ebde4e3ccd12f2275469f556edeee21c6f3b7d92e426a6f0b147730 SHA512 32ff973dde413c85fb03769d7b07dc3e1dcdf9fd2e398fb9a77e618a461a8613056cf978d2e1ff4679738e1122af563c6dd5238dcc1d434a19b70b314ea1faa1 -AUX mapnik-3.0.18-scons.patch 1939 BLAKE2B ece0bf49df2959a33af5f58842a59fe59a2e232f41a6e9542e747f24ebcc99d550370cc742e28ba50f10272ac5f2d31cb4c503559fd55ae4323d9ecdcbab1571 SHA512 e17363609928d6654a9949f944dc8d1745336028019f65d7fd12190c8c88de65cc40dae272dab71626ab9fb69009ebc26f0ae2e569dd9d5e8fd84aa2de0370ac -AUX mapnik-3.0.9-harbuzz_sharper-upstream.patch 746 BLAKE2B 73ad3bcb237e30447336657b541bd794e9e7786b23961d6a7ee94c1c5c7646e9337ea5a8002a68e15a9a9cae05a21f06e5517a07f4dbd65815a06f88c3a76d12 SHA512 08815cf001db531cec2660d53f8afdc83df0bb9e59cb792487a05fb5dff64aa66fa79e8283b7b2b8aca031e90205ab0dcd0097d8129953fed33432e93e34a2e2 -AUX mapnik-3.0.9-unicode-upstream.patch 264 BLAKE2B 9b2b8a062a861c58bfbe3681d7edc1d115ae85955dd1c1b73e37b9d1f1e690a97037144d957b318cc0921071525eaae4b3a94403842bdebf503d0f8bd195a3e6 SHA512 1f1f58477f5d54408320190b369a3039c70147f6d4c8498a318969661c258a6c7b5e2f26c111e8d543409512c7a98ddb31ece12ac75b5256a06105177e303c9d -DIST mapnik-3.0.18.tar.bz2 10103474 BLAKE2B de914ffe31940b74114cdf07a9ff13f36c7210d27b84cecd16fda7c429f0c4be7ffb9e677cf1bc8d156298b5f10ed2a41adcbf4f7727bbf85d2f0099950f5c4f SHA512 7af04b9437c83cddedf2b43f7da0622e44178b4ecce80c0349bacf551bf747698d9ec9e4d6eee68c0265feeae5833281215a759de5a1394abbdfdd39eef39661 -DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1 -EBUILD mapnik-3.0.18.ebuild 2808 BLAKE2B 5a466e43f7fa857efd616581e75ace5b667bd5cd7a17fdca76f6167a4e824fc3e7be0f70423f9e13c3643794aa9e658b48d6da29132b1814f6c5ecbd622324a8 SHA512 a0b08534ee7ec46a420a8573eb0f7fd2cce22cdaa91c46604354b1331a61d24b3a88bfca33d6ed377afda579d8991fd3786b839b4622f4e33e41651dadb96a73 -EBUILD mapnik-3.0.9-r1.ebuild 2577 BLAKE2B e3041bb3a183e05a1b76b51cd87293c2f47589ad4fd0cfc3f13a6590c0fb12bb8dd3fe0dc7fd5cac9fd9daf6a38756fe43ebe179c0d8d0b46f61b37903c709ac SHA512 5e01f9e9de2de21a5b7d31df3b70af7961b3548f486f910a731eafbe4ea1893be7c1448ecf57313c6384c19d7bebb82e7e1897c1a62d52d2161ce31b910f8774 -MISC metadata.xml 754 BLAKE2B f28f0847b5c78c667dc69f9d7e0ca75b196926ad8b6f98cbc1c529470943b0ecc64bd05fdc1ed3ef289dc60bf54d4f594800fcea44ef20d5e3dd5ba4ad1cfeb7 SHA512 84138433b879b8d48422f7f9d587966b69a28d89effac6cfbf7bd925010c3d118f4296c08de787dbf6649af549acf4fd671a4702acc9d203c3829caca30fc5d1 diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch deleted file mode 100644 index 89541cb85ed7..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -503,16 +503,7 @@ for opt in pickle_store: - #print 'missing opt', opt - preconfigured = False - --# if custom arguments are supplied make sure to accept them --if opts.args: -- # since we have custom arguments update environment with all opts to -- # make sure to absorb the custom ones -- opts.Update(env) -- # now since we've got custom arguments we'll disregard any -- # pickled environment and force another configuration -- preconfigured = False -- --elif preconfigured: -+if preconfigured: - if not HELP_REQUESTED: - color_print(4,'Using previous successful configuration...') - color_print(4,'Re-configure by running "python scons/scons.py configure".') diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch deleted file mode 100644 index c92c0e9a02a7..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/build.py -+++ b/src/build.py -@@ -38,7 +38,7 @@ def call(cmd, silent=True): - print stderr - - def ldconfig(*args,**kwargs): -- call('ldconfig') -+ pass - - if env['LINKING'] == 'static': - lib_env.Append(CXXFLAGS="-fPIC") diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch deleted file mode 100644 index 1330fe6c0fb2..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1ddfe6c315487a802f2ea38119255a203a25913c Mon Sep 17 00:00:00 2001 -From: Raul Marin <git@rmr.ninja> -Date: Tue, 3 Apr 2018 13:18:03 +0200 -Subject: [PATCH] Qualify ICU types explicitly - -ICU 61 has dropped the global `using namespace icu;` -http://site.icu-project.org/download/61#TOC-Migration-Issues ---- - include/mapnik/text/scrptrun.hpp | 2 +- - src/text/text_layout.cpp | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp -index 2161c510d9..c219a2a0d3 100644 ---- a/include/mapnik/text/scrptrun.hpp -+++ b/include/mapnik/text/scrptrun.hpp -@@ -37,7 +37,7 @@ struct ParenStackEntry - UScriptCode scriptCode = USCRIPT_INVALID_CODE; - }; - --class ScriptRun : public UObject { -+class ScriptRun : public icu::UObject { - public: - ScriptRun(); - -diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp -index 663cbe11aa..ecf02ab8e3 100644 ---- a/src/text/text_layout.cpp -+++ b/src/text/text_layout.cpp -@@ -207,6 +207,7 @@ void text_layout::layout() - // At the end everything that is left over is added as the final line. - void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits) - { -+ using BreakIterator = icu::BreakIterator; - text_line line(line_limits.first, line_limits.second); - shape_text(line); - -@@ -228,7 +229,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits) - } - - mapnik::value_unicode_string const& text = itemizer_.text(); -- Locale locale; // TODO: Is the default constructor correct? -+ icu::Locale locale; // TODO: Is the default constructor correct? - UErrorCode status = U_ZERO_ERROR; - std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status)); - -@@ -336,6 +337,7 @@ inline int adjust_last_break_position (int pos, bool repeat_wrap_char) - - void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits) - { -+ using BreakIterator = icu::BreakIterator; - text_line line(line_limits.first, line_limits.second); - shape_text(line); - double scaled_wrap_width = wrap_width_ * scale_factor_; diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch deleted file mode 100644 index 2414bf95fedd..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -317,7 +317,7 @@ - ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), - - # Install Variables -- ('PREFIX', 'The install path "prefix"', '/usr/local'), -+ ('PREFIX', 'The install path "prefix"', '/usr'), - ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), - ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), - ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), -@@ -1222,6 +1222,8 @@ - - color_print(4,'Configuring build environment...') - -+ OPTIONAL_LIBSHEADERS = [] -+ - if not env['FAST']: - SetCacheMode('force') - -@@ -1410,7 +1412,8 @@ - # https://github.com/mapnik/mapnik/issues/913 - if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2': - if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'): -- OPTIONAL_LIBSHEADERS.insert(0,['libxml2','libxml/parser.h',True,'C']) -+ # code doesn't actually use HAVE_XMML2 but set just to have a fifth value -+ OPTIONAL_LIBSHEADERS.append(['libxml2','libxml/parser.h',True,'C','-DHAVE_XML2']) - if env.get('XML2_INCLUDES'): - inc_path = env['XML2_INCLUDES'] - env.AppendUnique(CPPPATH = fix_path(inc_path)) -@@ -1428,8 +1431,6 @@ - else: - env['SKIPPED_DEPS'].extend(['dlfcn']) - -- OPTIONAL_LIBSHEADERS = [] -- - if env['JPEG']: - OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) - inc_path = env['%s_INCLUDES' % 'JPEG'] diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch deleted file mode 100644 index cb81f526568c..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/include/mapnik/text/harfbuzz_shaper.hpp 2017-10-31 17:45:30.737250086 +0100 -+++ b/include/mapnik/text/harfbuzz_shaper.hpp 2017-10-31 17:46:56.002247847 +0100 -@@ -39,10 +39,11 @@ - // harfbuzz - #include <harfbuzz/hb.h> - #include <harfbuzz/hb-ft.h> -- -+#include <unicode/uvernum.h> - // icu - #include <unicode/uscript.h> - -+ - namespace mapnik - { - -@@ -55,7 +56,8 @@ - static inline const uint16_t * uchar_to_utf16(const UChar* src) - { - static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t"); --#if defined(_MSC_VER) -+#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59) -+ // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1 - return reinterpret_cast<const uint16_t *>(src); - #else - return src; diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch deleted file mode 100644 index 0233eb4e3fdd..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/mapnik/unicode.hpp 2017-10-31 17:53:23.507237672 +0100 -+++ b/include/mapnik/unicode.hpp 2017-10-31 17:53:47.096237053 +0100 -@@ -31,6 +31,8 @@ - // std - #include <cstdint> - #include <string> -+// icu -+#include <unicode/unistr.h> - - struct UConverter; - diff --git a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild deleted file mode 100644 index 91778820d459..000000000000 --- a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils scons-utils toolchain-funcs - -DESCRIPTION="A Free Toolkit for developing mapping applications" -HOMEPAGE="http://www.mapnik.org/" -SRC_URI="https://github.com/mapnik/mapnik/releases/download/v${PV}/mapnik-v${PV}.tar.bz2 -> ${P}.tar.bz2" -S="${WORKDIR}/mapnik-v${PV}" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cairo debug doc gdal osmfonts postgres sqlite" - -RDEPEND=" - >=dev-libs/boost-1.48:=[threads] - dev-libs/icu:= - sys-libs/zlib - media-libs/freetype - media-libs/harfbuzz - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/tiff:0= - virtual/jpeg:0= - media-libs/libwebp:= - sci-libs/proj - media-fonts/dejavu - x11-libs/agg[truetype] - cairo? ( - x11-libs/cairo - dev-cpp/cairomm - ) - osmfonts? ( - media-fonts/dejavu - media-fonts/noto - media-fonts/noto-cjk - media-fonts/unifont - ) - postgres? ( >=dev-db/postgresql-8.3:* ) - gdal? ( sci-libs/gdal ) - sqlite? ( dev-db/sqlite:3 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-configure-only-once.patch" - "${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch" - "${FILESDIR}/${PN}-3.0.18-scons.patch" - "${FILESDIR}/${PN}-3.0.18-icu-61.patch" -) - -src_prepare() { - default - - # do not version epidoc data - sed -i \ - -e 's:-`mapnik-config --version`::g' \ - utils/epydoc_config/build_epydoc.sh || die - - # force user flags, optimization level - sed -i -e "s:\-O%s:%s:" \ - -i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \ - SConstruct || die -} - -src_configure() { -# local PYTHONCMD="$(which python2.7)" - local PLUGINS=shape,csv,raster,geojson - use gdal && PLUGINS+=,gdal,ogr - use postgres && PLUGINS+=,postgis - use sqlite && PLUGINS+=,sqlite - - MYSCONS=( - "CC=$(tc-getCC)" - "CXX=$(tc-getCXX)" - "INPUT_PLUGINS=${PLUGINS}" - "PREFIX=/usr" - "DESTDIR=${D}" - "XMLPARSER=libxml2" - "LINKING=shared" - "RUNTIME_LINK=shared" - "PROJ_INCLUDES=/usr/include" - "PROJ_LIBS=/usr/$(get_libdir)" - "LIBDIR_SCHEMA=$(get_libdir)" - "FREETYPE_INCLUDES=/usr/include/freetype2" - "FREETYPE_LIBS=/usr/$(get_libdir)" - "XML2_INCLUDES=/usr/include/libxml2" - "XML2_LIBS=/usr/$(get_libdir)" - "SYSTEM_FONTS=/usr/share/fonts" - CAIRO="$(usex cairo 1 0)" - DEBUG="$(usex debug 1 0)" - XML_DEBUG="$(usex debug 1 0)" - DEMO="$(usex doc 1 0)" - SAMPLE_INPUT_PLUGINS="$(usex doc 1 0)" - "CUSTOM_LDFLAGS=${LDFLAGS}" - "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)" - ) - escons "${MYSCONS[@]}" configure -} - -src_compile() { - escons "${MYSCONS[@]}" -} - -src_install() { - escons "${MYSCONS[@]}" DESTDIR="${D}" install - - dodoc AUTHORS.md README.md CHANGELOG.md -} - -pkg_postinst() { - elog "" - elog "See the home page or wiki (https://github.com/mapnik/mapnik/wiki) for more info" - elog "or the installed examples for the default mapnik ogcserver config." - elog "" -} diff --git a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild deleted file mode 100644 index 2e1d27bf19dd..000000000000 --- a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils scons-utils toolchain-funcs - -DESCRIPTION="A Free Toolkit for developing mapping applications" -HOMEPAGE="http://www.mapnik.org/" -SRC_URI="https://github.com/mapnik/mapnik/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cairo debug doc gdal postgres sqlite" - -RDEPEND=" - >=dev-libs/boost-1.48:=[threads] - dev-libs/icu:= - sys-libs/zlib - media-libs/freetype - media-libs/harfbuzz - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/tiff:0= - virtual/jpeg:0= - media-libs/libwebp:= - sci-libs/proj - media-fonts/dejavu - x11-libs/agg[truetype] - cairo? ( - x11-libs/cairo - dev-cpp/cairomm - ) - postgres? ( >=dev-db/postgresql-8.3:* ) - gdal? ( sci-libs/gdal ) - sqlite? ( dev-db/sqlite:3 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-configure-only-once.patch" - "${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch" - "${FILESDIR}/${P}-harbuzz_sharper-upstream.patch" # upstream patches ported from - "${FILESDIR}/${P}-unicode-upstream.patch" # https://github.com/mapnik/mapnik/commit/9e58c890430db6f0b6f1f7a1690877c9d913d92a -) - -src_prepare() { - default - - # do not version epidoc data - sed -i \ - -e 's:-`mapnik-config --version`::g' \ - utils/epydoc_config/build_epydoc.sh || die - - # force user flags, optimization level - sed -i -e "s:\-O%s:%s:" \ - -i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \ - SConstruct || die -} - -src_configure() { - local PLUGINS=shape,csv,raster,geojson - use gdal && PLUGINS+=,gdal,ogr - use postgres && PLUGINS+=,postgis - use sqlite && PLUGINS+=,sqlite - - MYSCONS=( - "CC=$(tc-getCC)" - "CXX=$(tc-getCXX)" - "INPUT_PLUGINS=${PLUGINS}" - "PREFIX=/usr" - "DESTDIR=${D}" - "XMLPARSER=libxml2" - "LINKING=shared" - "RUNTIME_LINK=shared" - "PROJ_INCLUDES=/usr/include" - "PROJ_LIBS=/usr/$(get_libdir)" - "LIBDIR_SCHEMA=$(get_libdir)" - "SYSTEM_FONTS=/usr/share/fonts" - CAIRO="$(usex cairo 1 0)" - DEBUG="$(usex debug 1 0)" - XML_DEBUG="$(usex debug 1 0)" - DEMO="$(usex doc 1 0)" - SAMPLE_INPUT_PLUGINS="$(usex doc 1 0)" - "CUSTOM_LDFLAGS=${LDFLAGS}" - "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)" - ) - escons "${MYSCONS[@]}" configure -} - -src_compile() { - escons "${MYSCONS[@]}" -} - -src_install() { - escons "${MYSCONS[@]}" DESTDIR="${D}" install - - dodoc AUTHORS.md README.md CHANGELOG.md -} - -pkg_postinst() { - elog "" - elog "See the home page or wiki (https://github.com/mapnik/mapnik/wiki) for more info" - elog "or the installed examples for the default mapnik ogcserver config." - elog "" -} diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml deleted file mode 100644 index 7f8d2fd981b3..000000000000 --- a/sci-geosciences/mapnik/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> - </maintainer> - <longdescription>Mapnik is a toolkit for developing both web and desktop - mapping applications. The core libraries are written in C++, with - optional Python bindings. - </longdescription> - <use> - <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag> - <flag name="osmfonts">Enable openstreetmaps font styles</flag> - </use> - <upstream> - <remote-id type="github">downloads/mapnik</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest index d7bd15128464..700f349ae72a 100644 --- a/sci-geosciences/osm2pgsql/Manifest +++ b/sci-geosciences/osm2pgsql/Manifest @@ -1,4 +1,6 @@ DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372 +DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3 EBUILD osm2pgsql-0.96.0.ebuild 929 BLAKE2B 8e6439ecb63014d35000663c76b622d08e196ed81331c715122e6f512347e136d0157491d568baa693755f4d335b23c5782a7ef50d9e43487e5b12e88ff86949 SHA512 efdadf44119fedd15a4b15108e197edd16ffdff5f1b76e64a75091c4a8df3ac06a7bb21f3721391e15a0518ae96424b0ea7c17e410af1b7e642438153469cbfa -EBUILD osm2pgsql-99999999.ebuild 913 BLAKE2B a41beca987915d3502321a499e7eff09fe69421e5d0c767c5f3c08a415739123b6df1b1c27ed12861556a684f5063df041a21f074b3fb44dc8cab66c6ed57712 SHA512 7cfb4ae3e48254f7c02563f6430ee8b8886d0b266f65762a12c3b4b6fb85979262ca0c71359355d1fac077e824ac3ff0de400a407e9032a9ef077a5e07cc04de +EBUILD osm2pgsql-1.3.0.ebuild 863 BLAKE2B b33b9ab82fab951b7584d01fec06b6e9ea7fd76d870583230845ad206e2730b5b54e5ee19edf049f6b85f88155c46d7a31c93ad58452101786b7122a2c568c96 SHA512 be03711847b4fd0f177c669533c11be56e91885ee4ff0b4ef8b38bca32a1f97f3ff35e41a93b41eec518b4b179e60cc95a88fc53642600d9ed4fd3bc66fb3614 +EBUILD osm2pgsql-99999999.ebuild 845 BLAKE2B 4208470eb96274450cad9d352f973f839fbff025720ba0634c9b370517fc5e7d140d07ec4f941241f22edbe60e1edbf1df6867cb33223dbbe7f82812c2d04d3c SHA512 f8cc802e5a8ab8ab2ad950549182f13345d9fb6b62a6975be00f38f5b68a5fd085b5eb82025590dfc041a6c6b22d227e0d110b7144308d500ff58ea0b055e86a MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6 diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild new file mode 100644 index 000000000000..ded439c9e692 --- /dev/null +++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" +HOMEPAGE="https://osm2pgsql.org/" +SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+lua luajit" + +COMMON_DEPEND=" + app-arch/bzip2 + dev-db/postgresql:= + dev-libs/expat + sci-libs/proj:= + sys-libs/zlib + lua? ( dev-lang/lua:= ) + luajit? ( dev-lang/luajit:= ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost +" +RDEPEND="${COMMON_DEPEND} + dev-db/postgis +" + +# Tries to connect to local postgres server and other shenanigans +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + -DWITH_LUA=$(usex lua) + -DWITH_LUAJIT=$(usex luajit) + -DBUILD_TESTS=OFF + ) + cmake_src_configure +} diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild index 78b4534c993e..87037136ac87 100644 --- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild +++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild @@ -3,19 +3,18 @@ EAPI=7 -inherit cmake flag-o-matic git-r3 +inherit cmake git-r3 EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git" DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" -HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql - https://github.com/openstreetmap/osm2pgsql" +HOMEPAGE="https://osm2pgsql.org/" SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="+lua" +IUSE="+lua luajit" COMMON_DEPEND=" app-arch/bzip2 @@ -24,6 +23,7 @@ COMMON_DEPEND=" sci-libs/proj:= sys-libs/zlib lua? ( dev-lang/lua:= ) + luajit? ( dev-lang/luajit:= ) " DEPEND="${COMMON_DEPEND} dev-libs/boost @@ -36,9 +36,9 @@ RDEPEND="${COMMON_DEPEND} RESTRICT="test" src_configure() { - append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 local mycmakeargs=( -DWITH_LUA=$(usex lua) + -DWITH_LUAJIT=$(usex luajit) -DBUILD_TESTS=OFF ) cmake_src_configure diff --git a/sci-geosciences/osmctools/Manifest b/sci-geosciences/osmctools/Manifest new file mode 100644 index 000000000000..3a25892a69eb --- /dev/null +++ b/sci-geosciences/osmctools/Manifest @@ -0,0 +1,3 @@ +DIST osmctools-0.9.tar.gz 181447 BLAKE2B 98b567219f712f282c37db6488863a3ae28c537cfdc5198f7457121a1e95a5edfb3fcc72f297a792485510a5fbb4d4d64be927b647d899f2c09648fbeb4419dc SHA512 6e51646e9291b53ce109f579c555c1eb9e6853452c81caebd530aa1be56aa3d313331a3544375f187c9d26888e4a330774f2acd6bdbb3baadf1a2db330430940 +EBUILD osmctools-0.9.ebuild 468 BLAKE2B f4f394893f3306b263e8a9f1951a2e15e5ec4a2b554a9dd75dbb713708ca4ac1be0e8c1c4c712fe53c523b52f7dcf8175c072203d5323ed925a5f7db165b6cf6 SHA512 9564c552a5321b58ee1302d06c41836793fb0b35393a24eef6f5df1767428a6c4c967465359f45d3ccf5ecd2ac7d121a7fbdfa566941429c37fa14a20fdb6d18 +MISC metadata.xml 585 BLAKE2B 5554d50287b90541f501c18f9924aa8f3480c14e1c9b0bb531a0117c8dd4bc0d44309301716ae4731b0ee5bfbebd98e02c8b802af513fe655a86aae7b1287fe1 SHA512 7fc982c34155acf608152f6e88d7ba4900786d648737fd6d1389c14bf19e7c121410269780941c7e0e9bc6159c132f82e506f6b08a59659e217188f3127cf290 diff --git a/sci-geosciences/osmctools/metadata.xml b/sci-geosciences/osmctools/metadata.xml new file mode 100644 index 000000000000..9016058737bf --- /dev/null +++ b/sci-geosciences/osmctools/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + Fast OpenStreetMap data tools: + * osmconvert - reads and converts OSM data to the selected output file format + * osmfilter - filters OSM data + * osmupdate - cares about updating an .osm, .o5m or .pbf file + </longdescription> + <upstream> + <remote-id type="gitlab">osm-c-tools/osmctools</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/osmctools/osmctools-0.9.ebuild b/sci-geosciences/osmctools/osmctools-0.9.ebuild new file mode 100644 index 000000000000..85657d0e14dc --- /dev/null +++ b/sci-geosciences/osmctools/osmctools-0.9.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="A few really fast tools to convert, filter and update OSM data files" +HOMEPAGE="https://gitlab.com/osm-c-tools" +SRC_URI="https://gitlab.com/osm-c-tools/${PN}/-/archive/${PV}/${P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="sys-libs/zlib" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 85558ee0e426..5a3e569f77f6 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,10 +1,13 @@ -AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d +AUX qgis-3.16.0-cmake-lib-suffix.patch 507 BLAKE2B 0a8943fe06f4065d5c0b1cf7797ecedb9fed40616121cbfd9f0c97568dd7da0b7c3e6a526b9408b6268b20988fe7a216d94cc394c01a693fcac6b321f7c7ca01 SHA512 5014fb01e7caa56f5fcb8a7f6b81e1f99acac50e7edff524071808f2b145f87dd440ce8c4897b7c781cb8e30c5ee3a873a6d977c6ecd65a54dc3157de8b0bfd1 +AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aacdfc28095f3657839dec0c084544d44405857a2cf1f644c8a47ac271cf51953f861cde285f37e30c490623fbbf96f7470 SHA512 4d794cdc730c55d59163bce7d1c23cab7ab3c384e09dccfe3b541d12ef365a180035fd51d998128c59c493b6039fff13dafe392c5935bbdedb39c22c05748a5c +AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36 +AUX qgis-3.16.1-find-qt5linguisttools.patch 923 BLAKE2B 2753e58338432736be05e6ac64a46638d417db2145f084a97b8c3371752ecb8d639df6ec0dd519533ec39444f098cf43716a8f1b4c516681fe2be34f73affef3 SHA512 b42de8f7c23fb0010e77ae873fb88304b3f70506317203d0aee170a7340ef9244ea0c4e39cd850ef57f2324e0c125a7c6c77f84e3835e5f59f2bdcb3f6a78612 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f -DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666 -DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275 +DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10 +DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d -EBUILD qgis-3.10.7.ebuild 5445 BLAKE2B f706ee24d324b05712d761b4bf2cf363bb0678d900b114f6b879908386eeda6da458df6c86d668f13bfb4208432b40b14e952fdae4d61df0a1de00e63fa8f3e4 SHA512 98d6a84452b8dcb44d35e2c87f0b9a00b29cae9630437b8320ecee06de8e14e0ad59008dfeb3f6b65c86bae0a461c157070a7a439cb8e44d0f0938a3e36de7e1 -EBUILD qgis-3.10.9.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180 -EBUILD qgis-9999.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180 +EBUILD qgis-3.16.0-r1.ebuild 5355 BLAKE2B b6a9239578ab1f6363dfdd78ac5141a0890a70902bd4ac76f58311a8f57fed841bee5f85368ec620902e17e88cd46dc734d49b722db9522c81de46329c81ccf0 SHA512 c11682d7c7555ba9078344aa3d9cf0624f173dcc151395ae2ae9c765d4baebedbe90d15bcecde01bd48a80d74a4e3609f33dd28bf572b097e5f317ad220cc2de +EBUILD qgis-3.16.1.ebuild 5399 BLAKE2B 1a5e4ce95087ac6642dce7a90820485aa3c70339a63b3630c7bb6c9d90afff7f2d2637cfb5e5af32c99d95c7fc7c193b9d6c5cd672f91f7349c1ecca0fc7c5f0 SHA512 1da717908534b7cf47c04f4fbbdd848731b35ee1320d7a5419f3597bd0169b4f7d03155917bb77d5c69868cb1d0024b45baa0b0657fcfff269ee33de90f2315c +EBUILD qgis-9999.ebuild 5291 BLAKE2B 8efe5c7bef0d5136907571d17737b8a721fc12c7cbcd6328fe44d9232b0f25c3cc89670f0fd55e9b620803bb82692466d9e2b230bdcdf0a0dd1d6cce6c1638c1 SHA512 c721f235aeabb56cb4b5c03d5a35f269cd949665443ac0633f59fac7c29f44acb744cbc37855a700c857c7e1dcc62876283d2c2c23bb1f19cb4f959cbec9f675 MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch index 472b8aa466ce..1edba1f0e747 100644 --- a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch +++ b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch @@ -4,7 +4,7 @@ diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake @@ -36,7 +36,7 @@ ELSE(CMAKE_HOST_WIN32) # TODO osx - SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") + SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh") - SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib") + SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") ENDIF(CMAKE_HOST_WIN32) diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch new file mode 100644 index 000000000000..9a57d45984e2 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch @@ -0,0 +1,26 @@ +From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 20 Nov 2020 20:41:36 +0100 +Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61b4c863d0..e7d0bdc8d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -750,7 +750,7 @@ if (WITH_CORE) + set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis) + set (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins) + set (DEFAULT_INCLUDE_SUBDIR include/qgis) +- set (DEFAULT_QML_SUBDIR qml) ++ set (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml) + + set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server) + endif() +-- +2.29.2 + diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch new file mode 100644 index 000000000000..b1098175647c --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch @@ -0,0 +1,32 @@ +From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 20 Nov 2020 20:41:06 +0100 +Subject: [PATCH] cmake: Use FeatureSummary + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f581b2c889..61b4c863d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,6 +111,8 @@ if (FORCE_STATIC_PROVIDERS) + set (HAVE_STATIC_PROVIDERS TRUE) + endif() + ++include(FeatureSummary) ++ + # in generated makefiles use relative paths so the project dir is moveable + # Note commented out since it cause problems but it would be nice to resolve these and enable + # +@@ -1035,3 +1037,5 @@ endif() + if (UNIX AND NOT APPLE) + add_subdirectory(linux) + endif() ++ ++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +2.29.2 + diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch new file mode 100644 index 000000000000..01f602694395 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch @@ -0,0 +1,27 @@ +From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 23 Nov 2020 22:04:50 +0100 +Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location + +Correctly find the Qt5 module that provides the path to Qt5-based lrelease. +Available since >= Qt-5.3.1 which is well below the current minimum for QGIS. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + i18n/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt +index a836e5cae5..7d7f79da89 100644 +--- a/i18n/CMakeLists.txt ++++ b/i18n/CMakeLists.txt +@@ -1,4 +1,5 @@ +-find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease) ++find_package(Qt5LinguistTools REQUIRED) ++set(QT_LRELEASE_EXECUTABLE Qt5::lrelease) + + macro(ADD_TRANSLATION_FILES _sources ) + foreach (_current_FILE ${ARGN}) +-- +2.29.2 + diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild index 65bdc947394e..d952288f81f8 100644 --- a/sci-geosciences/qgis/qgis-3.10.7.ebuild +++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild @@ -3,9 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="sqlite" -QTMIN="5.9.4" if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" @@ -18,46 +17,48 @@ fi inherit cmake desktop python-single-r1 qmake-utils xdg DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" +HOMEPAGE="https://www.qgis.org/en/site/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" BDEPEND="${PYTHON_DEPS} - >=dev-qt/linguist-tools-${QTMIN}:5 + dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex " COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] + >=app-crypt/qca-2.3.0:2[ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= - dev-libs/qtkeychain[qt5(+)] - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtpositioning-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtserialport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 + dev-libs/protobuf:= + dev-libs/qtkeychain:= + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( >=dev-qt/qt3d-${QTMIN}:5 ) + sys-libs/zlib + >=x11-libs/qscintilla-2.10.3:= + >=x11-libs/qwt-6.1.3-r2:6=[svg] + 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) @@ -68,7 +69,7 @@ COMMON_DEPEND=" dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} @@ -78,11 +79,11 @@ COMMON_DEPEND=" dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] dev-python/owslib[${PYTHON_MULTI_USEDEP}] dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}] dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] dev-python/pytz[${PYTHON_MULTI_USEDEP}] dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}] dev-python/requests[${PYTHON_MULTI_USEDEP}] dev-python/sip:=[${PYTHON_MULTI_USEDEP}] dev-python/six[${PYTHON_MULTI_USEDEP}] @@ -90,11 +91,10 @@ COMMON_DEPEND=" postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) ') ) - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) + qml? ( dev-qt/qtdeclarative:5 ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QTMIN}:5 + dev-qt/qttest:5 " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel @@ -105,7 +105,7 @@ RESTRICT="test" PATCHES=( # git master - "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch" + "${FILESDIR}/${P}-cmake-lib-suffix.patch" # TODO upstream "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" @@ -117,6 +117,8 @@ pkg_setup() { src_prepare() { cmake_src_prepare + sed -e "/QtWebKit.*.py/d" \ + -i python/PyQt/CMakeLists.txt || die } src_configure() { @@ -147,7 +149,7 @@ src_configure() { -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=$(usex webkit) + -DWITH_QTWEBKIT=OFF ) if use grass; then @@ -156,7 +158,8 @@ src_configure() { ) fi - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || + mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 # bugs 612956, 648726 addpredict /dev/dri/renderD128 diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild index 5009332eb58e..2bc3ef993a96 100644 --- a/sci-geosciences/qgis/qgis-3.10.9.ebuild +++ b/sci-geosciences/qgis/qgis-3.16.1.ebuild @@ -3,9 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="sqlite" -QTMIN="5.9.4" if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" @@ -18,46 +17,48 @@ fi inherit cmake desktop python-single-r1 qmake-utils xdg DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" +HOMEPAGE="https://www.qgis.org/en/site/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" BDEPEND="${PYTHON_DEPS} - >=dev-qt/linguist-tools-${QTMIN}:5 + dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex " COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] + >=app-crypt/qca-2.3.0:2[ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= - dev-libs/qtkeychain[qt5(+)] - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtpositioning-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtserialport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 + dev-libs/protobuf:= + dev-libs/qtkeychain:= + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( >=dev-qt/qt3d-${QTMIN}:5 ) + sys-libs/zlib + >=x11-libs/qscintilla-2.10.3:= + >=x11-libs/qwt-6.1.3-r2:6=[svg] + 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) @@ -68,7 +69,7 @@ COMMON_DEPEND=" dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} @@ -78,11 +79,11 @@ COMMON_DEPEND=" dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] dev-python/owslib[${PYTHON_MULTI_USEDEP}] dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}] dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] dev-python/pytz[${PYTHON_MULTI_USEDEP}] dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}] dev-python/requests[${PYTHON_MULTI_USEDEP}] dev-python/sip:=[${PYTHON_MULTI_USEDEP}] dev-python/six[${PYTHON_MULTI_USEDEP}] @@ -90,11 +91,10 @@ COMMON_DEPEND=" postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) ') ) - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) + qml? ( dev-qt/qtdeclarative:5 ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QTMIN}:5 + dev-qt/qttest:5 " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel @@ -105,10 +105,11 @@ RESTRICT="test" PATCHES=( # git master - "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch" + "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch" # TODO upstream - "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" - "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" + "${FILESDIR}/${P}-featuresummary.patch" + "${FILESDIR}/${P}-default-qmldir.patch" + "${FILESDIR}/${P}-find-qt5linguisttools.patch" ) pkg_setup() { @@ -117,6 +118,8 @@ pkg_setup() { src_prepare() { cmake_src_prepare + sed -e "/QtWebKit.*.py/d" \ + -i python/PyQt/CMakeLists.txt || die } src_configure() { @@ -147,7 +150,7 @@ src_configure() { -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=$(usex webkit) + -DWITH_QTWEBKIT=OFF ) if use grass; then @@ -156,7 +159,8 @@ src_configure() { ) fi - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || + mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 # bugs 612956, 648726 addpredict /dev/dri/renderD128 diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 5009332eb58e..e895dc655819 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -3,9 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="sqlite" -QTMIN="5.9.4" if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" @@ -18,46 +17,48 @@ fi inherit cmake desktop python-single-r1 qmake-utils xdg DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" +HOMEPAGE="https://www.qgis.org/en/site/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" BDEPEND="${PYTHON_DEPS} - >=dev-qt/linguist-tools-${QTMIN}:5 + dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex " COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] + >=app-crypt/qca-2.3.0:2[ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= - dev-libs/qtkeychain[qt5(+)] - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtpositioning-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtserialport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 + dev-libs/protobuf:= + dev-libs/qtkeychain:= + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( >=dev-qt/qt3d-${QTMIN}:5 ) + sys-libs/zlib + >=x11-libs/qscintilla-2.10.3:= + >=x11-libs/qwt-6.1.3-r2:6=[svg] + 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) @@ -68,7 +69,7 @@ COMMON_DEPEND=" dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} @@ -78,11 +79,11 @@ COMMON_DEPEND=" dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] dev-python/owslib[${PYTHON_MULTI_USEDEP}] dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}] dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] dev-python/pytz[${PYTHON_MULTI_USEDEP}] dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}] dev-python/requests[${PYTHON_MULTI_USEDEP}] dev-python/sip:=[${PYTHON_MULTI_USEDEP}] dev-python/six[${PYTHON_MULTI_USEDEP}] @@ -90,11 +91,10 @@ COMMON_DEPEND=" postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) ') ) - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) + qml? ( dev-qt/qtdeclarative:5 ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QTMIN}:5 + dev-qt/qttest:5 " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel @@ -105,10 +105,10 @@ RESTRICT="test" PATCHES=( # git master - "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch" + "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch" # TODO upstream - "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" - "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" + "${FILESDIR}/${PN}-3.16.1-featuresummary.patch" + "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch" ) pkg_setup() { @@ -117,6 +117,8 @@ pkg_setup() { src_prepare() { cmake_src_prepare + sed -e "/QtWebKit.*.py/d" \ + -i python/PyQt/CMakeLists.txt || die } src_configure() { @@ -147,7 +149,7 @@ src_configure() { -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=$(usex webkit) + -DWITH_QTWEBKIT=OFF ) if use grass; then diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest index c145b90138a0..2e07785ad9f6 100644 --- a/sci-geosciences/viking/Manifest +++ b/sci-geosciences/viking/Manifest @@ -5,4 +5,4 @@ DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9d EBUILD viking-1.6.2-r2.ebuild 1756 BLAKE2B 5d914b4f1ab4d07fba05485d77e6a5802a4c59d5110b49a0c7914367a4684d9a64f8bbdc164bbcbb961b5372eff36fe9ebd58fac4d6ac4567031d12820c7f1ea SHA512 b2672f59cc289c0554989adec8d20eab69b81c27305a9a36c7227f4393afac4b99f03549ae122a59aa497c5ad26f0760df4b85015ad2053b4d120b977e84d438 EBUILD viking-1.7-r1.ebuild 1939 BLAKE2B af65d6185272c5a71256e8928de8c4dc06c2da8a930ecdb08b89e8016b53073afd29f0e90786c76d2802ddc7d96e4dfdadcb789df88bac2f3bee56b88c3c1739 SHA512 18a4ffdafe72f226e8538e9a1a5214839d35881e6f86453f2faf73217c1ecf48c6b5a5e219abf4126b8df93bb70c7b0be2e69ec647b44a9f9b52621262d2de02 EBUILD viking-1.7.ebuild 1922 BLAKE2B 9c9bc4fdb8ede308da5d6f149e8b25916a167c27b9a1fe17b1dcad4aeb10a03ee1f75a02031aae28e19e028c6260ffe993ab74a6bfc9b6b1281e4399a1c3ef42 SHA512 157328f298a3e3fcef1e7cc1dba866d2fadf75694f046f20bf2d7368fbc327436fe2dc0e13e1fbae852db50813777953ef59cbfb30ef05f0dc54e2a8d538914d -MISC metadata.xml 934 BLAKE2B 7f6af7f644e184f8595aa373c4599c55faa6a2e426a64cad0a3932b047a0d842d12f984f6633f34a31114da32cfbcf5cafda739a8f6fc2599f61f63e1e98b5ff SHA512 23e71b45b9d974af69029358c24e47bbb01228dda6ad32ca1453617879d776cc8b212d88728c694a46b46634dc5f77f52b050349a1287249e483e7f4cd5b1b35 +MISC metadata.xml 907 BLAKE2B 10a21eba422ae7af3ffe08730b31f9304352b3a286b9f91b1e96e202fc5d631d37847ea8ae864b7476d39a705fa82dd90958134915f4572adfbc2d5f359cb0d2 SHA512 5ccd7d0323e266977a06e74c9896e211b903d40915631771956cddf8176ad01c5e4b4df7b8f5494c78ae92027cb9314d354254cc671cb498238059d6465d96b7 diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml index 1e7626ccd503..12c39a7e155e 100644 --- a/sci-geosciences/viking/metadata.xml +++ b/sci-geosciences/viking/metadata.xml @@ -16,7 +16,7 @@ Use <pkg>media-libs/libexif</pkg> for EXIF support </flag> <flag name="mapnik"> - Enable a layer based on <pkg>sci-geosciences/mapnik</pkg> + Enable a layer based on mapnik </flag> <flag name="oauth"> Enable OAuth authentication for OSM |