Pull in cxx useflag on merkartor to not fail on build. (not present on stable gpsd but does not matter as merkaartor is testing itself). Fixes bug#394793.

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

4 files changed, 30 insertions, 19 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 436b1f55dc69..da174a6a281d 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/merkaartor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.21 2011/12/16 15:24:57 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.22 2012/05/24 16:39:42 scarabeus Exp $
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> merkaartor-0.17.2.ebuild,
+  merkaartor-9999.ebuild:
+  Pull in cxx useflag on merkartor to not fail on build. (not present on stable
+  gpsd but does not matter as merkaartor is testing itself). Fixes bug#394793.
 
   16 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> merkaartor-0.17.2.ebuild,
   merkaartor-9999.ebuild:
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 9e7680dd75d6..3453b375014f 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -4,18 +4,24 @@ Hash: SHA1
 AUX 0.17.2-includes.patch 452 RMD160 9a6dbda2ff06503945221f732fd568f269ed37e8 SHA1 2d2cdc05704933df08bebfe3b90dc709aa895dac SHA256 69e257bc8eca02c18313502d4fdf9729e2eaa51e5bd04da8f2115e28d9b675cb
 AUX 0.17.2-libproxy.patch 483 RMD160 38f13275474936ce4eeae2f30b4db51a251e432d SHA1 a15742ecab65eec3483df99d9ded71fb3dae952c SHA256 94c6eca2403ac89d9454837e547651d3158f94ab4abb2e1e9a5f586159990513
 DIST merkaartor-0.17.2.tar.bz2 7138991 RMD160 c5c8944872828ba5ada6003cd5821f33899da3cb SHA1 f789141db427bf25bb3b61801fefc98ab0430012 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
