gpscorrelate bump and makefile improvements

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64

4 files changed, 92 insertions, 5 deletions

diff --git a/sci-geosciences/gpscorrelate/ChangeLog b/sci-geosciences/gpscorrelate/ChangeLog
index 367c1cd202f5..353d172e443f 100644
--- a/sci-geosciences/gpscorrelate/ChangeLog
+++ b/sci-geosciences/gpscorrelate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/gpscorrelate
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/ChangeLog,v 1.3 2008/08/23 18:13:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/ChangeLog,v 1.4 2008/12/01 18:35:02 hanno Exp $
+
+*gpscorrelate-1.5.8 (01 Dec 2008)
+
+  01 Dec 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/gpscorrelate-1.5.8-makefile.diff, +gpscorrelate-1.5.8.ebuild:
+  Version bump, much improved Makefile (respect LDFLAGS, build without gtk+,
+  fix --as-needed).
 
   23 Aug 2008; Markus Meier <maekke@gentoo.org> gpscorrelate-1.5.6.ebuild:
   add ~amd64, bug #224325
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index b7b98aefc5cc..bf9583f08d24 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -2,15 +2,18 @@
 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
 EBUILD gpscorrelate-1.5.6.ebuild 1025 RMD160 d2fe4e437c509e1adbce5fc7ae863c96680bbbf2 SHA1 bd83203e16152b5282f0a094aba185b6a42a8012 SHA256 90ad390dd10dd26221973738b8a6fba279c235766a3cbbe679d27b21e4ff3046
-MISC ChangeLog 718 RMD160 fa09ed9d938baf990848f4535beb0ecd4241cee0 SHA1 b1417236b799ddeb2c6784ff2b41fe65972d743a SHA256 98d5c1ade414cc4f196362c293d2e636a6b72085c5128a2d0b3f0f9510ab2eaa
+EBUILD gpscorrelate-1.5.8.ebuild 1034 RMD160 5281cc2c9769e98aaf02c720b948b6a852b075e7 SHA1 9d75c877fd79008b557c085aa26021ca71f4011b SHA256 67a98794cfb31b2b3fad581732452670b926dc43a1b77b12637135051562696d
+MISC ChangeLog 967 RMD160 4a0263f88a134e7adbe2db94d409c6a1bb3a3326 SHA1 d5c23790da64230624ab51fa6ca4b798978931e6 SHA256 fae66c5e57a3d22b99e07432cddc17fc4ce4c97ad9a7641506506dca5971e740
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiwU4IACgkQkKaRLQcq0GLauwCgir4xP9aQEyw8NTsZ8S3OC0hk
-1+8An3v2TESY0rdGYex6WLFZE8mwpV8T
-=bbAC
+iEYEARECAAYFAkk0Lk8ACgkQr2QksT29OyCFdACdEIIs8pqqnf4CAJGWGleQFgkc
+8VgAniZRPu+zAwlEDOyBYyveQZwLx/3A
+=Vlo6
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff
new file mode 100644
index 000000000000..a3952bd348d6
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff
@@ -0,0 +1,35 @@
+--- 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/gpscorrelate-1.5.8.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.5.8.ebuild
new file mode 100644
index 000000000000..394312697cbd
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.5.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 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.1 2008/12/01 18:35:02 hanno Exp $
+
+inherit eutils
+
+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
+	media-gfx/exiv2
+	gtk? ( >=x11-libs/gtk+-2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-makefile.diff"
+}
+
+src_compile() {
+	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
+}