[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/

2021-02-23 Thread Andreas Sturmlechner 
commit: 35c6154f29bf195c123fa5918658bd79be1b38c0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 19:50:55 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c6154f

sci-geosciences/qmapshack: Support build with >=dev-libs/quazip-1.0

Closes: https://bugs.gentoo.org/770877
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qmapshack-1.15.2-no-hacks-kthxbye.patch  | 28 +++
 .../qmapshack/qmapshack-1.15.2-r2.ebuild   | 56 ++
 2 files changed, 84 insertions(+)

diff --git 
a/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch 
b/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch
new file mode 100644
index 000..99a55d694fb
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt   2020-12-07 17:13:38.0 +0100
 b/CMakeLists.txt   2021-02-20 20:01:41.706789439 +0100
+@@ -18,25 +18,6 @@
+ endif()
+ 
+ 
###
+-# Do distribution dependent stuff
+-###
+-string(TIMESTAMP YEAR "%Y")
+-set(EXPIRE_YEAR "2021")
+-set(DEBIAN_RELEASE_INFO "/etc/debian_version")
+-
+-if(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR 
APPLE)
+-message( STATUS "Apply patches to fix build system on Debian")
+-execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindPROJ4.patch"
+-WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-OUTPUT_QUIET)
+-execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindQuaZip5.patch"
+-WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-OUTPUT_QUIET)
+-endif(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR 
APPLE)
+-
+-
+-
+-###
+ # Define project name and version tags
+ 
###
+ # this is not only the QMS version it will be the package version, too.

diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild 
b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild
new file mode 100644
index 000..b940212b752
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://github.com/Maproom/qmapshack/wiki;
+SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-libs/quazip:0=
+   dev-qt/designer:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5[widgets]
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsql:5
+   dev-qt/qtwebengine:5[widgets]
+   >=sci-geosciences/routino-3.1.1
+   sci-libs/alglib
+   sci-libs/gdal
+   >=sci-libs/proj-6.0.0:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}"/${PN}-V_${PV}
+
+PATCHES=( "${S}"/FindPROJ4.patch )
+
+src_prepare() {
+   cmake_src_prepare
+
+   # TODO: upstream
+   if has_version ">=dev-libs/quazip-1.0"; then
+   sed -e "/^find_package(QuaZip5/s/5  /-Qt5 CONFIG/" \
+   -i CMakeLists.txt || die
+
+   sed -e "s/\${QUAZIP_LIBRARIES}/QuaZip::QuaZip/" \
+   -i src/qmapshack/CMakeLists.txt || die
+   fi
+}
+
+src_install() {
+   docompress -x /usr/share/doc/${PF}/html
+   cmake_src_install
+   mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv 
Qt help failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/

2020-12-25 Thread Andreas Sturmlechner 
commit: b25193eca46c3cd588ff2abfa8c99a3e62d52341
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec 25 15:21:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 25 15:35:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25193ec

sci-geosciences/qmapshack: Drop 1.14.0, unbuildable with Qt 5.15

Bug: https://bugs.gentoo.org/761079
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qmapshack/Manifest |   1 -
 sci-geosciences/qmapshack/files/FindPROJ4.cmake| 152 -
 .../qmapshack/files/qmapshack-positioning.patch|   9 --
 .../qmapshack/files/qmapshack-qt-5.15.patch|  67 -
 sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild  |  38 --
 5 files changed, 267 deletions(-)

diff --git a/sci-geosciences/qmapshack/Manifest 
b/sci-geosciences/qmapshack/Manifest
index c0b96c104ce..3ddd56bffe9 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,2 +1 @@
-DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 
146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55
 SHA512 
675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
 DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B 
b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988
 SHA512 
c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a

diff --git a/sci-geosciences/qmapshack/files/FindPROJ4.cmake 
b/sci-geosciences/qmapshack/files/FindPROJ4.cmake
deleted file mode 100644
index 093deaa79ae..000
--- a/sci-geosciences/qmapshack/files/FindPROJ4.cmake
+++ /dev/null
@@ -1,152 +0,0 @@
-#.rst:
-# FindPROJ4
-# 
-#
-# Find the proj includes and library.
-#
-# IMPORTED Targets
-# 
-#
-# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``,
-# if Proj.4 has been found.
-#
-# Result Variables
-# 
-#
-# This module defines the following variables:
-#
-# ::
-#
-#   PROJ4_INCLUDE_DIRS   - where to find proj_api.h, etc.
-#   PROJ4_LIBRARIES  - List of libraries when using libproj.
-#   PROJ4_FOUND  - True if libproj found.
-#
-# ::
-#
-#   PROJ4_VERSION- The version of libproj found (x.y.z)
-#   PROJ4_VERSION_MAJOR  - The major version of libproj
-#   PROJ4_VERSION_MINOR  - The minor version of libproj
-#   PROJ4_VERSION_PATCH  - The patch version of libproj
-#   PROJ4_VERSION_TWEAK  - always 0
-#   PROJ4_VERSION_COUNT  - The number of version components, always 3
-#
-# Hints
-# ^
-#
-# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this
-# module where to look exclusively.
-
-#=
-# Copyright 2016 Kai Pastor
-#
-#
-# This file was derived from CMake 3.5's module FindZLIB.cmake
-# which has the following terms:
-#
-# Copyright 2001-2011 Kitware, Inc.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# * The names of Kitware, Inc., the Insight Consortium, or the names of
-#   any consortium members, or of any contributors, may not be used to
-#   endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=
-
-# Search PROJ4_ROOT exclusively if it is set.
-if(PROJ4_ROOT)
-  set(_PROJ4_SEARCH PATHS ${PROJ4_ROOT} NO_DEFAULT_PATH)
-else()
-

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/

2020-06-22 Thread Andrey Grozin 
commit: 2584225aa4c049215322e2919bbf8acfbaae3068
Author: Andrey Grozin  gentoo  org>
AuthorDate: Mon Jun 22 14:43:54 2020 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Mon Jun 22 14:43:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2584225a

sci-geosciences/qmapshack: bump to 1.15

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andrey Grozin  gentoo.org>

 sci-geosciences/qmapshack/Manifest |  1 +
 .../qmapshack/files/qmapshack-qt-5.15.patch| 67 ++
 sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild  | 45 +++
 3 files changed, 113 insertions(+)

diff --git a/sci-geosciences/qmapshack/Manifest 
b/sci-geosciences/qmapshack/Manifest
index 940fd018d39..610083c3bea 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,2 +1,3 @@
 DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 
146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55
 SHA512 
675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
 DIST qmapshack-1.14.1.tar.gz 12541988 BLAKE2B 
146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55
 SHA512 
675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
+DIST qmapshack-1.15.0.tar.gz 46097781 BLAKE2B 
16db9c59bd669e55dbb67af0411570963ff6a59f24c75d62421540fa1437cbc4dd837cf115b2649b3482e191ae11040b567f34babbf9ad46bb09114727ad4ae9
 SHA512 
92e2b40c37cccbb4848dab1afd872d3cb29b4a162d44d57a1042ea0d5139ffc976bc02407d327b6f5cd3e0d08dbd526661fcbc0e05602fda15f78fd9bbce52cb

diff --git a/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch 
b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
new file mode 100644
index 000..08d8946f69d
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
@@ -0,0 +1,67 @@
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp 
qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp  
2020-06-14 17:22:49.0 +0700
 qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp   2020-06-22 
17:41:58.776553045 +0700
+@@ -38,6 +38,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ IGisItem::key_t CGisItemWpt::keyUserFocus;
+ QMap CGisItemWpt::keywordLambdaMap;
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp 
qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp2020-06-14 
17:22:49.0 +0700
 qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp 2020-06-22 
17:45:43.431558615 +0700
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
+ QPen CDraw::penBorderGray(Qt::lightGray, 2);
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp 
qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp  2020-06-14 
17:22:49.0 +0700
 qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp   2020-06-22 
17:47:21.413561045 +0700
+@@ -33,6 +33,7 @@
+ #include "units/IUnit.h"
+ 
+ #include 
++#include 
+ 
+ #undef DEBUG_SHOW_SECT_DESC
+ #undef DEBUG_SHOW_TRE_DATA
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp 
qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp   
2020-06-14 17:22:49.0 +0700
 qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp2020-06-22 
17:43:31.338555340 +0700
+@@ -23,6 +23,7 @@
+ #include "mouse/IScrOpt.h"
+ 
+ #include 
++#include 
+ 
+ IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter 
*mouse)
+ : IMouse(gis, canvas, mouse)
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp 
qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp
+--- qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp 2020-06-14 
17:22:49.0 +0700
 qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp  2020-06-22 
