diff options
| author |   Michael Groh (brot) <schnitzelkuchen@googlemail.com> | 2009-08-20 16:58:56 +0000 |
|---|---|---|
| committer | Michael Groh (brot) <schnitzelkuchen@googlemail.com> | 2009-08-20 16:58:56 +0000 |
| commit | 0735c234eb468c4e3c774f2dfe3a583c19b96d02 (patch) | |
| tree | ccc7d1c5b9efa020be4616483f2d1ed98d3b54bc /app-misc | |
| parent | Automatic update to use.local.desc (diff) | |
| download | sunrise-0735c234eb468c4e3c774f2dfe3a583c19b96d02.tar.gz sunrise-0735c234eb468c4e3c774f2dfe3a583c19b96d02.tar.bz2 sunrise-0735c234eb468c4e3c774f2dfe3a583c19b96d02.zip | |
app-misc/navit: Changed to EAPI 2 to add the svg useflag, so the internal GUI works again. Thanks to ohnobinki for the help :)
svn path=/sunrise/; revision=9085
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/navit/ChangeLog | 5 | ||||
| -rw-r--r-- | app-misc/navit/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/navit/navit-9999.ebuild | 29 |
3 files changed, 28 insertions, 10 deletions
diff --git a/app-misc/navit/ChangeLog b/app-misc/navit/ChangeLog index ca3d0c4bf..442bb599f 100644 --- a/app-misc/navit/ChangeLog +++ b/app-misc/navit/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 20 Aug 2009; Michael Groh (brot) <schnitzelkuchen@googlemail.com> + navit-9999.ebuild: + Changed to EAPI 2 to add the svg useflag, so the internal GUI works again. + Thanks to ohnobinki for the help :) + 07 Aug 2009; Michael Groh (brot) <schnitzelkuchen@googlemail.com> navit-9999.ebuild: dev-util/cvs added to DEPEND diff --git a/app-misc/navit/Manifest b/app-misc/navit/Manifest index 7e2dd36d2..820548954 100644 --- a/app-misc/navit/Manifest +++ b/app-misc/navit/Manifest @@ -1,3 +1,3 @@ -EBUILD navit-9999.ebuild 1374 RMD160 3294bac51c113390c9965c97054742bbbafe03a3 SHA1 81ac5056497783145c73dc87a531da8032cfd30d SHA256 0d03863a01823ed342815127e366b2c362ff9d940db67e62369c94969034ca9a -MISC ChangeLog 1082 RMD160 3e016697aebc424824dcf7dee4b3cebb0f08e760 SHA1 b0ad292ab5c81a3ceb55297935204d1bf4e96cd4 SHA256 d57ec7ab554c025141676cd16116dafef8958c03585bdd2a7131d2d48af681b9 +EBUILD navit-9999.ebuild 1629 RMD160 8b2757a29d6627125f755cf449921c79f6d047f5 SHA1 1abd5d138aa6ac0d078d3067b24d3cf4333b0c14 SHA256 775aa16e9c40389b0a9a5086a67c320d68086cc94a7337a666aa6e3d37fe4ba1 +MISC ChangeLog 1287 RMD160 1ff720dfcf320a8be73b6b847583d5b51d59a035 SHA1 bdc797fd067722fd9436668eb60dd8e3a01cb9bd SHA256 ed8345bf53ebd01d5219971be72c4f6cf06c4f4e64bc16835a968ac6b468e52e MISC metadata.xml 349 RMD160 221c11be5e047af67abb16d7158e0808a69d7a49 SHA1 f2f3f4ebf4d168e3f317cb83a6324ecb4473a6fe SHA256 1eb8ca1eda615a78d37a5ee02be18ad8ad8392ea7cf02ff7bc7147c73bd1d991 diff --git a/app-misc/navit/navit-9999.ebuild b/app-misc/navit/navit-9999.ebuild index 2a72eda09..a0f1e3ea6 100644 --- a/app-misc/navit/navit-9999.ebuild +++ b/app-misc/navit/navit-9999.ebuild @@ -2,17 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="1" +EAPI="2" inherit autotools subversion -DESCRIPTION="An open-source car navigation system with a routing engine." +DESCRIPTION="An open-source car navigation system with a routing engine" HOMEPAGE="http://www.navit-project.org" SRC_URI="" LICENSE="LGPL-2" SLOT="0" KEYWORDS="" -IUSE="dbus garmin gps gtk nls python sdl speechd" +IUSE="dbus garmin gps gtk nls python sdl speechd svg" RDEPEND="dev-libs/glib:2 garmin? ( dev-libs/libgarmin ) @@ -29,17 +29,30 @@ RDEPEND="dev-libs/glib:2 DEPEND="${RDEPEND} dev-util/pkgconfig - dev-util/cvs" + dev-util/cvs + svg? ( || ( gnome-base/librsvg media-gfx/imagemagick[png,svg] ) )" ESVN_REPO_URI="http://navit.svn.sourceforge.net/svnroot/navit/trunk/navit" -src_unpack() { - subversion_src_unpack +src_prepare() { autopoint -f || die "autopoint failed" eautoreconf } -src_compile() { +src_configure() { + + local myconf + + if use svg; then + if has_version gnome-base/librsvg; then + myconf="--with-svg2png-use-rsvg-convert" + else + myconf="--with-svg2png-use-convert" + fi + else + myconf="--disable-svg2png" + fi + econf $(use_enable garmin) \ $(use_enable gps libgps) \ $(use_enable gtk gui-gtk) \ @@ -50,7 +63,7 @@ src_compile() { $(use_enable speechd speech-speechd) \ --disable-graphics-qt-painter \ --disable-samplemap \ - --disable-svg2png + ${myconf} emake || die "Make failed" } |