commit: 27ffb3f377260e57517da0055b5016ad71f5898b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 15 15:09:04 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 15 15:09:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ffb3f3
sci-geosciences/merkaartor: drop 0.18.4, 0.18.4_p20210410-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-geosciences/merkaartor/Manifest | 2 - .../files/merkaartor-0.18.4-qt-5.15.patch | 29 ------ .../merkaartor/merkaartor-0.18.4.ebuild | 97 ------------------ .../merkaartor-0.18.4_p20210410-r1.ebuild | 113 --------------------- 4 files changed, 241 deletions(-) diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest index 1e97f01ebf10..eb14ca0751f1 100644 --- a/sci-geosciences/merkaartor/Manifest +++ b/sci-geosciences/merkaartor/Manifest @@ -1,3 +1 @@ -DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c -DIST merkaartor-0.18.4_p20210410.tar.gz 6566072 BLAKE2B d2788552794e2778d6b68cc39ad04ec081ef88d0e3748af380774ee3ac98871bdaf1f26a04065bfb591b9245d740acec4fcfb4b781311409b49932014dfa86bb SHA512 3051280fd1ab6fa5b9e40e4c1aa1df137b60f3f4062daaa9301dce3697c51d7f4514bd01d7954f5c332849e268f6fcf6f23a2bc58b13645c5e29f9a12c9a3a34 DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch deleted file mode 100644 index e14cda8b5bd6..000000000000 --- a/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <ast...@gentoo.org> -Date: Sun, 14 Jun 2020 22:19:24 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) - -Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> ---- - src/Features/Feature.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/Features/Feature.h b/src/Features/Feature.h -index 52fd3044..f466a5a9 100644 ---- a/src/Features/Feature.h -+++ b/src/Features/Feature.h -@@ -8,8 +8,10 @@ class Feature; - #include "MapView.h" - #include "FeaturePainter.h" - --#include <QtCore/QString> - #include <QList> -+#include <QPainter> -+#include <QPainterPath> -+#include <QString> - - #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x)) - #define CAST_NODE(x) (dynamic_cast<Node*>(x)) --- -2.27.0 - diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild deleted file mode 100644 index 6f1f3aaf2e60..000000000000 --- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW" -inherit flag-o-matic plocale qmake-utils xdg-utils - -DESCRIPTION="Qt based map editor for the openstreetmap.org project" -HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"; -SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug exif gps libproxy webengine" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[X,qt5(+)] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sci-libs/gdal:= - sci-libs/proj:= - sys-libs/zlib - exif? ( media-gfx/exiv2:= ) - gps? ( >=sci-geosciences/gpsd-3.17-r2 ) - libproxy? ( net-libs/libproxy ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826 - "${FILESDIR}"/${P}-qt-5.15.patch # bug 727914 -) - -DOCS=( AUTHORS CHANGELOG ) - -src_prepare() { - default - - rm -r 3rdparty || die "Failed to remove bundled libs" - - my_rm_loc() { - sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die - rm "translations/${PN}_${1}.ts" || die - } - - if [[ -n "$(plocale_get_locales)" ]]; then - plocale_for_each_disabled_locale my_rm_loc - $(qt5_get_bindir)/lrelease src/src.pro || die - fi - - # build system expects to be building from git - sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die -} - -src_configure() { - append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H - - # TRANSDIR_SYSTEM is for bug #385671 - eqmake5 \ - PREFIX="${ED}/usr" \ - LIBDIR="${ED}/usr/$(get_libdir)" \ - PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \ - SHARE_DIR_PATH="/usr/share/${PN}" \ - TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \ - TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ - SYSTEM_QTSA=1 \ - RELEASE=1 \ - NODEBUG=$(usex debug 0 1) \ - GEOIMAGE=$(usex exif 1 0) \ - GPSDLIB=$(usex gps 1 0) \ - LIBPROXY=$(usex libproxy 1 0) \ - USEWEBENGINE=$(usex webengine 1 0) \ - Merkaartor.pro -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild deleted file mode 100644 index 4b22730517fc..000000000000 --- a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW" -inherit flag-o-matic plocale qmake-utils xdg-utils - -if [[ ${PV} != *9999 ]] ; then - # Needed for new Proj API support - # bug #685234 - COMMIT="7ae76834bcba9934f38d85058f7372fc016c1d1c" - SRC_URI="https://github.com/openstreetmap/merkaartor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - #SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - - KEYWORDS="~amd64 ~x86" -else - EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"; - inherit git-r3 -fi - -DESCRIPTION="Qt based map editor for the openstreetmap.org project" -HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug exif gps libproxy webengine" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[X,qt5(+)] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sci-libs/gdal:= - sci-libs/proj:= - sys-libs/zlib - exif? ( media-gfx/exiv2:= ) - gps? ( >=sci-geosciences/gpsd-3.17-r2:= ) - libproxy? ( net-libs/libproxy ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826 - -DOCS=( AUTHORS CHANGELOG ) - -src_prepare() { - default - - rm -r 3rdparty || die "Failed to remove bundled libs" - - my_rm_loc() { - sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die - rm "translations/${PN}_${1}.ts" || die - } - - if [[ -n "$(plocale_get_locales)" ]]; then - plocale_for_each_disabled_locale my_rm_loc - $(qt5_get_bindir)/lrelease src/src.pro || die - fi - - # build system expects to be building from git - if [[ ${PV} != *9999 ]] ; then - sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die - fi -} - -src_configure() { - if has_version "<sci-libs/proj-8.0.0" ; then - # bug #685234 - append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H - fi - - # TRANSDIR_SYSTEM is for bug #385671 - local myeqmakeargs=( - PREFIX="${ED}/usr" - LIBDIR="${ED}/usr/$(get_libdir)" - PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" - SHARE_DIR_PATH="/usr/share/${PN}" - TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" - TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" - SYSTEM_QTSA=1 - NODEBUG=$(usex debug 0 1) - GEOIMAGE=$(usex exif 1 0) - GPSDLIB=$(usex gps 1 0) - LIBPROXY=$(usex libproxy 1 0) - USEWEBENGINE=$(usex webengine 1 0) - ) - [[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 ) - - eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -}
