Version bump. Drop older. Drop patch applied by upstream.

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

3 files changed, 10 insertions, 41 deletions

diff --git a/sci-geosciences/qlandkartegt/ChangeLog b/sci-geosciences/qlandkartegt/ChangeLog
index 594b109fea19..4cdf99c45883 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.14 2011/06/30 12:20:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.15 2011/07/14 20:47:13 scarabeus Exp $
+
+*qlandkartegt-1.2.2 (14 Jul 2011)
+
+  14 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/1.1.2-fix_automagicness.patch, -qlandkartegt-1.2.1.ebuild,
+  +qlandkartegt-1.2.2.ebuild:
+  Version bump. Drop older. Drop patch applied by upstream.
 
 *qlandkartegt-1.2.1 (30 Jun 2011)
 
diff --git a/sci-geosciences/qlandkartegt/files/1.1.2-fix_automagicness.patch b/sci-geosciences/qlandkartegt/files/1.1.2-fix_automagicness.patch
deleted file mode 100644
index b36a5026a43b..000000000000
--- a/sci-geosciences/qlandkartegt/files/1.1.2-fix_automagicness.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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-1.2.1.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.2.2.ebuild
index f12d5c4a57a3..02e2458eb6b7 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.2.1.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.2.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.2.1.ebuild,v 1.1 2011/06/30 12:20:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.2.2.ebuild,v 1.1 2011/07/14 20:47:13 scarabeus Exp $
 
 EAPI=4
 
-inherit base cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS."
 HOMEPAGE="http://www.qlandkarte.org/"
@@ -28,10 +28,6 @@ RDEPEND="
 	gps? ( >=sci-geosciences/gpsd-2.90 )
 "
 
-PATCHES=(
-	"${FILESDIR}/1.1.2-fix_automagicness.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		"-DWITH_DMTX=OFF" # not in main tree