17:49:14.789563856 +0700
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
+ QPen CDraw::penBorderGray(Qt::lightGray,2);
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp 
qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp
+--- qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp
2020-06-14 17:22:49.0 +0700
 qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp 2020-06-22 
17:50:08.109565178 +0700
+@@ -24,6 +24,8 @@
+ 
+ #include 
+ #include 
++#include 
++
+ using std::bind;
+ 
+

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/

2019-05-06 Thread Andrey Grozin 
commit: 097b001971d868419e74df096a0e6989e3e1b63e
Author: Andrey Grozin  gentoo  org>
AuthorDate: Mon May  6 16:25:51 2019 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Mon May  6 16:25:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097b0019

sci-geosciences/qmapshack: bump to 1.13.0

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andrey Grozin  gentoo.org>

 sci-geosciences/qmapshack/Manifest |   1 +
 sci-geosciences/qmapshack/files/FindPROJ4.cmake| 152 +
 .../qmapshack/files/qmapshack-positioning.patch|   9 ++
 sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild  |  49 +++
 4 files changed, 211 insertions(+)

diff --git a/sci-geosciences/qmapshack/Manifest 
b/sci-geosciences/qmapshack/Manifest
index f38aefce0f4..11b1647491a 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,3 +1,4 @@
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B 
af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7
 SHA512 
dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
 DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B 
e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9
 SHA512 
c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
 DIST qmapshack-1.12.3.tar.gz 12029443 BLAKE2B 
8d7f117c8379f7181ce68f79f460f59342cf654179c8b85839fe003e06167765e3e2292e14b4bc71c3ba1aeb388fcbb77faccdd57748335c1df8500f9e52ba41
 SHA512 
01a2b73f2f432a24b614c4a325e0b0a2aaf5b6ef75c5a7fbeb2be341adc7c46faa71cf7e9f4fdeb769d546b7a760be553a38ac6cc1c5c2c2d044edd37f550a85
+DIST qmapshack-1.13.0.tar.gz 12323773 BLAKE2B 
ea9cc15376546af442c6874e9321dfda268f523edb9908418baa4b3286339b4274f3c4694bebe036fb24ea3af82da1195d323c5e7484ca49039b9a526c29fa12
 SHA512 
cdc876a73d855573854691e3ef1d685499c9da381eb028e4a6e80dcd243df68caa66c92057fc1b896fce2be20e6d2ca43499b0e6827f804f27a0e8cc3749a100

diff --git a/sci-geosciences/qmapshack/files/FindPROJ4.cmake 
b/sci-geosciences/qmapshack/files/FindPROJ4.cmake
new file mode 100644
index 000..093deaa79ae
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/FindPROJ4.cmake
@@ -0,0 +1,152 @@
+#.rst:
+# FindPROJ4
+# 
+#
+# Find the proj includes and library.
+#
+# IMPORTED Targets
+# 
+#
+# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``,
+# if Proj.4 has been found.
+#
+# Result Variables
+# 
+#
+# This module defines the following variables:
+#
+# ::
+#
+#   PROJ4_INCLUDE_DIRS   - where to find proj_api.h, etc.
+#   PROJ4_LIBRARIES  - List of libraries when using libproj.
+#   PROJ4_FOUND  - True if libproj found.
+#
+# ::
+#
+#   PROJ4_VERSION- The version of libproj found (x.y.z)
+#   PROJ4_VERSION_MAJOR  - The major version of libproj
+#   PROJ4_VERSION_MINOR  - The minor version of libproj
+#   PROJ4_VERSION_PATCH  - The patch version of libproj
+#   PROJ4_VERSION_TWEAK  - always 0
+#   PROJ4_VERSION_COUNT  - The number of version components, always 3
+#
+# Hints
+# ^
+#
+# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this
+# module where to look exclusively.
+
+#=
+# Copyright 2016 Kai Pastor
+#
+#
+# This file was derived from CMake 3.5's module FindZLIB.cmake
+# which has the following terms:
+#
+# Copyright 2001-2011 Kitware, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# * The names of Kitware, Inc., the Insight Consortium, or the names of
+#   any consortium members, or of any contributors, may not be used to
+#   endorse or promote products derived from this software without
+#   specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS;

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/

