Create new snapshot from today and add live version.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

4 files changed, 104 insertions, 61 deletions

diff --git a/sci-geosciences/openstreetmap-icons/ChangeLog b/sci-geosciences/openstreetmap-icons/ChangeLog
index c114942ab27c..fca008d389ad 100644
--- a/sci-geosciences/openstreetmap-icons/ChangeLog
+++ b/sci-geosciences/openstreetmap-icons/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/openstreetmap-icons
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/ChangeLog,v 1.6 2009/08/22 23:22:34 nerdboy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/ChangeLog,v 1.7 2011/06/01 12:17:47 scarabeus Exp $
+
+*openstreetmap-icons-99999999 (01 Jun 2011)
+*openstreetmap-icons-20110601 (01 Jun 2011)
+
+  01 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -openstreetmap-icons-20090616.ebuild, +openstreetmap-icons-20110601.ebuild,
+  +openstreetmap-icons-99999999.ebuild:
+  Create new snapshot from today and add live version.
 
   22 Aug 2009; Steve Arnold <nerdboy@gentoo.org>
   openstreetmap-icons-20090616.ebuild:
diff --git a/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild b/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild
deleted file mode 100644
index d99db6d5ed3d..000000000000
--- a/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20090616.ebuild,v 1.6 2009/08/22 23:22:34 nerdboy Exp $
-
-EAPI=2
-
-inherit cmake-utils
-
-DESCRIPTION="openstreetmap icons"
-HOMEPAGE="http://www.openstreetmap.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-perl/ImageInfo
-	media-gfx/imagemagick[perl]
-	dev-perl/File-Slurp
-	dev-perl/DBD-SQLite
-	dev-perl/XML-Twig"
-
-RDEPEND=""
-
-S=${WORKDIR}/${P}/map-icons
-
-src_compile() {
-	cmake-utils_src_compile
-	cp icons.* ${CMAKE_BUILD_DIR}
-	cd ${CMAKE_BUILD_DIR}
-	perl "${S}"/tools/create_geoinfo-db.pl --lang=en --source=icons.xml \
-	    || die "create en geoinfo-db failed"
-	perl "${S}"/tools/create_geoinfo-db.pl --lang=de --source=icons.xml \
-	    || die "create de geoinfo-db failed"
-}
-
-# tar.bz2 generated extracting files from
-# http://svn.openstreetmap.org/applications/share/map-icons
-src_install() {
-	insinto /usr/share/osm
-	cd ../map-icons_build
-	doins -r icons.* *.small *.big || die "Install icons failed"
-	doins geoinfo.* || die "Install db failed"
-}
-
-pkg_postinst() {
-	elog
-	elog "Non-fatal errors are expected on a handful of .svg files,"
-	elog "and the cause is currently unknown.  File a bug only if"
-	elog "you have a runtime problem and/or more useful information."
-	elog
-	elog "This version also installs the icons in a more appropriate"
-	elog "location, so if you have an existing gpsdrive install, you"
-	elog "should probably update your ~/.gpsdrive/gpsdriverc file"
-	elog "and change the path to the geoinfofile to reflect this:"
-	elog "   geoinfofile = /usr/share/osm/geoinfo.db"
-	elog
-}
diff --git a/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20110601.ebuild b/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20110601.ebuild
new file mode 100644
index 000000000000..6506037da04e
--- /dev/null
+++ b/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20110601.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/openstreetmap-icons-20110601.ebuild,v 1.1 2011/06/01 12:17:47 scarabeus Exp $
+
+EAPI=4
+
+ESVN_REPO_URI="http://svn.openstreetmap.org/applications/share/map-icons/"
+[[ ${PV} == 99999999 ]] && EVCS_ECLASS=subversion
+# tar.bz2 generated extracting files from above SVN repo
+inherit cmake-utils ${EVCS_ECLASS}
+unset EVCS_ECLASS
+
+DESCRIPTION="openstreetmap icons"
+HOMEPAGE="http://www.openstreetmap.org/"
+[[ ${PV} == 99999999 ]] || SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+[[ ${PV} == 99999999 ]] || KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-perl/ImageInfo
+	media-gfx/imagemagick[perl]
+	dev-perl/File-Slurp
+	dev-perl/DBD-SQLite
+	dev-perl/XML-Twig"
+
+RDEPEND=""
+
+S="${WORKDIR}/map-icons/"
+
+src_compile() {
+	cmake-utils_src_compile
+	cp icons.* "${CMAKE_BUILD_DIR}"
+	cd "${CMAKE_BUILD_DIR}"
+	perl "${S}"/tools/create_geoinfo-db.pl --lang=en --source=icons.xml \
+	    || die "create en geoinfo-db failed"
+	perl "${S}"/tools/create_geoinfo-db.pl --lang=de --source=icons.xml \
+	    || die "create de geoinfo-db failed"
+}
+
+src_install() {
+	cd "${CMAKE_BUILD_DIR}"
+	insinto /usr/share/osm
+	doins -r icons.* *.small *.big
+	doins geoinfo.*
+}
diff --git a/sci-geosciences/openstreetmap-icons/openstreetmap-icons-99999999.ebuild b/sci-geosciences/openstreetmap-icons/openstreetmap-icons-99999999.ebuild
new file mode 100644
index 000000000000..ab07bd1cb1b5
--- /dev/null
+++ b/sci-geosciences/openstreetmap-icons/openstreetmap-icons-99999999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/openstreetmap-icons/openstreetmap-icons-99999999.ebuild,v 1.1 2011/06/01 12:17:46 scarabeus Exp $
+
+EAPI=4
+
+ESVN_REPO_URI="http://svn.openstreetmap.org/applications/share/map-icons/"
+[[ ${PV} == 99999999 ]] && EVCS_ECLASS=subversion
+# tar.bz2 generated extracting files from above SVN repo
+inherit cmake-utils ${EVCS_ECLASS}
+unset EVCS_ECLASS
+
+DESCRIPTION="openstreetmap icons"
+HOMEPAGE="http://www.openstreetmap.org/"
+[[ ${PV} == 99999999 ]] || SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+[[ ${PV} == 99999999 ]] || KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-perl/ImageInfo
+	media-gfx/imagemagick[perl]
+	dev-perl/File-Slurp
+	dev-perl/DBD-SQLite
+	dev-perl/XML-Twig"
+
+RDEPEND=""
+
+S="${WORKDIR}/map-icons/"
+
+src_compile() {
+	cmake-utils_src_compile
+	cp icons.* "${CMAKE_BUILD_DIR}"
+	cd "${CMAKE_BUILD_DIR}"
+	perl "${S}"/tools/create_geoinfo-db.pl --lang=en --source=icons.xml \
+	    || die "create en geoinfo-db failed"
+	perl "${S}"/tools/create_geoinfo-db.pl --lang=de --source=icons.xml \
+	    || die "create de geoinfo-db failed"
+}
+
+src_install() {
+	cd "${CMAKE_BUILD_DIR}"
+	insinto /usr/share/osm
+	doins -r icons.* *.small *.big
+	doins geoinfo.*
+}