diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
| commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
| tree | ade7cb031f363fad64c77139dea7aa3d81908537 /sci-geosciences/qgis | |
| parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) | |
gentoo resync : 16.02.1018
Diffstat (limited to 'sci-geosciences/qgis')
| -rw-r--r-- | sci-geosciences/qgis/Manifest | 3 | ||||
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch | 26 | ||||
| -rw-r--r-- | sci-geosciences/qgis/qgis-9999.ebuild | 4 |
3 files changed, 2 insertions, 31 deletions
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index ed7de2d3956d..1b2d973d3f14 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,8 +1,7 @@ AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 -AUX qgis-3.0.0-featuresummary.patch 841 BLAKE2B d2571091339308aee60b506a79639eaaf1a450d6634b63a8e51da8a7104687d04c8389c0c4c3cd8e3c6a23174d9608d49216a1bcb3d95b527c2b6a2c14f85393 SHA512 22e705c48671eb30bf3e662c61fcf1b2939c11aaf4d1bb9be2a86aff42d8951402088a38c5ca6dbfdcbbfa828100faaf4f151212877057ed33b7dd49a9f5f5af AUX qgis-3.2.1-qtwebkit-optional.patch 978 BLAKE2B 31ed74dfc390bd132547a3934d5bfb906134efc5b1d56c885a1446a4bf828474a8262414c3cdd446286a7e266d09a0f775ba2087c1741053154ca55b7773274f SHA512 dc71b850f73a11781d89bc1f08c830fd13d2d5d912d746133d7748724933143dbaf7957fbcdd8f8009ad8648d4f528661cf62ebf2aff5d04cd5856ba1429e3d8 DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d EBUILD qgis-3.2.3.ebuild 6195 BLAKE2B 92beb6aef1915030ae047a9216d2593f2c9a5f0cace785b4ac95aaa38472b1cef8012474eac3f5a59cf2dadb1f93383e6fe0d9016af447404573ad285e40ee1a SHA512 a322aa327c5c2e6512e74597216edb6fef931cb5c2e0a85f28614bda0c5a96b4ba561e1ba2613dc875921a291f4d4dee33cb35ae51ee618b91b7969b777a0a9b -EBUILD qgis-9999.ebuild 6299 BLAKE2B f0e1b484879bfb2d2545694183f81afd9994eac66575d108c072d74f2ac3f5006c8c1cbb08d46fa4961123089bcb9edb5685255d04c2cd6598ac4282a2810af7 SHA512 ec18b18d2b791372df0a5e3d0d37d76d368a193f465aca05cf2636883f91e1050e7d99dad71d2755ef2f3c1b9fdd99badab9e3c8765c9a54e1492164a831e0aa +EBUILD qgis-9999.ebuild 6231 BLAKE2B aa18381dd71172108b6d5ffbcbe15019431e4f8ddd1527626390d02c2f14673a34d074ea79361897bd03d56e6d26c7c20a1b31ed2f1d383d47cbd7f41e38971a SHA512 cce02404b78ea718bad247db2cc4e3417c8af449bbdb9161eaacdebcbeb1f85c0d6e879799c8e5c38a0e8f95f330e7c5b83f2dabdf73ba0a5a4bfdec37c9909c MISC metadata.xml 1211 BLAKE2B 761852f48581c7cca9f9474d1e2e99c751ca2597726cbbb973c82c6292806e4908fcaa091ad4ad5b60f73cea831db2f94be9c7ae3627ad9bfbe0a7572638c929 SHA512 22aa2127957668f8017e20d08297ef222bb1f9fd0a420398ee191426de0b681fb90138bfa8117f67612001d64020455871db4b8a772653d9ee02d7777555e48b diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch deleted file mode 100644 index 8b841a39b50f..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 9 Apr 2017 20:21:28 +0200 -Subject: [PATCH 1/2] Use FeatureSummary - ---- - CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/CMakeLists.txt 2018-10-27 17:19:26.188192919 +0200 -+++ b/CMakeLists.txt 2018-10-27 17:19:13.915507445 +0200 -@@ -68,6 +68,8 @@ - endif(USE_CCACHE) - endif(NOT MSVC) - -+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 - # -@@ -935,3 +937,5 @@ - IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") - ADD_SUBDIRECTORY(linux) - ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ -+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index afbd37bc704c..9e1e9a34acbe 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -101,8 +101,6 @@ RESTRICT="test" PATCHES=( # git master "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.0.0-featuresummary.patch" ) pkg_setup() { |