commit: 35dd7df22871172b49cf5c1cc670fb6c1f06496d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 21:36:25 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 15 21:41:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35dd7df2
sci-geosciences/gpscorrelate: drop 1.6.1-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/gpscorrelate/Manifest | 1 -
.../files/gpscorrelate-1.6.1-exiv2-0.27.1.patch | 27 -----------
.../files/gpscorrelate-1.6.1-makefile.patch | 46 ------------------
.../gpscorrelate/gpscorrelate-1.6.1-r2.ebuild | 55 ----------------------
4 files changed, 129 deletions(-)
diff --git a/sci-geosciences/gpscorrelate/Manifest
b/sci-geosciences/gpscorrelate/Manifest
index e08700cfbada..6e8b6e1ff9e7 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,2 +1 @@
-DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B
664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965
SHA512
c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
DIST gpscorrelate-2.0.tar.gz 283797 BLAKE2B
8cee5b3c37fa758cbf665b9e7cfcc61d7ee73c4aebc0a660718812c598e9b362e76c746a8d6007080783a5d2c0b91eaf5d5c90f48072e6808d2409c6d2b5fbf4
SHA512
c4267b14b219118f2d56c064403a3a7bd74ef1d3af1e83bec6fe5b391bee80b3d69a0e52a834da9f615d9c54720ade28ea22ab8b6fac75c31c71fc5eb348f709
diff --git
a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
deleted file mode 100644
index 16921b72a1f6..000000000000
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c82aa1e76e3faeaec605df618c87223513efb3b9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <ast...@gentoo.org>
-Date: Sat, 29 Jun 2019 10:27:24 +0200
-Subject: [PATCH] Fix build with exiv2-0.27.1
-
-Use catchall header as recommended by exiv2 upstream.
----
- exif-gps.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/exif-gps.cpp b/exif-gps.cpp
-index fb9f2cb..61b4736 100644
---- a/exif-gps.cpp
-+++ b/exif-gps.cpp
-@@ -41,8 +41,7 @@
- #include <unistd.h>
-
-
--#include "exiv2/image.hpp"
--#include "exiv2/exif.hpp"
-+#include "exiv2/exiv2.hpp"
-
- #include "gpsstructure.h"
- #include "exif-gps.h"
---
-2.22.0
-
diff --git
a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
deleted file mode 100644
index 82bd63545dfc..000000000000
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -4,11 +4,15 @@
-
- COBJS = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
- GOBJS = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o
--CFLAGS = -Wall
--override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0)
-I/usr/include/exiv2
--OFLAGS = -Wall
--override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
--prefix = /usr/local
-+CFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
-+CXXFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
-+CLIBS = $(shell ${PKG_CONFIG} --libs libxml-2.0) -lm -lexiv2 -lstdc++
-+ifdef BUILD_GUI
-+CXXFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
-+CFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
-+CLIBS += $(shell ${PKG_CONFIG} --libs gtk+-2.0)
-+endif
-+prefix ?= /usr/local
- bindir = $(prefix)/bin
- datadir = $(prefix)/share
- mandir = $(datadir)/man
-@@ -18,16 +22,16 @@
- all: gpscorrelate gpscorrelate-gui gpscorrelate.1
-
- gpscorrelate: $(COBJS)
-- g++ $(OFLAGS) -o $@ $(COBJS)
-+ $(CXX) $(LDFLAGS) $(COBJS) $(CLIBS) -o $@
-
- gpscorrelate-gui: $(GOBJS)
-- g++ $(OFLAGS) -o $@ $(GOBJS)
-+ $(CXX) $(LDFLAGS) $(GOBJS) $(CLIBS) -o $@
-
--.c.o:
-- gcc $(CFLAGS) -c -o $*.o $<
-+%.o: %.c
-+ $(CC) -c -o $@ $< $(CFLAGS)
-
--.cpp.o:
-- g++ $(CFLAGS) -c -o $*.o $<
-+%.o: %.cpp $(DEPS)
-+ $(CXX) -c -o $@ $< $(CXXFLAGS)
-
- clean:
- rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
deleted file mode 100644
index 7f1c8c38fc5e..000000000000
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS
trace"
-HOMEPAGE="https://github.com/freefoote/gpscorrelate";
-SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc gtk"
-
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/libxml2:2
- media-gfx/exiv2:=
- gtk? ( x11-libs/gtk+:2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-makefile.patch"
- "${FILESDIR}/${P}-exiv2-0.27.1.patch"
-)
-
-src_compile() {
- tc-export CC CXX PKG_CONFIG
- local opts="gpscorrelate gpscorrelate.1"
- use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1"
- emake ${opts}
-}
-
-src_install() {
- dobin ${PN}
- if use gtk; then
- dobin ${PN}-gui
- doicon ${PN}-gui.svg
- domenu ${PN}.desktop
- fi
- if use doc; then
- rm doc/gpscorrelate-manpage.xml* || die
- local DOCS=()
- local HTML_DOCS=( doc/. )
- einstalldocs
- fi
- doman ${PN}.1
-}
