Update the makefile patch so the gtk is really optional.

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

4 files changed, 33 insertions, 22 deletions

diff --git a/sci-geosciences/gpscorrelate/ChangeLog b/sci-geosciences/gpscorrelate/ChangeLog
index 73d24832ecaa..de20c06f083b 100644
--- a/sci-geosciences/gpscorrelate/ChangeLog
+++ b/sci-geosciences/gpscorrelate/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2011/06/07 09:14:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/ChangeLog,v 1.10 2011/06/08 12:22:57 scarabeus Exp $
+
+  08 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  gpscorrelate-1.6.1.ebuild, files/gpscorrelate-1.6.1-makefile.patch:
+  Update the makefile patch so the gtk is really optional.
 
 *gpscorrelate-1.6.1 (07 Jun 2011)
 
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index 1b74d21cb66b..cf9724fa10ed 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gpscorrelate-1.6.1-makefile.patch 1432 RMD160 0084f8045fa37507b0c776fe4456df77728da60a SHA1 7bea6c89a4a7e0f8e469b0b056c85012bdd84f43 SHA256 0c2cac315c5de5bda932520df7ad4971d5e26348fdbbd61a0646b9a18b5d9d4d
+AUX gpscorrelate-1.6.1-makefile.patch 1610 RMD160 3632afa23c562f729dcd12f3a25e01be3fefc9a9 SHA1 f93c002da17ae13299ffe04d57305e305deb9d96 SHA256 bb84f6e323ac18a819830bb47fa8ac833c10d539253711c00ef83b9cc9b36fb1
 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
+EBUILD gpscorrelate-1.6.1.ebuild 1040 RMD160 40951cdea3b31f13d08285dce03419e7e86f2686 SHA1 e022274157dfdcd98ceb060ccf226876655c5391 SHA256 53429935a5b61ac9e37c19d70834019a9352fd39549bed627629bdfdce0a88a8
+MISC ChangeLog 2225 RMD160 4bcf30b0e7dc0a339f21490dbb41b05c41c117b4 SHA1 0456631b8f5abe069fc5a169ada2795ac99d1d02 SHA256 18ad1157b160e40974d4f65fd969432b69c8eca5d9f74efa338ce1360199b184
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3t6/4ACgkQHB6c3gNBRYdXRwCeOqvk9Z052RH5xpwGuxwgq29N
-22sAoMOVtpMFHjbw1G4QNEkmrwyRAP/R
-=HVSm
+iEYEARECAAYFAk3vaZQACgkQHB6c3gNBRYe2KACfYyvruMa5yIoTgp98Bi09dG19
+HzkAoItzQLkq3m6scWXzErMJo6tRKjSc
+=NpbZ
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
index 653d7dac6087..14b00c92b74c 100644
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
@@ -1,7 +1,7 @@
 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 @@
+--- gpscorrelate-1.6.1.old/Makefile	2011-06-08 13:51:06.000000000 +0200
++++ gpscorrelate-1.6.1/Makefile	2011-06-08 14:13:18.000000000 +0200
+@@ -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
@@ -10,31 +10,38 @@ diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile
 -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
++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 +17,16 @@
+@@ -18,16 +22,16 @@
  all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
  
  gpscorrelate: $(COBJS)
 -	g++ $(OFLAGS) -o $@ $(COBJS)
-+	$(CXX) $(LDFLAGS) -o $@ $(COBJS) $(CLIBS)
++	$(CXX) $(LDFLAGS) $(COBJS) $(CLIBS) -o $@
  
  gpscorrelate-gui: $(GOBJS)
 -	g++ $(OFLAGS) -o $@ $(GOBJS)
-+	$(CXX) $(LDFLAGS) -o $@ $(GOBJS) $(CLIBS)
++	$(CXX) $(LDFLAGS) $(GOBJS) $(CLIBS) -o $@
  
- .c.o:
+-.c.o:
 -	gcc $(CFLAGS) -c -o $*.o $<
-+	$(CC) $(CFLAGS) -c -o $*.o $<
++%.o: %.c
++	$(CC) -c -o $@ $< $(CFLAGS)
  
- .cpp.o:
+-.cpp.o:
 -	g++ $(CFLAGS) -c -o $*.o $<
-+	$(CXX) $(CXXFLAGS) -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.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
index bb426c600f23..b5125427ac23 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2011/06/07 09:14:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild,v 1.2 2011/06/08 12:22:57 scarabeus Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ src_prepare() {
 src_compile() {
 	tc-export CC CXX
 	local opts="gpscorrelate gpscorrelate.1"
-	use gtk && opts+=" gpscorrelate-gui"
+	use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1"
 	emake ${opts}
 }