Fix building with dev-libs/glib >= 2.30 wrt #395795 by Priit Laes

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

diff --git a/sci-electronics/geda/ChangeLog b/sci-electronics/geda/ChangeLog
index 70d6e2eb14d17cac1ebcd787a6a1fcb3756b3f85..6b718463bdd3960d7705756a816ba6bf032ad473 100644 (file)
--- a/sci-electronics/geda/ChangeLog
+++ b/sci-electronics/geda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/geda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.69 2011/04/25 13:44:57 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.70 2011/12/23 11:24:20 ssuominen Exp $
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> geda-1.6.2.ebuild,
+  +files/geda-1.6.2-correct_glib_include.patch:
+  Fix building with dev-libs/glib >= 2.30 wrt #395795 by Priit Laes
 
   25 Apr 2011; Thomas Beierlein <tomjbe@gentoo.org> geda-1.6.1.ebuild,
   geda-1.6.2.ebuild:

diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index 707ac8bf9b295c7d88a89270425d25c6b358f375..57d34858bd8f243be6169f597c90abd11f4d8d8f 100644 (file)
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1,16 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX geda-1.6.2-correct_glib_include.patch 407 RMD160 4d346c4fa20501dd1be85e7d5367f404b95f1221 SHA1 fb2deebe51dc82e4fc62c0636f202f376ec5d675 SHA256 5e145501b29cc3924a2366cc92d62485816bc9a57cfdaed861ce89e0fca93037
 DIST geda-gaf-1.6.1.tar.gz 7099085 RMD160 7274c898985fe097b0cfb87bd9910961e14d1150 SHA1 54f706f8ecb3638b0384c5428ef6089237847b6e SHA256 0f8aacb76dc669633369e215a21cca021814bf1a36e6a9b9f910fb4205b30998
 DIST geda-gaf-1.6.2.tar.gz 7099981 RMD160 4e32ba11188b9a2849036299b972c35481cb975e SHA1 87c21b3b77eebc8eec1c16672d4b1ab418ccb80d SHA256 507ee440ad976a534beab205231840468004366d471c17a211ffbdcbc24a6d2b
 EBUILD geda-1.6.1.ebuild 1926 RMD160 67a5f50c73e44ecb05d4c5f7edc74a5815c022da SHA1 c06528da8eca261dcfaf241fb2be8bfe3c852577 SHA256 8c0fb42ae3f1d123b77f7b2f28cc534f8b357a114c4fc67b1eb79e8d2b8d5ca3
-EBUILD geda-1.6.2.ebuild 1930 RMD160 907ca6ed1078b68c3fbe9c84d1f448e0ac0f20e4 SHA1 415ce9924e49684f4d9321f826a6eb9341e73a27 SHA256 29d523f494f0df11fbc85ecd446df99e20880459100664e05938cb95ae377480
-MISC ChangeLog 10458 RMD160 91182e20767d4730b9d26abd2e7e869a693a6a01 SHA1 db290417a0b52ee3bf8a46d62a9d34f518a46de2 SHA256 da6a499f90ba88095dfee0297257acb3bc74a8e972d94be511d4c5cf50c22e0f
+EBUILD geda-1.6.2.ebuild 1836 RMD160 d03cbdf4f4c9dbeb23a502d10e8e378380ffeb01 SHA1 8d8f5b379132178359f07462911f8f7c8f87edfe SHA256 ec9229a15f24f0658dab62790e45b6f05bf2171b55262120ec68c024e14468d2
+MISC ChangeLog 10651 RMD160 76d5e3552a5463cad797121062bf8a8502fe6d8e SHA1 c6030d0f1eccf42442afd1e30bd9e857ebd3632a SHA256 a50de6b0438c3da9f04ca4ce0497582f069620799ead0efb2cc115f134c7c15f
 MISC metadata.xml 1008 RMD160 56bf21dd5495092dacdd23cfd2fc2b6c9a32aed6 SHA1 2471d8dd043020ca3954c8960138f37b2a623180 SHA256 0a95314c82e8543fda8e9e95ad1b8097d183e482d278cfca5f082fa987e2838b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk21euwACgkQQe4uqXYgU9X3DgCdGhx0pT231AGChOrH3yx/Pdqd
