diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-24 16:39:42 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-24 16:39:42 +0000 |
| commit | f7bdf5820b2b0f6726d9b0185403468efe59cfa1 (patch) | |
| tree | eba2b7b86e83d5302e3e40a2130159fef90440da /sci-geosciences | |
| parent | Stabilise latest on amd64 and x86. Punt older. (diff) | |
| download | gentoo-2-f7bdf5820b2b0f6726d9b0185403468efe59cfa1.tar.gz gentoo-2-f7bdf5820b2b0f6726d9b0185403468efe59cfa1.tar.bz2 gentoo-2-f7bdf5820b2b0f6726d9b0185403468efe59cfa1.zip | |
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.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/merkaartor/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild | 6 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-9999.ebuild | 6 |
3 files changed, 13 insertions, 8 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/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 ) " |