Drop patch as it was merged by upstream

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 22 insertions, 74 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/Manifest b/sci-geosciences/merkaartor/Manifest
index 194c8a6a32b0..97ab4cd12543 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -4,32 +4,31 @@ Hash: SHA512
 AUX 0.17.2-includes.patch 452 SHA256 69e257bc8eca02c18313502d4fdf9729e2eaa51e5bd04da8f2115e28d9b675cb SHA512 a920fbd3c7fb54a70ce33e57c188ee1ca775767e78f2d2f5f576a6081c6c351a41276be588d763a2e340ee74cbd30c1b3eb3fcc12f0dc994edc3f43228a739c7 WHIRLPOOL 343abb61b50835ecefd8c0d3212ba30bab971ef0fc9cb63a818a385bc363318729097ee9731e3bf055089c7401f6f33688f4bf6183336eae7743e861697b009b
 AUX 0.17.2-libproxy.patch 483 SHA256 94c6eca2403ac89d9454837e547651d3158f94ab4abb2e1e9a5f586159990513 SHA512 b958d6d463076530c1105b7bddb7b1fabfc59a22a3a552878b79c52f80d4ae1abf2d21af74a854b22ef7d2070632bdddec2836006ceee4c63b41cc29853c0088 WHIRLPOOL 0372d1e5a8595c314a88cd7fb9d292c2a733768eb9d883569595bc67728c8abd0294a2f861639c10eb697edb34e3b4c6d859490c41ea5467050d93dd3013643b
 AUX merkaartor-0.18.1-system-libs.patch 1375 SHA256 c2b03cb87e739425234cf233fd32763f0ec52e55ef69596c65b4da78d74ef711 SHA512 b6ba4532a1cd4a7766c97824304f8b4573358fba7fba43e2078e8aa2c22207fc286680b582cb36ef7a2c6304f232a6ca352c988e9b1f72541c710ddc529b6d13 WHIRLPOOL cd35a64088ee291dcd77db64546cc0e9d97ba3720ec7ce19003ea4b1a8e91da712f0c03c0a8906c091ba8f7e644b896d2a51fec1a99fa1de8ed179d4cfb8e4e4
-AUX merkaartor-9999-system-libs.patch 1656 SHA256 c43f28f56d5f171c472384f4c1d40b33547bbe8acfb8e57626577173d495e820 SHA512 64365c293ab8b7bc5d225a18333bbe4aef910f0ff272ec68ffde409e91905cf8833ade0b96295d2faf1855f5a228355ada8b6ea256f97d9ad8369f06ff7e6220 WHIRLPOOL a76c3d23fff4e27fa36e9ccc079190941265ae667ea9138e9fc3988db2a0aff0e82ba0d70b3ae3e0c6b4a353634adfe17365c1d10b33cab7627107aa82a75e24
 DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
 DIST merkaartor-0.18.1.tar.bz2 5579080 SHA256 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f SHA512 d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45 WHIRLPOOL 23327a7eaa91531a95665fe9ff647712606babf96e3843ef33b94a37f6f7ca6d1cb09576b0b31197badc32e87cfc7ca275a9e3792e57f57dd58fe0509ec1b46d
 DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
 EBUILD merkaartor-0.17.2.ebuild 1881 SHA256 202ab26c21a8ce9ab5951e807e74cb73079ab1ce4008f3700b801e6361e25d2c SHA512 0c0a8d937c6ede8bff2c109aafcb042b49c2e6ae5948e1e851387004b373e9dc07b67cc01dc440c1d675bea510c2f3258cd8300707c45838afaa381a1adb8aa9 WHIRLPOOL 436db5305757901757fca6b120e414fd43aabe59bbca76553db9f4deb5f0b01e47fa81e7ad1d3684befc255b5e9df4258423394a9f2a5414b5f861e88abc2902
 EBUILD merkaartor-0.18.1-r1.ebuild 2216 SHA256 573407111fbbcb273eeb55fb2406ba87a5d622f11e132434de57a8e75cc0e733 SHA512 90a9bb4cb0aaefd75ad65eba0f655e7eb587b84d49a679eef6bd9509699aed932ab4db98c8355d726218ce9dc5f2935f05324fca33d12d236a9f8cbe664d8606 WHIRLPOOL d7475e82ae567ca5abbdf2c3205c9df115fec4bb033d22ae7afd3f2d3864386831d39977e42cdce6b274b08c2b36c5d45706c14d6676ef6ddc2c7358f570f999
 EBUILD merkaartor-0.18.1.ebuild 1885 SHA256 345c7fd79fd2137e8dd7b7954c1668faa92faa6c8801285ed6f0cd55ecf216dd SHA512 a830f310068e4be0207c221fe3d014d9d5f8ce62badf2dd6fb0c912b4a161df16e27c64dd346511a2dea3216ad4ccdf3c4921c48f45d6247766db711d5a05ab1 WHIRLPOOL 9f8ac41570ef8040a756c4377f9ae49651d764b7d1b3ce6e9382c6fd2b18245df53ee260340eb66220bc3674d2f631257bc0c730a6732412be08200c4f560c7f
