Create new snapshot from today and add live version.

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

5 files changed, 118 insertions, 64 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/Manifest b/sci-geosciences/openstreetmap-icons/Manifest
index fa49f326ec51..e4a516f48332 100644
--- a/sci-geosciences/openstreetmap-icons/Manifest
+++ b/sci-geosciences/openstreetmap-icons/Manifest
@@ -1,4 +1,15 @@
-DIST openstreetmap-icons-20090616.tar.bz2 2207156 RMD160 5a7ad79db1d0ca326cd51119a06361540bd9cfc7 SHA1 706a7881f274969baf4c3bf9212daf8c9c3fb686 SHA256 e1397d7ecb04335eaaa6160f61d84078840a3e13eeaa3de090fe26de8e09f3ff
-EBUILD openstreetmap-icons-20090616.ebuild 1774 RMD160 e760eb55558dc7c5332c12a82fdbbf3d4b894230 SHA1 2adc7a42d76e89caacbb7d77e8298613592d6485 SHA256 2d0a909490e35c98ea6faf9ba0d73a3c06d10662debf0e5edaf52274cd1b92df
-MISC ChangeLog 1270 RMD160 1924017961f2dd64448840568cc6e3ff9428505d SHA1 9b7a6f8278106cfa3a4b4576f43d23d99f1e1ade SHA256 3ed352ad4c72afb365d0cae1315b7af0c61d993510e3c719ff9ce369f9ccca9b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST openstreetmap-icons-20110601.tar.xz 1870716 RMD160 07647022c8d2e94de96233f0cb69f3bdd89af0e4 SHA1 55604ea341c31e7d58a4d77fbb07186fdb86d49c SHA256 3fe72d1ba1a88c102aeeaa65e542e4a7fa1ba954778b538d4ba44dbed6505ec3
+EBUILD openstreetmap-icons-20110601.ebuild 1358 RMD160 23c41f6aba69b36e335b89c81325c120ced6cc2f SHA1 ea618843260eae388ed2215480a9dfb397d036bd SHA256 de928cab50346b52bb8c0c37e2d8b1508b53e5d799ac09f35e64dd20d70bcdf4
+EBUILD openstreetmap-icons-99999999.ebuild 1358 RMD160 8342da28feee3aae61391559e864ddf94e495890 SHA1 2c1197461d638ae829a025421c250df1443a567c SHA256 6d5b74be76305f4ac2b3bc9223dd85af7ee94362cac76f13b6da963cc5c134af
+MISC ChangeLog 1590 RMD160 4082be7951fbb9da86f2e02c0c45edb52e319645 SHA1 0cbedfac68a580906374069beb5907d8193e8106 SHA256 abbca1bf4b8a6002744c3eea230201ad1e0fd5ba1b459e9b0439af8b6b76281a
 MISC metadata.xml 328 RMD160 adf0588ea8641b51c6b9ee17491bdb0f9695ae12 SHA1 3fd8c69098a42e95fc226d3ad536bb4055fa46a4 SHA256 e7c7bf7d172251192430b7435291c86d294819f7b48af5fb3e5e880eac08331b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3mLeIACgkQHB6c3gNBRYfVHQCffqbhnEBMxuKtdo3CvQv1N+8y
+ymgAoIIYS0s4H8caFZ/NxtAQaT1vpP+4
+=ptoQ
+-----END PGP SIGNATURE-----
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.*
+}