-5wgAoJCNbpbXybNxVvIANrqXhesCc+j1
-=kEtc
+iQEcBAEBAgAGBQJO9GSrAAoJEEdUh39IaPFN0ckH/3PUwYJzMSxLTSi1JDfnK+yl
+B5nWpr//Km2zEChA4Jv9zBN4FLyv2zbpde/uV0AghKZ500mcLO2SjW837Ff7nBSx
+ukF4Cnq4+uUtNiudRhf1sYQEt0PfgRJ0XxE0EVPs5rDDa0yKt42Tpl7diow+Tqow
+XJvJhGWvN3SONSwN0RbV2Z3Ca0jnEZAX+kcpZ6aeef4gRbx7JQtSJCQv1Pmel8c+
+UkeJ7Bwkw95ksN00/zNGqpjRXp7iSi6OWubiL13ZRbkxmcHCwjpAjaO5ona6O3e2
+JmsiP9PlLr6YOYugfQJAZIxdk54ESWnTaphlwklz3K0S/zx4++BOzgw/qr5xnPk=
+=qsrK
 -----END PGP SIGNATURE-----

diff --git a/sci-electronics/geda/files/geda-1.6.2-correct_glib_include.patch b/sci-electronics/geda/files/geda-1.6.2-correct_glib_include.patch
new file mode 100644 (file)
index 0000000..2e77b7d
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.6.2-correct_glib_include.patch
@@ -0,0 +1,16 @@
+http://pkgs.fedoraproject.org/gitweb/?p=geda-gaf.git;a=blob_plain;f=libgeda-references-to-glib-headers-other-than-glib-h.patch;hb=HEAD
+http://bugs.gentoo.org/395795
+
+--- libgeda/src/s_path.c
++++ libgeda/src/s_path.c
+@@ -37,9 +37,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "libgeda_priv.h"
+ 

diff --git a/sci-electronics/geda/geda-1.6.2.ebuild b/sci-electronics/geda/geda-1.6.2.ebuild
index e96b451275457ff5015b1fa8faf01a4b7d2a4cba..0c3bbe6b86fd5877307f10ef0bef5100fdce75a8 100644 (file)
--- a/sci-electronics/geda/geda-1.6.2.ebuild
+++ b/sci-electronics/geda/geda-1.6.2.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/sci-electronics/geda/geda-1.6.2.ebuild,v 1.3 2011/04/25 13:44:57 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.6.2.ebuild,v 1.4 2011/12/23 11:24:20 ssuominen Exp $
 
-EAPI="2"
+EAPI=4
+inherit eutils fdo-mime gnome2-utils versionator
 
-inherit fdo-mime versionator gnome2-utils
+MY_P=${PN}-gaf-${PV}
 
-MY_P="${PN}-gaf-${PV}"
 DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
 HOMEPAGE="http://www.gpleda.org/"
 SRC_URI="http://geda.seul.org/release/v$(get_version_component_range 1-2)/${PV}/${MY_P}.tar.gz"
@@ -34,14 +34,18 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
        sci-electronics/electronics-menu"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README"
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-correct_glib_include.patch
+
        if ! use doc ; then
-               sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die "sed failed"
+               sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
        fi
        if ! use examples ; then
-               sed -i -e 's/\texamples$//' Makefile.in || die "sed failed"
+               sed -i -e 's/\texamples$//' Makefile.in || die
        fi
 }
 
@@ -53,18 +57,12 @@ src_configure() {
                $(use_enable nls) \
                $(use_enable debug assert) \
                --disable-doxygen \
-               --disable-dependency-tracking \
                --disable-rpath \
                --disable-update-xdg-database
 }
 
-src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
-       dodoc AUTHORS NEWS README
-}
-
 src_test() {
-       emake -j1 check || die "test failed"
+       emake -j1 check
 }
 
 pkg_preinst() {