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

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

4 files changed, 16 insertions, 48 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/Manifest b/sci-geosciences/qlandkartegt/Manifest
index c652428aef64..18f05b420f87 100644
--- a/sci-geosciences/qlandkartegt/Manifest
+++ b/sci-geosciences/qlandkartegt/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.1.2-fix_automagicness.patch 970 RMD160 9f3cfe7306fdf7c737430d12cb109f4df6ef13b0 SHA1 78e8712f0b663eb7362371e84d14fbba1f4047cb SHA256 83eeccbc2f14589961bb8bd29c68bc0d0f7775d84399b1da2611caf1e288621c
-DIST qlandkartegt-1.2.1.tar.gz 4290630 RMD160 b1182b2adefee0170f85290613ac0b2e088d1970 SHA1 d0af0839de8ae2b84bfb5adeba65e6c02a0a421d SHA256 24304fb148651e1e989ff9c15e56e3c6fb5d8b1e16aa70342d73bee86be67da8
-EBUILD qlandkartegt-1.2.1.ebuild 999 RMD160 6cad447e2de57db55c9c50aa2de34d96413e9109 SHA1 f20f3dc4c1b7314a7280ecafe9a494911c56129a SHA256 22fb644dc392dc130cf49f0c9578e8cd01c5770f5a326772a5c84ab27943ee74
-MISC ChangeLog 2428 RMD160 2db1a619f8fc379007d849aa8e1180ec014538f2 SHA1 6a93c1e06fb838c8f25f082d315dd53d85f1f92c SHA256 e7759a2a9feaa8bf4b9113c8ee850d6076b5c9d41828f1e58a5e987ccc1e22bb
+DIST qlandkartegt-1.2.2.tar.gz 4300356 RMD160 58d5af1e9694d2b405c8ebcf54bc0b5d4af2fddb SHA1 9f546f2d9ee452b318be15f311133aa8c2e987a5 SHA256 37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d
+EBUILD qlandkartegt-1.2.2.ebuild 936 RMD160 fba0b662e9550cd5ea5481b3e038623ec16e48a2 SHA1 b9695398f98796bf6be6922eceeaeed97826a471 SHA256 651b3b5d1d49c8c8289eccaee7da6b91a2329ba8cc2e5b12cf1fd7217021822a
+MISC ChangeLog 2677 RMD160 fe4df2793dfda565d88ded92a8a557c44cb92c29 SHA1 c17c2a8637c70a22e2ea8edbed6113419225098c SHA256 c3d94898d28d354ed03cfb624f4bf81f342b9fa8be0e9828a2b7d6be6be841ce
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4MafAACgkQHB6c3gNBRYfgJACgtI11RG3zinyF4g0vy9vk8G3/
-oCUAoMINH0GClaOwX+4wjqDkmAwUuikk
-=pT1i
+iEYEARECAAYFAk4fVYEACgkQHB6c3gNBRYfJpwCfdaf/Zsr/eSoU83m/gd2GBPCB
+1b4AoJnUSK04qHtEhb4w4prpCQuQ6snP
+=j3XJ
 -----END PGP SIGNATURE-----
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