2019-01-26 Thread Andreas Sturmlechner 
commit: 1b77e91f68286649ffbb78e2ddcb2f5a7b507081
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 26 23:54:35 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 26 23:56:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b77e91f

sci-geosciences/qmapshack: Drop 1.11.1-r1

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qmapshack/Manifest |  1 -
 .../qmapshack/files/qmapshack-1.11.1-qt-5.11.patch | 19 --
 .../qmapshack/qmapshack-1.11.1-r1.ebuild   | 43 --
 3 files changed, 63 deletions(-)

diff --git a/sci-geosciences/qmapshack/Manifest 
b/sci-geosciences/qmapshack/Manifest
index a102c407e48..142703fb548 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,3 +1,2 @@
-DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B 
fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede
 SHA512 
43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B 
af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7
 SHA512 
dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
 DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B 
e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9
 SHA512 
c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713

diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch 
b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
deleted file mode 100644
index 404f034176d..000
--- a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User kiozen
-# Date 1528899896 -7200
-# Node ID e9b47af61b0945acb74649bab30dec23ac42f375
-# Parent  f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f
-[Issue #344 ] Building latest version of QMapShack fails after updating QT 
from 5.10.1 to 5.11.0
-
-diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp 
b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
 a/src/qmapshack/helpers/CToolBarSetupDialog.cpp
-+++ b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
-@@ -20,6 +20,8 @@
- #include "helpers/CToolBarConfig.h"
- #include "helpers/CToolBarSetupDialog.h"
- 
-+#include 
-+
- bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
- {
- CDialogItem * dialogItem = dynamic_cast(item);

diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild 
b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
deleted file mode 100644
index b3f1c55aef8..000
--- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home;
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz;
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-   dev-qt/qtscript:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtdbus:5
-   dev-qt/qttest:5
-   dev-qt/designer:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtsql:5
-   dev-libs/quazip
-   >=sci-geosciences/routino-3.1.1
-   sci-libs/gdal
-   sci-libs/proj
-   sci-libs/alglib"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/

2018-09-15 Thread Andreas Sturmlechner 
commit: fe716fe2fdb13e48223d8038c83fcf9878a896f7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 15 13:27:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 15 13:42:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe716fe2

sci-geosciences/qmapshack: Fix build with Qt 5.11

Doing it myself then.

Closes: https://bugs.gentoo.org/665342
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../qmapshack/files/qmapshack-1.11.1-qt-5.11.patch| 19 +++
 sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild  |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch 
b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
new file mode 100644
index 000..404f034176d
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User kiozen
+# Date 1528899896 -7200
+# Node ID e9b47af61b0945acb74649bab30dec23ac42f375
+# Parent  f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f
+[Issue #344 ] Building latest version of QMapShack fails after updating QT 
from 5.10.1 to 5.11.0
+
+diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp 
b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
+--- a/src/qmapshack/helpers/CToolBarSetupDialog.cpp
 b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
+@@ -20,6 +20,8 @@
+ #include "helpers/CToolBarConfig.h"
+ #include "helpers/CToolBarSetupDialog.h"
+ 
++#include 
++
+ bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
+ {
+ CDialogItem * dialogItem = dynamic_cast(item);

diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild 
b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
index e49afba1831..a8ed47130b9 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
@@ -28,6 +28,8 @@ RDEPEND="dev-qt/qtwebkit:5
 DEPEND="${RDEPEND}
dev-qt/linguist-tools:5"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update