sci-geosciences/merkaartor: Version BUmp, #429788; fixes compilation with gcc-4.7, #422549

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 98 insertions, 7 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 05b2cc50df8b..d699239f42ee 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/merkaartor
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.25 2012/11/16 20:13:27 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.26 2013/01/23 12:08:09 jlec Exp $
+
+*merkaartor-0.18.1 (23 Jan 2013)
+
+  23 Jan 2013; Justin Lecher <jlec@gentoo.org> +merkaartor-0.18.1.ebuild,
+  metadata.xml:
+  Version BUmp, #429788; fixes compilation with gcc-4.7, #422549
 
   16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> merkaartor-0.17.2.ebuild:
   workaround for bug 399061
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index f8956b41b706..971f083cb7ed 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
-DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
+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
 EBUILD merkaartor-0.17.2.ebuild 2051 SHA256 4962244e7905fa770b635dcd30c42e7e5762350560a1feeabdaf53fc911d701e SHA512 15224d4b441b26ffdc9ccad9cf6c29e26b46e8166f9c8303b4a596584d4fc276b987bb0e89ffea596158066a51f4df654973684a4bfa6439e559025c42479b81 WHIRLPOOL b8cf9faa6c980880e187ee138c264d0ce6ae2d156357f8b0ccb19b5da38bbff5183e5ee8c402954f8ce410c202c5ae1938b4961d38bfbd3f07f89a2deebf4d02
+EBUILD merkaartor-0.18.1.ebuild 2057 SHA256 1e4c338dbe21250b7019aa3673b90ba106933e63c1f502f33c1b9deb4eeb5996 SHA512 2aeea7558f92aac73460e81742d842425342a18ab7d649f613a606c62d5f9cd7b175a25a9cf2e3cc2f4b3e3a2b1990a13e14c301d08ad43d328a0fd7d38a3a09 WHIRLPOOL 216b41f89485644eb3a70e4a04d5b2de54b90d6519866fe94a4ea08b3926a8f64f6aa7436df9d99b38a4abe12ea7d84b01af08ff5525fad95d6632c7ffef7c1b
 EBUILD merkaartor-9999.ebuild 1931 SHA256 d89239fef8cdf866334f4573d99263217cc92f8afb6f900e94e2a94e5605b51d SHA512 36107df9434c880b05731148080c82b8b2d0591d58a79bb5c34e1c27bc1583bdc2061dea0f08f5288a3c2f7e9b6defba51ffb1072b6f7c87ba6de8d5c88f59b2 WHIRLPOOL b2b1308266c0c2220cb44ca385dba09edc4b7b7b531c7a037b20862c15aceb2861675450d555af8d13364935eeb7489c9e169264d67a6dac5f28e57d40b6f41a
-MISC ChangeLog 4054 SHA256 dc84a2a06cfba368a24e3b7a62dede3df7b9b89a025600d55d69a2f4bd188892 SHA512 8a99577a259dfa8263815c7ce6643619423f13d26c7b0c43d9205371011a278168e0c63bee1ff100cc7b7f7e5fc85631424528bae5451834b5574618ba085c9b WHIRLPOOL f3805338e44b8c983a31bea9e235cf2d7f6b2fa9affbf80256d7b54e39509f437aeceb8d54f49059393d3ea8dc87fcdc1a1514688c19798bf8d4a7f59b6d2b9d
-MISC metadata.xml 467 SHA256 b107951b4352a6a1c5ce816735d5dc45306cbf8da2e80adc6d63d8b04bb3d838 SHA512 2a43f4caa58538649d70a5b7736dfe918555d9635925d86f25b842d68037b073a03bbcab4a779fc7aafe2c71cebe392ffc601d2157ddb9abc5984afdf5f83ec4 WHIRLPOOL 2153dd577a20dcfad20780981083fed39ae6c645df89c411e2ab53ed6f93ce2b81d1f73fe6e7b7bef1ad92c68a555d5ec98cc256a794e89b5c92add5ca90db81
+MISC ChangeLog 4245 SHA256 72242946100f40740a01f837afaddb915602c357eb05ec0d7094397987ea5c43 SHA512 6183a65165bbcff2fe93eae199a6afcb788998f4e0dcefd60fbb2a3f2882cb79993f83793396e951315b60f5384ec2453db7da56869a2cb55fb2e48e398bb569 WHIRLPOOL fbe5676d76a23072f7cdb87d8b5fcd28e9c957fc1927dfd23b4d9d8e87a32a5393a4c25972e17a665b9074017bd35aff96d00f39169984ad7d41551cff37cb18
+MISC metadata.xml 469 SHA256 e96b1cb32ec44fd58b5f27975bfbfb6943a13b7a8fd578f17125a595506cbf27 SHA512 205937536421225aef27926ad2a9c67d8087e24842b8aa7580dfdca20c89a36c96ffa3ecdab499a72617214709ba317e48f09ad1eebe3e40be1083594898e5cc WHIRLPOOL dfb164ea1380a780caa70b32eb274d99783af6a7ab561d0b00d85862c7f57c5f157dd0a3e394a132292938c25b5a9dec59b7420efd7f72b7d19e3a799a5ffa3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlD/0qsACgkQgAnW8HDreRbSawCgjgVZyBxwOD6WfJTyDf0ml7L+
+wL8An0wEcPL5glJHumXfk7tLkbDNa+MC
+=/kX3
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
new file mode 100644
index 000000000000..71a4baa3a0a9
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild,v 1.1 2013/01/23 12:08:10 jlec Exp $
+
+EAPI=4
+
+REDMINE_HASH="301"
+[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
+EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
+EGIT_PROJECT=${PN}
+
+inherit multilib qt4-r2 ${SCM_ECLASS}
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be"
+[[ ${PV} == 9999 ]] || SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug exif gps nls libproxy"
+
+QT_MINIMAL="4.7.2"
+DEPEND="
+	>=dev-libs/boost-1.46
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	>=x11-libs/qt-svg-${QT_MINIMAL}:4
+	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
+	exif? ( media-gfx/exiv2 )
+	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
+	libproxy? ( net-libs/libproxy )
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS CHANGELOG HACKING"
+
+PATCHES=(
+#	"${FILESDIR}"/0.17.2-includes.patch
+#	"${FILESDIR}"/0.17.2-libproxy.patch
+)
+
+merkaartor_use() {
+	local useflag=${1}
+	[[ -z ${useflag} ]] && die "No useflag specified"
+	if use ${useflag}; then
+		echo "1"
+	else
+		echo "0"
+	fi
+}
+
+src_configure() {
+	local myconf
+	myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
+	myconf+=" GEOIMAGE=$(${PN}_use exif)"
+	myconf+=" GPSDLIB=$(${PN}_use gps)"
+	myconf+=" LIBPROXY=$(${PN}_use libproxy)"
+	myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
+	myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix
+	myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671
+
+	if use nls; then
+		lrelease src/src.pro || die "lrelease failed"
+	fi
+
+	eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
+}
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 147387d5b261..dad8f126735d 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -6,7 +6,7 @@
     <email>hanno@gentoo.org</email>
   </maintainer>
   <use>
-	  <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
-	  <flag name="webkit">Enable Webkit browser plugin using <pkg>x11-libs/qt-webkit</pkg></flag>
+    <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
+    <flag name="webkit">Enable Webkit browser plugin using <pkg>x11-libs/qt-webkit</pkg></flag>
   </use>
 </pkgmetadata>