-EBUILD merkaartor-9999.ebuild 2272 SHA256 968d56873492b0e232327218bcf263978b269849fe24f4b4745319e3b6093fef SHA512 ad6da632dea7517c701e5a16e317fd44de3c70136c477e423c6c49a1fb895bbc905d26dee26a924b826680bc2a4d118ef6bd799614f028c4ffee19b6383f811a WHIRLPOOL ce849841605c85237c44dd4893e25004929ea39f6660c28dba1917ae2091dfa0244f0a5c30a837844b75255daef03f9db599213c1edacc03a9acfc767baa98eb
-MISC ChangeLog 5222 SHA256 ae2146a2c11796e6f36332958aa13e8ecf9ea7f3be5232af33cbc23897e012eb SHA512 d196826ebd8baeb0308bdfe2ad880380e61041f208c7f5d5d073428fceeb417e91018fdbaa993a0faa7f595f70b89b3faf51c799429a79f2a358b1e7e653f9ea WHIRLPOOL e6ba84cffda8f13d675d349fa57e010ad9a79e5f702e597e79e37a49298cd47bdf1b98608f26e654a59c236b208ce294433bcf6cafa294d7742dfe73f58266d6
+EBUILD merkaartor-9999.ebuild 2227 SHA256 6d776e2a67bb9e16eeca1967b71fec08275f94ea11a1d8d9d5ab5538a0eb5898 SHA512 fd80a6e88fbd197992461699c8774bcd22b5647963fb9bc95e19ba7c855b928af75625920b856dc986656184596a9b1ea150b343a5c4efd343cbfd111339e1e2 WHIRLPOOL 1d2c84e427d07c8b7a03a7c69befb35e5355130a118eda0c8f493377f9412303a276f13ea83e17f8c6e389860c4dcf2da3ec0a82d33506b97e4521796f73f608
+MISC ChangeLog 5380 SHA256 651872a0146929d7eb70cde0d8f92de831a76027e0f51a3b2b836238462c8868 SHA512 bb9395a13aad3b837d16be46c1b6e8ec26e8d66a63769700d14789f5a8652c09bb38b61d4fe672920b35cb0b1afc5dbaafe63437a813a4f1e5c9d3d773f4a63a WHIRLPOOL 5e078c5850a7e2d7963b40796693236176df52f8566d1ec89aee795e524a61ad3cc988edd5eacbaeb0f12b2dee309e03e3c1f73f24ddd4ae3f2664e527be6260
 MISC metadata.xml 414 SHA256 c2a4c6ae349e9b1e05de3ef95ed79e0e3f9d70d6161836b05ff8b49d7fa1cafb SHA512 1c7b4d75ccec2deb4c034512fab6da5f4deadceb55bcda1caf9ecf7a91128dd7f31eedf4ce71e9676c343cde5df0d2fe836daeed1781098a9e3af433d8d17fa2 WHIRLPOOL 2ea3a0509ecb1d72b138e225a9e98775f628ecbc0e1aabb2af3413df28ef42d368ef901d5071ee7e062f8abbd1faed9875ea5d830766aaf9bf7465cc72a081aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVGp3ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVG41+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirjZUP/iXyiw+NLN6XxFssIquVdaQH
