Drop patch as it was merged by upstream

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 6 insertions, 57 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index a7e51424d8eb..e872b2125e92 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/merkaartor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.31 2015/03/31 13:15:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.32 2015/04/01 06:17:33 jlec Exp $
+
+  01 Apr 2015; Justin Lecher <jlec@gentoo.org>
+  -files/merkaartor-9999-system-libs.patch, merkaartor-9999.ebuild:
+  Drop patch as it was merged by upstream
 
 *merkaartor-0.18.1-r1 (31 Mar 2015)
 
diff --git a/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch b/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch
deleted file mode 100644
index 2ea136523be7..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1fc139ff9958039c7836ac043a7f9a91aa7785a6 Mon Sep 17 00:00:00 2001
-From: Nikoli <nikoli@gmx.us>
-Date: Thu, 10 Oct 2013 16:28:02 +0400
-Subject: [PATCH] Support for building with system qtsingleapplication and
- quazip
-
----
- INSTALL     |  2 ++
- src/src.pro | 16 +++++++++++-----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/INSTALL b/INSTALL
-index 79ec63b..447876c 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -51,6 +51,8 @@ TRANSDIR_MERKAARTOR=<path>  - where will the Merkaartor translations be installe
- TRANSDIR_SYSTEM=<path>      - where your global Qt translation directory is
- NODEBUG=1                   - release target
- NOUSEWEBKIT                 - disable use of WebKit (Yahoo adapter)
-+SYSTEM_QTSA                 - use system copy of qtsingleapplication instead of internal
-+SYSTEM_QUAZIP               - use system copy of quazip instead of internal
- 
- 
- 3. Run your build tool, make for posix like systems, nmake for
-diff --git a/src/src.pro b/src/src.pro
-index a8a4730..c332b18 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,11 +6,17 @@ include (Config.pri)
- #Custom config
- include(Custom.pri)
- 
--include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
--DEFINES += QUAZIP_STATIC
--include(../3rdparty/quazip-0.7/quazip.pri)
--
--#LIBS += -lquazip
-+isEmpty(SYSTEM_QTSA) {
-+  include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-+} else {
-+  CONFIG += qtsingleapplication
-+}
-+isEmpty(SYSTEM_QUAZIP) {
-+  DEFINES += QUAZIP_STATIC
-+  include(../3rdparty/quazip-0.7/quazip.pri)
-+} else {
-+  LIBS += -lquazip
-+}
- 
- #Qt Version
- QT_VERSION = $$[QT_VERSION]
--- 
-2.0.5
-
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 1bb882546ed9..fd66aab8dc09 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.16 2015/03/31 13:15:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.17 2015/04/01 06:17:33 jlec Exp $
 
 EAPI=5
 
@@ -57,7 +57,6 @@ src_prepare() {
 		$(qt4_get_bindir)/lrelease src/src.pro || die
 	fi
 
-	epatch "${FILESDIR}"/${P}-system-libs.patch
 	epatch_user
 }