-EBUILD merkaartor-0.17.2.ebuild 1950 RMD160 ca936c3f8e921c3522a7913bcf0fb1399229b60b SHA1 aa00f833f165ddb37358359c9b0ee76c4a861fe8 SHA256 3983732e2ab72bf08824e8da6c855397eb51f2c7b609cada8ef7b9b53f1a01c0
-EBUILD merkaartor-9999.ebuild 1902 RMD160 080ade56c2c7383edc0cec93aa446664f10bcab4 SHA1 9c9cb398fec05a8fe58b5d20cc40ca1359ed4b5a SHA256 42fa396d4a332aa58f825a9ed8a5e088a864dd87909ed812ef6407694fc44637
-MISC ChangeLog 3432 RMD160 01cc3d942218cdbd86ee68bf0c7d39b5edde64e3 SHA1 e02fcf9ada8ca2077708f99af408291408e094f4 SHA256 d2044354bb6e385e34e2eb5dd026fcc2a38e77abef4aa36934bcd68e3d4ce9a6
+EBUILD merkaartor-0.17.2.ebuild 1955 RMD160 643151117304c6411ec7945d0118567c76d1cf5b SHA1 cb1ebede3b7b48b08f4265efc40476d4913a5783 SHA256 dbbf309c3f6eb987a32fc9078e4504a2814c4d1dff9126733b42526c10a6b41e
+EBUILD merkaartor-9999.ebuild 1907 RMD160 5210746db95dbee938acf0582840905b4a18df77 SHA1 c41c51b5f43233358d99afbecb6f3f7f70cdc4b5 SHA256 18ebdec44486008b642ba47a0fd6f11f56906c250f04e4ebfa311865bee9d2a1
+MISC ChangeLog 3699 RMD160 002c8820ca346123860a21edbca6b90d1923a8c4 SHA1 4d89e1545e73537615e59bb780ac059db545ec86 SHA256 618b3431b9463323e471ffa379cc5a687e3e281374be7562889f7065d946ffed
 MISC metadata.xml 467 RMD160 35303c7ae1f239e15845d3b01417f0f2d04ebf3a SHA1 1361600e4014ce1cc840cbc1d3adec1640903a7b SHA256 b107951b4352a6a1c5ce816735d5dc45306cbf8da2e80adc6d63d8b04bb3d838
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO62KyAAoJEEdUh39IaPFN8FMH/RDdRTNqnqjAmMknVfCybSV1
-DYPfLPYZvq80ViVCJSnDLjcuPTyiHYi5Isn7GaRHaULpaH9AGOeyP2KarOTjR5pw
-2RBaiX6N7Ac1vilKT8QMSFLV259NvV6h0ngVOV4LOQvEZQTBDtwMnMN3fmjWFElM
-MiXf9JFG3oBGwXTNNfFuCl43G0w/y5I0VedK9jCia3VCKivdgUEJWJSC+IbxeRNA
-V1T5RhUyK2RJ1AYzZpcZG/OBY/Li6BHdMNh1vG3xnAEtU89Pp3qMunbddVa1ctVz
-U3GCv3c6Zg4MAIPDtYCUrydPhDk+nw2wDfG6PUOtUeYQQJmGIp0dmq8jHkwSCV8=
-=TQVG
+iQIcBAEBAgAGBQJPvmRUAAoJEOSiRoyO7jvo5JsQAK5D3PE95tc1qJXVeC57B+Bv
+rtzNCpiDRnZGeuN5muBR+Bk45KdK6zm5caOUC/ix8rkQsXpopMiH104cGnKCd+/T
+mBJIK4ZpNl/DbI7Xw9riIka0nDTODBEc6GjRxMIYDUHERXtOMqT4nwUoeGdRbp3z
+0IPORCvI3MjoXeQGw30Qxxk/oburVUHzt4AXTl0k5BCgMrRK7LbE2Yb25RkRs9Rd
+MJQEjSKQ/16s9ZAeLFBGqu4AW3yx/j8VnT6kdmGws1vQNdPtpY/Weene64e5Qimg
+aBwgIDJNvLnSvnUr/Lzkvug5XevDcBeW2c21BQdYGBKInXb1uo0ACTucMwdsjEUd
+SK1Sl4kw30Kcz68B1wm2UvjBIt+hgl8/FiqLPmIv02t/cM0fbHqFE5y5N1qAXz2B
+doiwz1/T/h7CoawOP4foefkFAe5gP/O5y9A+jIOeM+aUP7DX4MpKTdRlv5ai9aXg
+UqoP4wrldtz3ILNk03UeeQ22SHZpIknLkCZqNfJ8f4a+zdafqwLcQyU6PltlmZ8K
+o2Ncc4ghnVQYWmqwhgtGItqPb1aPZU3Ticepol5W4Gjz6RNc+kp2xdpmKFYwd5sE
+3sGikSD5I61GyRzQPQdSqWYeU3i0qPLc64Rb6w/yQeZnMu/ofn9xbBMD8VStGrAh
+LsUuIwChIoy5j2VtZKdy
+=6cPy
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
index 236098f0a9ce..3f8cf4fee144 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.4 2011/12/16 15:24:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.5 2012/05/24 16:39:42 scarabeus Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ DEPEND="
 	>=x11-libs/qt-svg-${QT_MINIMAL}:4
 	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
 	exif? ( media-gfx/exiv2 )
-	gps? ( >=sci-geosciences/gpsd-2.92 )
+	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
 	libproxy? ( net-libs/libproxy )
 "
 RDEPEND="${DEPEND}"
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 38b7d474c358..d54920d4cad9 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.10 2011/12/16 15:24:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.11 2012/05/24 16:39:42 scarabeus Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ DEPEND="
 	>=x11-libs/qt-gui-${QT_MINIMAL}:4
 	>=x11-libs/qt-svg-${QT_MINIMAL}:4
 	exif? ( media-gfx/exiv2 )
-	gps? ( >=sci-geosciences/gpsd-2.92 )
+	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
 	libproxy? ( net-libs/libproxy )
 	webkit? ( >=x11-libs/qt-webkit-${QT_MINIMAL}:4 )
 "