From 87a444458a2eec15bd08cb2e0c7ed703d7bc1138 Mon Sep 17 00:00:00 2001
From: "Nathan Phillip Brink (binki)" <ohnobinki@ohnopublishing.net>
Date: Fri, 1 Oct 2010 03:32:16 +0000
Subject: [PATCH] app-misc/2gis-data: Version bump to 2gis-data-2010.10 per
 oper777's request. Adds 6 new maps.

(Portage version: 2.2_rc88-r1/svn/Linux x86_64)

svn path=/sunrise/; revision=11384
---
 ...10.6-r1.ebuild => 2gis-data-2010.10.ebuild} | 18 ++++++++++++++----
 app-misc/2gis-data/ChangeLog                   |  7 +++++++
 app-misc/2gis-data/metadata.xml                |  6 ++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 rename app-misc/2gis-data/{2gis-data-2010.6-r1.ebuild => 2gis-data-2010.10.ebuild} (78%)

diff --git a/app-misc/2gis-data/2gis-data-2010.6-r1.ebuild b/app-misc/2gis-data/2gis-data-2010.10.ebuild
similarity index 78%
rename from app-misc/2gis-data/2gis-data-2010.6-r1.ebuild
rename to app-misc/2gis-data/2gis-data-2010.10.ebuild
index 52425610a..2388bc8ef 100644
--- a/app-misc/2gis-data/2gis-data-2010.6-r1.ebuild
+++ b/app-misc/2gis-data/2gis-data-2010.10.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=app-misc/2gis-3.0.6.1"
+RDEPEND=">=app-misc/2gis-3.0.7.1"
 
 # filled in in `my_add_town`
 IUSE=""
@@ -37,12 +37,15 @@ my_add_town barn Barnaul 2005 2
 my_add_town biysk Biysk 2008 10
 my_add_town chel Chelyabinsk 2007 8
 my_add_town ekb Ekaterinburg 2005 12
+my_add_town galt Gornoaltaysk 2010 4
 my_add_town irk Irkutsk 2006 4
 my_add_town kaz Kazan 2008 11
 my_add_town kdar Krasnodar 2010 1
 my_add_town kem Kemerovo 2005 4
 my_add_town kras Krasnoyarsk 2005 8
 my_add_town kur Kurgan 2006 3
+my_add_town magn Magnitogorsk 2010 4
+my_add_town nchl Nabchelny 2010 6
 my_add_town nkuz Novokuznetsk 2005 8
 my_add_town nnov N_Novgorod 2008 9
 my_add_town nsk Novosibirsk 1998 9
@@ -52,10 +55,13 @@ my_add_town omsk Omsk 2004 8
 my_add_town perm Perm 2007 12
 my_add_town rost Rostov 2010 3
 my_add_town sam Samara 2008 7
+my_add_town sochi Sochi 2010 7
 my_add_town tim Tyumen 2006 11
 my_add_town tom Tomsk 2004 12
 my_add_town vlad Vladivostok 2010 3
+my_add_town vrnz Voronezh 2010 7
 my_add_town ufa Ufa 2008 3
+my_add_town yar Yaroslavl 2010 6
 
 pkg_setup() {
 	check_license "${FILESDIR%/files}"/../../licenses/${LICENSE}
@@ -63,7 +69,11 @@ pkg_setup() {
 
 src_install() {
 	insinto /opt/2gis
-	# Only required data files were unpacked, so it should be safe to
-	# use wildcard.
-	doins -r 2gis/3.0/* || die
+	# Only attempt to install any data if the user has enabled at least
+	# one useflag.
+	if [ -d 2gis/3.0 ]; then
+		# Only required data files were unpacked, so it should be safe
+		# to use wildcard.
+		doins -r 2gis/3.0/* || die
+	fi
 }
diff --git a/app-misc/2gis-data/ChangeLog b/app-misc/2gis-data/ChangeLog
index 3461a9b9c..e5e188cca 100644
--- a/app-misc/2gis-data/ChangeLog
+++ b/app-misc/2gis-data/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*2gis-data-2010.10 (01 Oct 2010)
+
+  01 Oct 2010; Nathan Phillip Brink (ohnobinki)
+  <ohnobinki@ohnopublishing.net> -2gis-data-2010.6-r1.ebuild,
+  +2gis-data-2010.10.ebuild, metadata.xml:
+  Version bump to 2gis-data-2010.10 per oper777's request. Adds 6 new maps.
+
 *2gis-data-2010.6-r1 (03 Jul 2010)
 
   03 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
diff --git a/app-misc/2gis-data/metadata.xml b/app-misc/2gis-data/metadata.xml
index 39d9c04fe..46da259da 100644
--- a/app-misc/2gis-data/metadata.xml
+++ b/app-misc/2gis-data/metadata.xml
@@ -9,12 +9,15 @@
 		<flag name='biysk'>The map of Biysk for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='chel'>The map of Chelyabinsk for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='ekb'>The map of Ekaterinburg for <pkg>app-misc/2gis</pkg></flag>
+		<flag name='galt'>The map of Gornoaltaysk for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='irk'>The map of Irkutsk for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='kaz'>The map of Kazan for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='kdar'>The map of Krasnodar for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='kem'>The map of Kemerovo for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='kras'>The map of Krasnoyarsk for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='kur'>The map of Kurgan for <pkg>app-misc/2gis</pkg></flag>
+		<flag name='magn'>The map of Magnitogorsk for <pkg>app-misc/2gis</pkg></flag>
+		<flag name='nchl'>The map of Nabchelny for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='nkuz'>The map of Novokuznetsk for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='nnov'>The map of N_Novgorod for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='nsk'>The map of Novosibirsk for <pkg>app-misc/2gis</pkg></flag>
@@ -24,9 +27,12 @@
 		<flag name='perm'>The map of Perm for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='rost'>The map of Rostov-na-Donu for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='sam'>The map of Samara for <pkg>app-misc/2gis</pkg></flag>
+		<flag name='sochi'>The map of Sochi for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='tim'>The map of Tyumen for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='tom'>The map of Tomsk for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='vlad'>The map of Vladivostok for <pkg>app-misc/2gis</pkg></flag>
+		<flag name='vrnz'>The map of Voronezh for <pkg>app-misc/2gis</pkg></flag>
 		<flag name='ufa'>The map of Ufa for <pkg>app-misc/2gis</pkg></flag>
+		<flag name='yar'>The map of Yaroslavl for <pkg>app-misc/2gis</pkg></flag>
 	</use>
 </pkgmetadata>
-- 
2.43.2