Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 464820 - sci-geosciences/osm2pgsql-99999999 changed source from svn to git
Summary: sci-geosciences/osm2pgsql-99999999 changed source from svn to git
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Sci-geo Project
URL: https://github.com/openstreetmap/osm2...
Whiteboard:
Keywords: EBUILD, PATCH
Depends on:
Blocks:
 
Reported: 2013-04-06 09:36 UTC by quazgar
Modified: 2013-04-12 07:47 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
new ebuild (osm2pgsql-99999999.ebuild,710 bytes, text/plain)
2013-04-06 09:37 UTC, quazgar
Details
Newer ebuild (osm2pgsql-99999999.ebuild,746 bytes, text/plain)
2013-04-07 22:07 UTC, quazgar
Details

Note You need to log in before you can comment on or make changes to this bug.
Description quazgar 2013-04-06 09:36:06 UTC
sci-geosciences/osm2pgsql changed its VCS from svn to git,, it is now hosted at github.  The attached ebuild works for me, while the old one won't find the svn repository any more.

Reproducible: Always
Comment 1 quazgar 2013-04-06 09:37:23 UTC
Created attachment 344612 [details]
new ebuild

The patch leading to this ebuild:

--- /usr/portage/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild	2012-05-24 18:31:25.000000000 +0200
+++ osm2pgsql-99999999.ebuild	2013-04-06 11:35:18.000000000 +0200
@@ -4,10 +4,10 @@
 
 EAPI=4
 
-inherit autotools subversion
+inherit autotools git
+
+EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
 
-ESVN_REPO_URI="http://svn.openstreetmap.org/applications/utils/export/${PN}/"
-ESVN_PROJECT="${PN}"
 
 DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
@@ -31,6 +31,5 @@
 DOCS=( README 900913.sql )
 
 src_prepare() {
-	esvn_clean
 	eautoreconf
 }
Comment 2 Raphaël Droz 2013-04-06 16:35:34 UTC
Other than:
> * git.eclass is deprecated.
> * Please update your ebuilds to use git-2 instead. For details, see
> * http://archives.gentoo.org/gentoo-dev/msg_b7ba363cae580845819ae3501fb157e9.xml

and the fact that:
> dev-libs/protobuf-c and dev-libs/protobuf
are highly recommended to import PBF files,

... the code inside the git repository compiles fine.
Comment 3 quazgar 2013-04-07 22:07:47 UTC
Created attachment 344768 [details]
Newer ebuild

(In reply to comment #2)
> > * Please update your ebuilds to use git-2 instead.

> > dev-libs/protobuf-c and dev-libs/protobuf

Thanks for the hints, I switched to git-2 (actually I was wondering whether to use git or git-2, maybe this could be mentioned in its manpage? http://devmanual.gentoo.org/eclass-reference/git-2.eclass/index.html) and incorporated the changes from bug #427668.

Still compiles here.
Comment 4 Jeroen Roovers (RETIRED) gentoo-dev 2013-04-08 11:24:17 UTC
Comment on attachment 344768 [details]
Newer ebuild

--- osm2pgsql-99999999.ebuild   2012-05-29 02:39:23.000000000 +0200
+++ -   2013-04-08 13:24:08.235763824 +0200
@@ -4,10 +4,10 @@
 
 EAPI=4
 
-inherit autotools subversion
+inherit autotools git-2
+
+EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
 
-ESVN_REPO_URI="http://svn.openstreetmap.org/applications/utils/export/${PN}/"
-ESVN_PROJECT="${PN}"
 
 DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
@@ -16,7 +16,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+pbf"
 
 DEPEND="
        app-arch/bzip2
@@ -25,12 +25,12 @@
        sci-libs/proj
        sys-libs/zlib
        dev-db/postgresql-base
+       pbf? ( dev-libs/protobuf-c )
 "
 RDEPEND="${DEPEND}"
 
 DOCS=( README 900913.sql )
 
 src_prepare() {
-       esvn_clean
        eautoreconf
 }
Comment 5 Sven Wegener gentoo-dev 2013-04-12 07:47:33 UTC
I've commited it, because I need this one too.