From f866bc1dcae01b87a93812f92c11d2eec0eb63d1 Mon Sep 17 00:00:00 2001
From: Andreas Proschofsky <suka@gentoo.org>
Date: Sun, 21 Feb 2010 13:17:02 +0000
Subject: Bump Emerillon to release 0.1.1

svn path=/; revision=190
---
 app-misc/emerillon/Manifest               |  6 ++---
 app-misc/emerillon/emerillon-0.1.0.ebuild | 29 ----------------------
 app-misc/emerillon/emerillon-0.1.1.ebuild | 34 ++++++++++++++++++++++++++
 app-misc/emerillon/emerillon-9999.ebuild  | 40 -------------------------------
 app-misc/emerillon/files/fixlibrest.patch | 12 ++++++++++
 5 files changed, 49 insertions(+), 72 deletions(-)
 delete mode 100644 app-misc/emerillon/emerillon-0.1.0.ebuild
 create mode 100644 app-misc/emerillon/emerillon-0.1.1.ebuild
 delete mode 100644 app-misc/emerillon/emerillon-9999.ebuild
 create mode 100644 app-misc/emerillon/files/fixlibrest.patch

(limited to 'app-misc')

diff --git a/app-misc/emerillon/Manifest b/app-misc/emerillon/Manifest
index a3961d5..3927f85 100644
--- a/app-misc/emerillon/Manifest
+++ b/app-misc/emerillon/Manifest
@@ -1,3 +1,3 @@
-DIST emerillon-0.1.0.tar.bz2 314078 RMD160 0fccc52494f70c1114a9f61a3ad35f555075712f SHA1 e7ab1a375193b8e55522061f401a8a377245dd9a SHA256 db65fdd974a6e30021a1ec8a9e91d1060c0d375b24d4623bb10a956cd5314fe3
-EBUILD emerillon-0.1.0.ebuild 603 RMD160 3a139c0ab13be32d57dd0f63cd8a3cf8de3bc584 SHA1 11cef894d2c28f47700513141d6b1b0dee8100a7 SHA256 ade410edffac25d9083153aa60fddd232eddef050a34418af54f6c97bc4704ea
-EBUILD emerillon-9999.ebuild 796 RMD160 adc6a640425f0e4840e7c0df0c1640f8b3e50923 SHA1 5e3477b8ca8ae6216f240f89b3ce4a65bb98a0bf SHA256 609291c21cf7883c30723de910353037bc2a7cda7b74f34abd4d565f534ef0f3
+AUX fixlibrest.patch 184 RMD160 c7a1cdddc9f036eebb081b084c12a81ae1aed8df SHA1 a0232a10a760374f043ef22b02f6a3b2b96a5db3 SHA256 0759e1217a005f086b26437492556d088954af9240b3fa0ca78af4908bde0fac
+DIST emerillon-0.1.1.tar.bz2 321758 RMD160 39a49108c75fa42122af73531bcf76e86b53e2c6 SHA1 62d1f3ccf64e74b5e146fd1ad0e6ccf9c8e1eb07 SHA256 5cae4d9f560ea6677b1e1dba04bb26fb7b3b3d6012fa49eacb19866d05adef29
+EBUILD emerillon-0.1.1.ebuild 689 RMD160 a2d5cfb96128b79d58ae47f910dcfb7264981fa0 SHA1 cdf498419f94ebe08b4bb872bd2bd70f89f78dc6 SHA256 830a6f996c1483cd7d0b964f0129e0fef7a74aee025eada3dacd0cc2ead0a3a0
diff --git a/app-misc/emerillon/emerillon-0.1.0.ebuild b/app-misc/emerillon/emerillon-0.1.0.ebuild
deleted file mode 100644
index 58f78e1..0000000
--- a/app-misc/emerillon/emerillon-0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="GNOME-based Map viewer, using Open Street Maps"
-HOMEPAGE="http://www.novopia.com/emerillon/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.12.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2.5.90
-	>=media-libs/libchamplain-0.4
-	>=gnome-extra/geoclue-0.11.1
-	>=dev-libs/ethos-0.2
-	>=dev-libs/librest-0.6"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS NEWS README"
-
diff --git a/app-misc/emerillon/emerillon-0.1.1.ebuild b/app-misc/emerillon/emerillon-0.1.1.ebuild
new file mode 100644
index 0000000..57f7cb8
--- /dev/null
+++ b/app-misc/emerillon/emerillon-0.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="GNOME-based Map viewer, using Open Street Maps"
+HOMEPAGE="http://www.novopia.com/emerillon/"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.12.0
+	>=x11-libs/gtk+-2.12.0
+	>=gnome-base/gconf-2.5.90
+	>=media-libs/libchamplain-0.4
+	>=gnome-extra/geoclue-0.11.1
+	>=dev-libs/ethos-0.2
+	>=dev-libs/librest-0.6"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS NEWS README"
+
+src_prepare() {
+
+	epatch ${FILESDIR}/fixlibrest.patch
+	eautoreconf
+}
diff --git a/app-misc/emerillon/emerillon-9999.ebuild b/app-misc/emerillon/emerillon-9999.ebuild
deleted file mode 100644
index 64b0285..0000000
--- a/app-misc/emerillon/emerillon-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools gnome2 git
-
-EGIT_REPO_URI="git://git.gnome.org/emerillon"
-
-DESCRIPTION="GNOME-based Map viewer, using Open Street Maps"
-HOMEPAGE="http://www.novopia.com/emerillon/"
-SRC_URI=""
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.12.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2.5.90
-	>=media-libs/libchamplain-0.4
-	>=gnome-extra/geoclue-0.11.1
-	>=dev-libs/ethos-0.2
-	>=dev-libs/librest-0.6"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS NEWS README"
-
-S=${WORKDIR}/trunk
-
-src_unpack() {
-	git_src_unpack
-	cd ${S}
-	intltoolize --force --copy --automake || die
-	eautoreconf
-}
diff --git a/app-misc/emerillon/files/fixlibrest.patch b/app-misc/emerillon/files/fixlibrest.patch
new file mode 100644
index 0000000..463f6dc
--- /dev/null
+++ b/app-misc/emerillon/files/fixlibrest.patch
@@ -0,0 +1,12 @@
+--- configure.ac 
++++ configure.ac 
+@@ -103,7 +103,7 @@
+   AC_SUBST(SEARCH_DEPS_LIBS)
+   PKG_CHECK_MODULES(SEARCH_DEPS,
+     [
+-      rest-0.6 >= 0.6
++      rest >= 0.6
+     ]
+   )
+ 
+
-- 
cgit v1.2.3-65-gdbad