summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2016-08-15 09:29:57 +0200
committerMarek Szuba <marecki@gentoo.org>2016-08-15 09:39:01 +0200
commit0f5252b031fde58148fedf12d995fdea61fee124 (patch)
tree90754f906102fa5437142b9ad6ebc2cd4ea474c4
parentRevert "sci-geosciences/osm-gps-map: add ebuild for version 1.1.0" (diff)
downloadgentoo-0f5252b031fde58148fedf12d995fdea61fee124.tar.gz
gentoo-0f5252b031fde58148fedf12d995fdea61fee124.tar.bz2
gentoo-0f5252b031fde58148fedf12d995fdea61fee124.zip
Revert "sci-geosciences/osm-gps-map: move version 0.7.3 to slot 2"
Return to original state until the new version can really be installed in parallel with this one. This reverts commit 7b88e7dd798f0a6e11e4f242c33f98543ec9a9c4.
-rw-r--r--app-misc/gramps/gramps-3.4.9-r1.ebuild2
-rw-r--r--app-misc/gramps/gramps-3.4.9.ebuild4
-rw-r--r--app-misc/subsurface/subsurface-3.1.1.ebuild4
-rw-r--r--profiles/updates/3Q-20161
-rw-r--r--sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild4
5 files changed, 7 insertions, 8 deletions
diff --git a/app-misc/gramps/gramps-3.4.9-r1.ebuild b/app-misc/gramps/gramps-3.4.9-r1.ebuild
index 89bd31be29e9..dd3a36a1a0f0 100644
--- a/app-misc/gramps/gramps-3.4.9-r1.ebuild
+++ b/app-misc/gramps/gramps-3.4.9-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/pygoocanvas[${PYTHON_USEDEP}]
>=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}]
gnome-base/librsvg:2
- sci-geosciences/osm-gps-map:2
+ sci-geosciences/osm-gps-map
x11-misc/xdg-utils
gnome? (
dev-python/gconf-python[${PYTHON_USEDEP}]
diff --git a/app-misc/gramps/gramps-3.4.9.ebuild b/app-misc/gramps/gramps-3.4.9.ebuild
index 034970fe1a45..487be35d554c 100644
--- a/app-misc/gramps/gramps-3.4.9.ebuild
+++ b/app-misc/gramps/gramps-3.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/pygoocanvas[${PYTHON_USEDEP}]
>=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}]
gnome-base/librsvg:2
- sci-geosciences/osm-gps-map:2
+ sci-geosciences/osm-gps-map
x11-misc/xdg-utils
gnome? (
dev-python/gconf-python[${PYTHON_USEDEP}]
diff --git a/app-misc/subsurface/subsurface-3.1.1.ebuild b/app-misc/subsurface/subsurface-3.1.1.ebuild
index d868cf0269e9..b180ac025941 100644
--- a/app-misc/subsurface/subsurface-3.1.1.ebuild
+++ b/app-misc/subsurface/subsurface-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,7 +35,7 @@ RDEPEND="dev-db/sqlite:3
dev-libs/libxslt
dev-libs/libzip
gnome-base/gconf:2
- sci-geosciences/osm-gps-map:2
+ sci-geosciences/osm-gps-map
net-libs/libsoup:2.4
virtual/libusb
x11-libs/cairo
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 642664527d7a..5c8e9d52605d 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -11,4 +11,3 @@ slotmove >=dev-php/pecl-yaml-2.0.0_rc1 0 7
move dev-perl/regexp-common dev-perl/Regexp-Common
move dev-php/PEAR-PHP_CodeSniffer dev-php/PHP_CodeSniffer
move kde-apps/kgamma kde-plasma/kgamma
-slotmove =sci-geosciences/osm-gps-map-0.7.3 0 2
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
index f52efcf1e8d3..531bff5bf2c8 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz
python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
LICENSE="GPL-2"
-SLOT="2"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+introspection python"