Add patch for correct linking with USE=vala, thanks Attila Tóth finding the patch...

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

diff --git a/media-libs/memphis/ChangeLog b/media-libs/memphis/ChangeLog
index ff1c41a69ca67e6c90775f09cc55503662ab7bdd..a91507d0d6fc163f174617abdeb5dc322407eded 100644 (file)
--- a/media-libs/memphis/ChangeLog
+++ b/media-libs/memphis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/memphis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.9 2011/07/14 11:02:33 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.10 2011/12/17 14:13:39 jlec Exp $
+
+  17 Dec 2011; Justin Lecher <jlec@gentoo.org> memphis-0.2.3.ebuild,
+  +files/memphis-0.2.3-link_gobject.patch:
+  Add patch for correct linking with USE=vala, thanks Attila Tóth finding the
+  patch, #394945; moved to autotools-utils.eclass in order to handle .a/.la
+  files correctly
 
   14 Jul 2011; Thomas Kahle <tomka@gentoo.org> memphis-0.2.3.ebuild:
   x86 stable per bug 369909

diff --git a/media-libs/memphis/Manifest b/media-libs/memphis/Manifest
index 1d347c67e51bf1cdb87544f48aed1ae5dce2b0e7..b8bec4483168b5f5434073855b44a906721b1d2a 100644 (file)
--- a/media-libs/memphis/Manifest
+++ b/media-libs/memphis/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX memphis-0.2.3-demos.patch 405 RMD160 af121163c40d1a3bc23097f77718ed9eb44fcaa2 SHA1 dbe38e3461487f10f4466b773d32f7ef78a3a5df SHA256 38b09ebf9c3e23a5e4012364f585eeb954f3f22b8f80f6938b8540b6f35a94e9
+AUX memphis-0.2.3-link_gobject.patch 350 RMD160 c9141ddccfab4b88037dd08429afd87e13da622d SHA1 5f44196c3ab5a488658211554160073843e2e5ce SHA256 80a59bb3219e018102a04f43b562a89f0af609d281ceab946dac97a617bf48c8
 DIST memphis-0.2.3.tar.gz 459423 RMD160 df6685fa2854cf0bc8bf2d52f2403e0cf2752186 SHA1 a2f287ae7a28554833269f59de17d0054ad01ebf SHA256 c1cc050938ee34400197489bc9c110cc4c7c03c73780087b8cdd83a148b0e69b
-EBUILD memphis-0.2.3.ebuild 1029 RMD160 74a683fe5125708eaf01bc32abdcfc50bc02ab94 SHA1 701a66b969f12f024c3f31416f3d92deaee40feb SHA256 246d88d38eab37456a77809a4955efcaa5eb4304257f675c500f14fc9cb08b83
-MISC ChangeLog 1419 RMD160 ed48df7bcfad1834f2a2b87330338b8dd1f8222b SHA1 9e18ac43a12b148a54e47fe6315fd3cda5bcd7fb SHA256 671c6de8010915b93aa0885a77b823c9ae3b15cb697b66403231d8ee4e230e8b
+EBUILD memphis-0.2.3.ebuild 1206 RMD160 a327fb7eef236f99989445f01f462c30b2323109 SHA1 ffc48344d732dc95359adaaf1625c432af79c26c SHA256 7ad9ea6cb4648a2134f1ecaeb42d282c216b9b06869f82aaeefeb9b9d985a3a5
+MISC ChangeLog 1705 RMD160 5ab072ba1129e211f02f089cc4db7b45f8f6b221 SHA1 f95073912a2b0a572b462c1b5cc38d45dbb71e19 SHA256 3b535cb827ad47c3fce4909e94bb635b358a2433c87f8538877acce4281e7fa7
 MISC metadata.xml 349 RMD160 70b62c03074e5c57c978611825a7c5dac5742a8c SHA1 fdf233d14f2d3e3a0a60257083f05cbbae4c9b89 SHA256 fa2a5c2f1969ed0ab342e8f083d004aeebab884e48156232ef8a559a6ee8accc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59pdkACgkQfXuS5UK5QB1XwwP+MatHSByGum1osRAGKj0PsbH5