-LbB0HF4bjZCbhwXzCXB6ZQ5Af8EBTTJ13XDLh+q60RReJbnmPi2w62maYCnX5/fj
-BZ/2GMChEZez9MWEKxCPF1qLAkr3sFWk+IB5D3jVbGyLG9Awb0tTHeMXmcSkGVt4
-GaZ/FOHFHy8WyEi/4Z5tZEbZv7wsHeEKcWSYgNlr3cMy4m443oaF3jgHjIagdWaD
-PI5P+0RtrFdyfuSDLImFJ7N/z4RqxKrB60BKWmThVeg6NGFkRqa4NmgKT6/GoOxm
-cFHilsA3fe3vy11URXouOSMr5s/pjo2yeisNOz3bBtAgc/XzY7X+0EZk+vTMGIMm
-fl0P5R2MoJPyXCfxaFs73p6aVSIzZndfqw+cUd0UPg5VhGWyd+YqDrxjY+nAydLy
-j71NR9EPIOXvGPSq/jd9XIE2ypDKjrXLNaufwQe6fbESngxGAmIAV0TYhSSMWwTY
-EdC1YSbMCD1Suc3qRkxEqbBE56P1P+2+1UmcT3HY6LXzIsYm2mWQLuciGlmVewrm
-V3y6ZFYAlJMDQez/gy53ulcspoH6p84bNltfj2qwtrSFeC2QvcO2OE/PdUAADTKe
-jFicjMjNArY+qvmL0R3K7Bu3ZGJljLzris+8g+6RkjK76fdAdCzVoF1h5t/yL/on
-GO6LiuUrQMvcf57PW1H2
-=66lR
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgJkP/iqgq89TifFg6HTlXg+y7jmk
+JOW/FXpCJgO3RLAfZzdHrznZUh4+VBk16LkxH5WDC2gVeKsnykJr2Sa51d+xMK7W
+O8tmKuwPqz1fJyyhz/Oz1Is6xEpvmjKvhoKMestiM51zyBwMTSTOtEmWxHxpCjRy
+SxDLel29851WIxvpVqmAlQFzAUVjxYC9ZRVXfzCEoJpgA7oztwtJELKjP2cpkHnb
+O1fyXiOnXSGsH9UWAZmqHOqBKwbQFUgPSkUOg/Dgi9WH9YREWPxYZZDtZPqwVNsA
+1QjA15P11hQY8erSHoIVXTF7buQ7LMIQzqk38gJvRCLxA+QHXho8RK7Bvm0Q0AzN
+f6fhpBsTnRifghYRuOh0f6i8zWn2+xru4x+VrNEN1pQjbXoTr7JNLZ994xl0yZhw
+1r/KNt0/4Lwlw1UK5MK46p8dGw5u7c9o9q/4/KWocRT7MxXXePMXruBpRlRj/Bvu
+WcIPpvBc9MpCb7QsgoM1q/BnL0B7nU14DZrC0oToLs/UQKoSS8czeXS8kW+5n8hd
+h845RT1Dd/S1RLwpPet1QNepZ9P57pplUiG26LbjjuQBNtb39PB72B8M6+mB4IYA
+NjIUH4hiSuKGBazXsbz3tsvXmkhZLM1WvFPIe0o1DPsCtyK3NWDiPyQomDAvCgvJ
+B0nChKn9isAkuFIzOfRE
+=eTUA
 -----END PGP SIGNATURE-----
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
 }