Version bump to latest. Punt older. This thing was by some magic accident stable on amd64 so un-stable it.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

9 files changed, 78 insertions, 305 deletions

diff --git a/sci-geosciences/gpscorrelate/ChangeLog b/sci-geosciences/gpscorrelate/ChangeLog
index ad94ea87f761..73d24832ecaa 100644
--- a/sci-geosciences/gpscorrelate/ChangeLog
+++ b/sci-geosciences/gpscorrelate/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-geosciences/gpscorrelate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/ChangeLog,v 1.8 2011/03/02 20:33:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/ChangeLog,v 1.9 2011/06/07 09:14:32 scarabeus Exp $
+
+*gpscorrelate-1.6.1 (07 Jun 2011)
+
+  07 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -gpscorrelate-1.5.6.ebuild, -files/gpscorrelate-1.5.6-cflags.patch,
+  -gpscorrelate-1.5.8.ebuild, -files/gpscorrelate-1.5.8-makefile.diff,
+  -gpscorrelate-1.6.0.ebuild, +gpscorrelate-1.6.1.ebuild,
+  +files/gpscorrelate-1.6.1-makefile.patch, -files/gpscorrelate.1:
+  Version bump to latest. Punt older. This thing was by some magic accident
+  stable on amd64 so un-stable it.
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> gpscorrelate-1.5.6.ebuild,
   gpscorrelate-1.5.8.ebuild, gpscorrelate-1.6.0.ebuild:
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index 262b3ec2c2e0..1b74d21cb66b 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gpscorrelate-1.5.6-cflags.patch 1084 RMD160 846ab3d69671b34e002d32b39f8e7fe661283ade SHA1 6b669d68312aad8c0b71b05348d1d8b753a12a71 SHA256 b85d45a5050e42ffb5ab1b8797c0299d588d74372a5558f2f0841a68e9e557f4
-AUX gpscorrelate-1.5.8-makefile.diff 1258 RMD160 13606e9233b29b761ee1b975154dcf627769cead SHA1 d93431d1272af23ccb45f367a8a11f45eeb36257 SHA256 da8a496af5b00b1f3053326c3c019d08483f81974352448ea112fe9c44281976
-AUX gpscorrelate.1 4025 RMD160 6dd52bf49a3c9919c83ea31cfcf47334faf84124 SHA1 ab94681d33b039df2ca42f96e2cfe9bb25392096 SHA256 a5e9128f7a415fcf0f73b0fe1f3763c77cfba5dcc0446cee5722abe0578e4128
-DIST gpscorrelate-1.5.6.tar.gz 130623 RMD160 82df0bd18e4cd391a2c74088044f4e95c8f85e46 SHA1 cf80ff0b54c3de8f58f6bda522b113ef5752a1c3 SHA256 cbd75278f8707b63c135af5ec83b4323b17313b23cdd0b29fcb1d786c50e1a2e
-DIST gpscorrelate-1.5.8.tar.gz 135021 RMD160 626f2d1df832fca7554739b6711245b7306d50e3 SHA1 603eb128f844c725a71b8eb295c677c9432490e3 SHA256 b91e8bbcb5539c2fb85a285df179d8b6a2f83f29b3489bc2b6d095e705f12f18
-DIST gpscorrelate-1.6.0.tar.gz 135296 RMD160 92186716eddcc8800e746d700416d1b87eb4d52d SHA1 2eba629dd433285742fbc6bb099ee6a0a1c2e9c4 SHA256 e0ea44bc2b234e6e6b48ed2a4dba56fe7532136fe4ee1849046eefd909110bc8
-EBUILD gpscorrelate-1.5.6.ebuild 1063 RMD160 8f8cf0124491c1a102f1e81ae0b92c4605f248f4 SHA1 1d40d0099755c1f09f6cff7c0eabb2d2e335f923 SHA256 d489e916783241ca13353a830180870539065d268355632434553ceea06c9b61
-EBUILD gpscorrelate-1.5.8.ebuild 1072 RMD160 e91258d2807cd71c576b7fc2854dfa3ee3bd3ca1 SHA1 36718a72a9cf1e9b8c7a1d2206adf6b5fa97fa94 SHA256 e2d163d59b464e2468b919e453c1e0d60fd057056cf5f5a4028750774973b6a5
-EBUILD gpscorrelate-1.6.0.ebuild 1100 RMD160 949ecb664021e769551d3d19e193a9e4645e06d8 SHA1 ff33a24790c0fa34a0cf955a02aa78a19b66c26e SHA256 0ab70a63af3de19eb89b7264d5b3a9767080a8a2511f67510cfff4009da3e4bf
-MISC ChangeLog 1566 RMD160 365eee0e69f0d62d8e44f2dab2bc6ac9023ba12b SHA1 19d72e2aaecf8e5526a6b5f962d76795f6bc0229 SHA256 b7e2e20aa6142b2463e95cc3d7cbe0e6fac95be51faad2bcadf0a523ed8ca1d7
+AUX gpscorrelate-1.6.1-makefile.patch 1432 RMD160 0084f8045fa37507b0c776fe4456df77728da60a SHA1 7bea6c89a4a7e0f8e469b0b056c85012bdd84f43 SHA256 0c2cac315c5de5bda932520df7ad4971d5e26348fdbbd61a0646b9a18b5d9d4d
+DIST gpscorrelate-1.6.1.tar.gz 154531 RMD160 a0642c882e347793488a3b279a9b4384ce8ae57a SHA1 f7f0b42018759ee42b31113a70e17764f21e0de4 SHA256 966285c0a6df5ac2cc63c1f9650e65c70e303cf11d08dc283357bcd745cb5201
+EBUILD gpscorrelate-1.6.1.ebuild 1028 RMD160 a485751c18ea491270693495ca223290a535ccc8 SHA1 20a0c66ec5005dd494dd3cce974400dbf598c587 SHA256 b799cfde192473482a7d443e92af8c257314becb1a114dcbb2b0e49c4217e68a
+MISC ChangeLog 2039 RMD160 0f6278d3474994a177ba8d87c5743cd62fd27f48 SHA1 dafc9bee8e3b912656591bd57b29816a7bc69620 SHA256 11a0236461c9ce14d069639a8cf5e87701e9970727364056763f0711b9f7da88
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1uqasACgkQgAnW8HDreRauFgCgkqritORP0pNP+QjKLB/gkbn4
-0EgAoLAiFfKXECJ0hou3h3hf3lp4tjtN
-=Qzul
+iEYEARECAAYFAk3t6/4ACgkQHB6c3gNBRYdXRwCeOqvk9Z052RH5xpwGuxwgq29N
+22sAoMOVtpMFHjbw1G4QNEkmrwyRAP/R
+=HVSm
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.6-cflags.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.6-cflags.patch
deleted file mode 100644
index f014bbff1f52..000000000000
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.6-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- gpscorrelate-1.5.6.orig/Makefile
-+++ gpscorrelate-1.5.6/Makefile
-@@ -4,22 +4,23 @@
- 
- 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 `pkg-config --cflags libxml-2.0 gtk+-2.0` -I/usr/include/exiv2
--OFLAGS   = -Wall `pkg-config --libs libxml-2.0 gtk+-2.0` -lm -lexiv2
-+PKG_CFLAGS   = -Wall `pkg-config --cflags libxml-2.0 gtk+-2.0` -I/usr/include/exiv2
-+PKG_OFLAGS   = -Wall `pkg-config --libs libxml-2.0` -lm -lexiv2
-+PKG_OFLAGS_GUI   = -Wall `pkg-config --libs libxml-2.0 gtk+-2.0` -lm -lexiv2
- 
- all:	gpscorrelate gpscorrelate-gui
- 
- gpscorrelate: $(COBJS)
--	gcc $(OFLAGS) -o $@ $(COBJS)
-+	gcc $(PKG_OFLAGS) ${CFLAGS} -o $@ $(COBJS)
- 
- gpscorrelate-gui: $(GOBJS)
--	gcc $(OFLAGS) -o $@ $(GOBJS)
-+	gcc $(PKG_OFLAGS_GUI) ${CFLAGS} -o $@ $(GOBJS)
- 
- .c.o:
--	gcc $(CFLAGS) -c -o $*.o $<
-+	gcc $(PKG_CFLAGS) ${CFLAGS} -c -o $*.o $<
- 
- .cpp.o:
--	g++ $(CFLAGS) -c -o $*.o $<
-+	g++ $(PKG_CFLAGS) ${CFLAGS} -c -o $*.o $<
- 
- clean:
- 	rm -f *.o gpscorrelate gpscorrelate-gui
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff
deleted file mode 100644
index a3952bd348d6..000000000000
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- gpscorrelate-1.5.8/Makefile	2008-10-31 12:50:39.000000000 +0100
-+++ gpscorrelate-1.5.8-1/Makefile	2008-12-01 19:19:12.000000000 +0100
-@@ -5,9 +5,10 @@
- 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
-+override CFLAGS += $(shell pkg-config --cflags libxml-2.0) $(shell pkg-config --cflags gtk+-2.0) -I/usr/include/exiv2
- OFLAGS   = -Wall
- override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
-+OFLAGS_GUI = $(shell pkg-config --libs gtk+-2.0)
- prefix   = /usr/local
- bindir   = $(prefix)/bin
- mandir   = $(prefix)/share/man
-@@ -17,16 +18,16 @@
- all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
- 
- gpscorrelate: $(COBJS)
--	gcc $(OFLAGS) -o $@ $(COBJS)
-+	$(CC) -o $@ $(COBJS) $(OFLAGS) $(LDFLAGS)
- 
- gpscorrelate-gui: $(GOBJS)
--	gcc $(OFLAGS) -o $@ $(GOBJS)
-+	$(CC) -o $@ $(GOBJS) $(OFLAGS) $(OFLAGS_GUI) $(LDFLAGS)
- 
- .c.o:
--	gcc $(CFLAGS) -c -o $*.o $<
-+	$(CC) $(CFLAGS) -c -o $*.o $<
- 
- .cpp.o:
--	g++ $(CFLAGS) -c -o $*.o $<
-+	$(CXX) $(CFLAGS) -c -o $*.o $<
- 
- clean:
- 	rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
new file mode 100644
index 000000000000..653d7dac6087
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
@@ -0,0 +1,40 @@
+diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile
+--- gpscorrelate-1.6.1.old/Makefile	2011-06-07 11:01:35.671339619 +0200
++++ gpscorrelate-1.6.1/Makefile	2011-06-07 11:09:31.705388371 +0200
+@@ -4,11 +4,10 @@
+ 
+ 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 gtk+-2.0) -I/usr/include/exiv2
++CXXFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
++CLIBS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
++prefix   ?= /usr/local
+ bindir   = $(prefix)/bin
+ datadir  = $(prefix)/share
+ mandir   = $(datadir)/man
+@@ -18,16 +17,16 @@
+ all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
+ 
+ gpscorrelate: $(COBJS)
+-	g++ $(OFLAGS) -o $@ $(COBJS)
++	$(CXX) $(LDFLAGS) -o $@ $(COBJS) $(CLIBS)
+ 
+ gpscorrelate-gui: $(GOBJS)
+-	g++ $(OFLAGS) -o $@ $(GOBJS)
++	$(CXX) $(LDFLAGS) -o $@ $(GOBJS) $(CLIBS)
+ 
+ .c.o:
+-	gcc $(CFLAGS) -c -o $*.o $<
++	$(CC) $(CFLAGS) -c -o $*.o $<
+ 
+ .cpp.o:
+-	g++ $(CFLAGS) -c -o $*.o $<
++	$(CXX) $(CXXFLAGS) -c -o $*.o $<
+ 
+ clean:
+ 	rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate.1 b/sci-geosciences/gpscorrelate/files/gpscorrelate.1
deleted file mode 100644
index ac7f2b29963d..000000000000
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate.1
+++ /dev/null
@@ -1,115 +0,0 @@
-.\"     Title: GPSCORRELATE
-.\"    Author: Stefano Zacchiroli
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
-.\"      Date: 08 Sep 2006
-.\"    Manual: 
-.\"    Source: 
-.\"
-.TH "GPSCORRELATE" "1" "08 Sep 2006" "" ""
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-gpscorrelate \- correlates digital photos with GPS data filling EXIF fields
-.SH "SYNOPSIS"
-.HP 13
-\fBgpscorrelate\fR [\fB\-g\ \fR\fB\fIfile.gpx\fR\fR] [\fIoption\fR...]
-.HP 17
-\fBgpscorrelate\-gui\fR
-.SH "DESCRIPTION"
-.PP
-This manual page documents briefly the
-\fBgpscorrelate\fR
-and
-\fBgpscorrelate\-gui\fR
-commands.
-.PP
-This manual page was written for the
-Debian(TM)
-distribution because the original programs do not have a manual page. Instead, they have documentation in HTML format; see below.
-.PP
-\fBgpscorrelate\fR
-is a program that acts on digital photo in JPEG format filling EXIF (Exchangeable Image File Format) fields related to GPS (Global Positioning System) information. Source for the GPS data is a record of GPS information encoded in GPX (GPS Exchange Format) Format. The act of filling those fields is referred to as
-\fIcorrelation\fR.
-.PP
-If GPS data are available at the precise moment the photo was taken (with a 1\-second granularity) the GPS data are stored unmodified in EXIF fields. If they are not linear interpolation of GPS data available at moments before and after the photo was taken can be used.
-.PP
-\fBgpscorrelate\fR
-is a command line tool implementing correlation whereas
-\fBgpscorrelate\-gui\fR
-is the corresponding GTK+ graphical user interface.
-.SH "OPTIONS"
-.PP
-These programs follow the usual
-GNU
-command line syntax, with long options starting with two dashes (`\-'). A summary of options is included below. For a complete description, see the HTML documentation.
-.TP 3n
-\fB\-g\fR, \fB\-\-gps\fR
-required, specifies GPX file with GPS data
-.TP 3n
-\fB\-z\fR, \fB\-\-timeadd\fR \fB+/\-\fR\fIXX\fR[\fB:\fR\fIXX\fR]
-time to add to GPS data to make it match photos. GPS data is in UTC; photos are not likely to be in UTC. Enter the timezone used when taking the photos: eg,
-\fB+8\fR
-for Perth
-.TP 3n
-\fB\-i\fR, \fB\-\-no\-interpolation\fR
-disable interpolation between points. Interpolation is linear, points are rounded if disabled
-.TP 3n
-\fB\-v\fR, \fB\-\-verbose\fR
-show what has been selected
-.TP 3n
-\fB\-d\fR, \fB\-\-datum\fR \fIdatum\fR
-specify measurement datum. If not set, WGS\-84 used
-.TP 3n
-\fB\-n\fR, \fB\-\-no\-write\fR
-do not write the exif data. Useful with
-\fB\-\-show\fR
-.TP 3n
-\fB\-m\fR, \fB\-\-max\-dist\fR \fItime\fR
-max time outside points that photo will be matched. Time is in seconds
-.TP 3n
-\fB\-s\fR, \fB\-\-show\fR
-Just show the GPS data from the given files, if it exists
-.TP 3n
-\fB\-o\fR, \fB\-\-machine\fR
-Just show the GPS data from the given files, machine readable output
-.TP 3n
-\fB\-r\fR, \fB\-\-remove\fR
-Strip GPS tags from the given files, and then quit
-.TP 3n
-\fB\-t\fR, \fB\-\-ignore\-tracksegs\fR
-Interpolate between track segments too
-.TP 3n
-\fB\-M\fR, \fB\-\-no\-mtime\fR
-Do not change mtime of modified files
-.TP 3n
-\fB\-h\fR, \fB\-\-help\fR
-Show summary of options.
-.SH "SEE ALSO"
-.PP
-gpsd (1), gpsbabel (1), gpxlogger (1), cgpxlogger (1).
-.PP
-The documentation of gpscorrelate and gpscorrelate\-gui in HTML format are available on the filesystem at
-\fI/usr/share/doc/gpscorrelate/html/\fR.
-.SH "AUTHOR"
-.PP
-This manual page was written by Stefano Zacchiroli
-<zack@debian.org>
-for the
-Debian(TM)
-system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the
-GNU
-General Public License, Version 2 any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
-.SH "AUTHOR"
-.PP
-\fBStefano\fR \fBZacchiroli\fR
-.sp -1n
-.IP "" 3n
-Author.
-.SH "COPYRIGHT"
-Copyright \(co 2006 Stefano Zacchiroli <zack@debian.org>
-.br
-
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.5.8.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.5.8.ebuild
deleted file mode 100644
index 346a1934b39d..000000000000
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.5.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/gpscorrelate-1.5.8.ebuild,v 1.4 2011/03/02 20:33:35 jlec Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
-HOMEPAGE="http://freefoote.dview.net/linux_gpscorr.html"
-SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
-IUSE="doc gtk"
-DEPEND="dev-libs/libxml2:2
-	media-gfx/exiv2
-	gtk? ( x11-libs/gtk+:2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.diff"
-}
-
-src_compile() {
-	tc-export CC
-	emake gpscorrelate gpscorrelate.1 || die
-	if use gtk; then
-		emake gpscorrelate-gui || die
-	fi
-}
-
-src_install() {
-	dobin gpscorrelate
-	if use gtk; then
-		dobin gpscorrelate-gui
-		make_desktop_entry gpscorrelate-gui GPSCorrelate "" "Photography;Graphics;Geography;"
-	fi
-	if use doc; then
-		dohtml doc/* || die
-	fi
-	doman gpscorrelate.1 || die
-}
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.0.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.0.ebuild
deleted file mode 100644
index 145013054644..000000000000
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/gpscorrelate-1.6.0.ebuild,v 1.3 2011/03/02 20:33:35 jlec Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
-HOMEPAGE="http://freefoote.dview.net/linux_gpscorr.html"
-SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc gtk"
-DEPEND="dev-libs/libxml2:2
-	media-gfx/exiv2
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.5.8-makefile.diff"
-}
-
-src_compile() {
-	tc-export CC
-	emake gpscorrelate gpscorrelate.1 || die
-	if use gtk; then
-		emake gpscorrelate-gui || die
-	fi
-}
-
-src_install() {
-	dobin gpscorrelate
-	if use gtk; then
-		dobin gpscorrelate-gui
-		make_desktop_entry gpscorrelate-gui GPSCorrelate "" "Photography;Graphics;Geography;"
-	fi
-	if use doc; then
-		dohtml doc/* || die
-	fi
-	doman gpscorrelate.1 || die
-}
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.5.6.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
index a4904cdf7a2f..bb426c600f23 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.5.6.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/gpscorrelate-1.5.6.ebuild,v 1.5 2011/03/02 20:33:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild,v 1.1 2011/06/07 09:14:32 scarabeus Exp $
 
-EAPI="1"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
@@ -14,32 +14,34 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc gtk"
-DEPEND="dev-libs/libxml2:2
+
+RDEPEND="dev-libs/libxml2:2
 	media-gfx/exiv2
-	gtk? ( x11-libs/gtk+:2 )"
+	gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-cflags.patch
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.6.1-makefile.patch"
 }
 
 src_compile() {
-	tc-export CC
-	emake gpscorrelate || die
-	if use gtk; then
-		emake gpscorrelate-gui || die
-	fi
+	tc-export CC CXX
+	local opts="gpscorrelate gpscorrelate.1"
+	use gtk && opts+=" gpscorrelate-gui"
+	emake ${opts}
 }
 
 src_install() {
-	dobin gpscorrelate
+	dobin ${PN}
 	if use gtk; then
-		dobin gpscorrelate-gui
+		dobin ${PN}-gui
+		doicon ${PN}-gui.svg
+		domenu ${PN}.desktop
 	fi
 	if use doc; then
-		dohtml doc/* || die
+		dohtml doc/*
 	fi
-	doman "${FILESDIR}"/${PN}.1 || die
-	make_desktop_entry gpscorrelate-gui GPSCorrelate "" "Photography;Graphics;Geography;"
+	doman ${PN}.1
 }