-H7iwjxEqTODZXHOOAQXaPz5U6fPkrCs1JKBnd4BRLQN2V6yMcr96d6gRyGwVfYmo
-oYynZvmFoTnWxSc3dxZt3EWL4JTzKYRXQzVULX1ssHY1HZbEwVsyMbjJOxwu9eTb
-oheP+3HDb/cib/JU5Rk=
-=pagb
+iEYEAREKAAYFAk7so54ACgkQgAnW8HDreRbC2wCfWSV2bzEIDg6d9V4IB/e5191i
+SYsAn2A/s1cgmHmt9CniQ/PIPrj97hmv
+=XJ2o
 -----END PGP SIGNATURE-----

diff --git a/media-libs/memphis/files/memphis-0.2.3-link_gobject.patch b/media-libs/memphis/files/memphis-0.2.3-link_gobject.patch
new file mode 100644 (file)
index 0000000..231c834
--- /dev/null
+++ b/media-libs/memphis/files/memphis-0.2.3-link_gobject.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,7 +89,7 @@
+     exit 0;
+   fi
+   VALA_EXAMPLE_PACKAGES="--pkg cairo --pkg memphis-0.2"
+-  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0, cairo])
++  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0 gobject-2.0 cairo])
+   AC_SUBST(VALA_EXAMPLE_CFLAGS)
+   AC_SUBST(VALA_EXAMPLE_LIBS)
+   AC_SUBST(VALA_EXAMPLE_PACKAGES)

diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index 5e91df609c2a2151d174f55e00a42fdbd5497ae5..5473c650cd817f51816b405bafdc666bc58f4ea8 100644 (file)
--- a/media-libs/memphis/memphis-0.2.3.ebuild
+++ b/media-libs/memphis/memphis-0.2.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.6 2011/07/14 11:02:33 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.7 2011/12/17 14:13:39 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 WANT_AUTOMAKE=1.11
 
-inherit autotools base
+inherit autotools-utils
 
 DESCRIPTION="A map-rendering application and a library for OpenStreetMap"
 HOMEPAGE="http://trac.openstreetmap.ch/trac/memphis/"
@@ -15,27 +15,40 @@ SRC_URI="http://wenner.ch/files/public/mirror/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0.2"
 KEYWORDS="amd64 x86"
-IUSE="debug doc +introspection vala"
+IUSE="debug doc +introspection vala static-libs"
 
 RDEPEND="
-       >=dev-libs/expat-2.0.1
+       dev-libs/expat
        dev-libs/glib:2
-       >=x11-libs/cairo-1.8.8
+       x11-libs/cairo
        introspection? ( dev-libs/gobject-introspection )
        vala? ( dev-lang/vala:0.12 )"
 DEPEND="${RDEPEND}
-               doc? ( >=dev-util/gtk-doc-1.12 )"
+       doc? ( >=dev-util/gtk-doc-1.12 )"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
 
 DOCS=(AUTHORS ChangeLog NEWS README)
 
+PATCHES=(
+       "${FILESDIR}"/${P}-link_gobject.patch
+       )
+
+src_prepare() {
+       autotools-utils_src_prepare
+       eautoreconf
+}
+
 src_configure() {
        unset VALAC
        use vala && export VALAC=$(type -p valac-0.12)
 
-       CFLAGS="${CFLAGS}" \
-       econf \
-               $(use_enable debug) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable introspection) \
+       local myeconfargs=(
+               $(use_enable debug)
+               $(use_enable doc gtk-doc)
+               $(use_enable introspection)
                $(use_enable vala)
+       )
+       CFLAGS="${CFLAGS}" \
+               autotools-utils_src_configure
 }