From 08c51a50b5f4e29832ead4a4a272d951c5cf5b4c Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Sun, 11 Jul 2010 07:36:06 +0000 Subject: [PATCH] fix bug 326981 by flameeyes: Fix the file name of the pkg-config file in the configure script for libchamplain; also adjust runtime dependencies as spotted by ssuominen in the same bug Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- mail-client/claws-mail-geolocation/ChangeLog | 8 +++++++- mail-client/claws-mail-geolocation/Manifest | 12 +++++------ .../claws-mail-geolocation-0.0.3.ebuild | 20 ++++++++++++++++--- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/mail-client/claws-mail-geolocation/ChangeLog b/mail-client/claws-mail-geolocation/ChangeLog index 2adef2335102..c8835dc80db2 100644 --- a/mail-client/claws-mail-geolocation/ChangeLog +++ b/mail-client/claws-mail-geolocation/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/claws-mail-geolocation # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-geolocation/ChangeLog,v 1.2 2010/06/22 08:04:46 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-geolocation/ChangeLog,v 1.3 2010/07/11 07:36:06 fauli Exp $ + + 11 Jul 2010; Christian Faulhammer + claws-mail-geolocation-0.0.3.ebuild: + fix bug 326981 by flameeyes: Fix the file name of the pkg-config file in + the configure script for libchamplain; also adjust runtime dependencies as + spotted by ssuominen in the same bug 22 Jun 2010; Christian Faulhammer claws-mail-geolocation-0.0.3.ebuild: diff --git a/mail-client/claws-mail-geolocation/Manifest b/mail-client/claws-mail-geolocation/Manifest index 9d949c2e315b..1417c9536f9f 100644 --- a/mail-client/claws-mail-geolocation/Manifest +++ b/mail-client/claws-mail-geolocation/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST geolocation_plugin-0.0.3.tar.gz 354349 RMD160 a9003672246245db0e34bd2bba80134300dbd85f SHA1 8d33e876d82c90dda636b409b2d269cc98cb3452 SHA256 201f5e10f3d7399aae75b428c3f6c247b90062695ea305c45d2a0d29994c9aa7 -EBUILD claws-mail-geolocation-0.0.3.ebuild 722 RMD160 7f0109a625cbc1cd7065e85784ed427e08581948 SHA1 632d7d261a6df7b11967a4144c5ba250889bc42e SHA256 e8a48ade54654ae4011aa57be3c9917a9199e82e845564bab203cf05cd20813c -MISC ChangeLog 610 RMD160 95fe5c55d68344636748f1f07b7c774ca4adffd4 SHA1 14e48ff1aef247a77196b51e89b13230afd2ae97 SHA256 7a1ff0e22f73beebb47fcb64f27676223128c33bf0ae72b7b5b641b9fb5bae66 +EBUILD claws-mail-geolocation-0.0.3.ebuild 1031 RMD160 aa1fa9204493d1e38519038cb9c06491068057d6 SHA1 28233957f923dba6ae33247d77973a6fefd87a2d SHA256 85e802aad5ef502db1dd3cedce6ec626c219742d198f858a68cf5ecbf11f38f4 +MISC ChangeLog 896 RMD160 6c935d801d8a21e5a27ea468cd0cabb89129b7b4 SHA1 2c5fa84494383e4fba2f42bd3ecb79fbea6c9253 SHA256 4fed887e8fd8e865667e4e17492f0049b39dd328f11bf6c34770aaf8fe1bef60 MISC metadata.xml 360 RMD160 7920ed280d15221eb0ffeb146c46481217c52087 SHA1 8976b5970f041847569731ebdc091ce0dc512b3a SHA256 fa45d98c4738cc095b45028ffabf31fc70c553c9075b6c53ca931237666ef19e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwgbswACgkQNQqtfCuFneMiYgCfXXeN3eYKYnQhPcD8ejG3hFk7 -5xkAn1tDhpYjed1OoBf7p4YufxnAhOKX -=JhLs +iEYEARECAAYFAkw5dNMACgkQNQqtfCuFneOaGwCfVfGTUsSm+YtHogsHyYUxo2O4 +5PgAn1NYOtENPpOWH2Fi0WB1RSuOBSG1 +=Ztrk -----END PGP SIGNATURE----- diff --git a/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.3.ebuild b/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.3.ebuild index fc9eee4095bb..a01f38114cc5 100644 --- a/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.3.ebuild +++ b/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.3.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.3.ebuild,v 1.2 2010/06/22 08:04:46 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.3.ebuild,v 1.3 2010/07/11 07:36:06 fauli Exp $ EAPI=2 +inherit autotools + MY_P="geolocation_plugin-${PV}" DESCRIPTION="GeoLocation functionality for Claws Mail" @@ -14,12 +16,24 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=mail-client/claws-mail-3.7.6" + +# Check if other versions of libchamplain ship the same pc file +RDEPEND=">=mail-client/claws-mail-3.7.6 + =media-libs/libchamplain-0.6*[gtk] + sys-devel/gettext" + DEPEND="${RDEPEND} - >=media-libs/libchamplain-0.4.0[gtk]" + dev-util/pkgconfig" S="${WORKDIR}/${MY_P}" +src_prepare() { + # geolocation checks for the exact version, so fix the code + # see bug 326981 + sed -e "s:champlain-gtk-0.4:champlain-gtk-0.6:" -i "${S}"/configure.ac || die + eautoconf +} + src_install() { emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog NEWS README -- 2.26.2