Version bump to latest. Drop older. Fix automagicness.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

4 files changed, 63 insertions, 36 deletions

diff --git a/sci-geosciences/qlandkartegt/ChangeLog b/sci-geosciences/qlandkartegt/ChangeLog
index 87547c295f2c..fb4147e6af50 100644
--- a/sci-geosciences/qlandkartegt/ChangeLog
+++ b/sci-geosciences/qlandkartegt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/qlandkartegt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.12 2011/02/23 15:11:36 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.13 2011/06/01 10:12:27 scarabeus Exp $
+
+*qlandkartegt-1.1.2 (01 Jun 2011)
+
+  01 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.1.2-fix_automagicness.patch, -qlandkartegt-0.18.1.ebuild,
+  -qlandkartegt-1.1.0.ebuild, +qlandkartegt-1.1.2.ebuild:
+  Version bump to latest. Drop older. Fix automagicness.
 
   23 Feb 2011; Hanno Boeck <hanno@gentoo.org> qlandkartegt-1.1.0.ebuild:
   Add dependency to qt-webkit, thanks to Joop Stakenborg in #356175.
diff --git a/sci-geosciences/qlandkartegt/files/1.1.2-fix_automagicness.patch b/sci-geosciences/qlandkartegt/files/1.1.2-fix_automagicness.patch
new file mode 100644
index 000000000000..b36a5026a43b
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/files/1.1.2-fix_automagicness.patch
@@ -0,0 +1,34 @@
+diff -urN qlandkartegt-1.1.2.old/src/CMakeLists.txt qlandkartegt-1.1.2/src/CMakeLists.txt
+--- qlandkartegt-1.1.2.old/src/CMakeLists.txt	2011-06-01 12:01:50.867319931 +0200
++++ qlandkartegt-1.1.2/src/CMakeLists.txt	2011-06-01 12:10:18.263976598 +0200
+@@ -1,13 +1,26 @@
+ project(qlandkarteqt-binary)
+ 
++option(WITH_OPENGL "BUILD OPENGL" ON)
++option(WIH_EXIF "BUILD EXIF" ON)
++option(WITH_DMTX "BUILD DMTX" ON)
++option(WITH_GPSD "BUILD_GPSD" ON)
++
+ find_package(Qt4 REQUIRED)
+-find_package(OpenGL)
++if(WITH_OPENGL)
++	find_package(OpenGL REQUIRED)
++endif(WITH_OPENGL)
+ 
+ find_package(GDAL REQUIRED)
+ find_package(PROJ REQUIRED)
+-find_package(EXIF)
+-find_package(DMTX)
+-find_package(GPSD)
++if(WITH_EXIF)
++	find_package(EXIF REQUIRED)
++endif(WITH_EXIF)
++if(WITH_DMTX)
++	find_package(DMTX REQUIRED)
++endif(WITH_DMTX)
++if(WITH_GPSD)
++	find_package(GPSD REQUIRED)
++endif(WITH_GPSD)
+ 
+ if (NOT WIN32)
+   find_program(GDALWARP gdalwarp DOC "full path of the gdalwarp application")
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-0.18.1.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-0.18.1.ebuild
deleted file mode 100644
index d3acd7e6f9db..000000000000
--- a/sci-geosciences/qlandkartegt/qlandkartegt-0.18.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-0.18.1.ebuild,v 1.1 2010/04/27 10:23:44 scarabeus Exp $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS."
-HOMEPAGE="http://www.qlandkarte.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	sci-libs/gdal
-	sci-libs/proj
-	media-libs/libexif
-	x11-libs/qt-gui:4
-	x11-libs/qt-opengl:4
-	x11-libs/qt-sql:4
-"
-RDEPEND="${DEPEND}
-	sci-geosciences/gpsbabel"
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.1.0.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.1.2.ebuild
index 642db7d91472..bdfcb3c419ed 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.1.0.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.1.0.ebuild,v 1.2 2011/02/23 15:11:36 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.1.2.ebuild,v 1.1 2011/06/01 10:12:27 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
-inherit cmake-utils
+inherit base cmake-utils
 
 DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS."
 HOMEPAGE="http://www.qlandkarte.org/"
@@ -13,17 +13,30 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="exif gps"
 
-# Note: this has unfixed automagics on libexif, libdmtx and gpsd
-DEPEND="
+RDEPEND="
 	sci-libs/gdal
 	sci-libs/proj
+	sci-geosciences/gpsbabel
 	media-libs/libexif
 	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
 	x11-libs/qt-sql:4
 	x11-libs/qt-webkit:4
+	exif? ( media-gfx/exiv2 )
+	gps? ( >=sci-geosciences/gpsd-2.90 )
 "
-RDEPEND="${DEPEND}
-	sci-geosciences/gpsbabel"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fix_automagicness.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITH_DMTX=OFF" # not in main tree
+		$(cmake-utils_use_with exif EXIF)
+		$(cmake-utils_use_with gps GPSD)
+	)
+	cmake-utils_src_configure
+}