[gentoo-commits] gentoo-x86 commit in sci-electronics/geda: ChangeLog geda-1.6.2.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    11/12/23 11:24:20

  Modified:             ChangeLog geda-1.6.2.ebuild
  Log:
  Fix building with dev-libs/glib >= 2.30 wrt #395795 by Priit Laes
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.70                 sci-electronics/geda/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/ChangeLog?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/ChangeLog?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/ChangeLog?r1=1.69&r2=1.70

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	25 Apr 2011 13:44:57 -0000	1.69
+++ ChangeLog	23 Dec 2011 11:24:20 -0000	1.70
@@ -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@g.o> 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@g.o> geda-1.6.1.ebuild,
   geda-1.6.2.ebuild:



1.4                  sci-electronics/geda/geda-1.6.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/geda-1.6.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/geda-1.6.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/geda-1.6.2.ebuild?r1=1.3&r2=1.4

Index: geda-1.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.6.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-1.6.2.ebuild	25 Apr 2011 13:44:57 -0000	1.3
+++ geda-1.6.2.ebuild	23 Dec 2011 11:24:20 -0000	1.4
@@ -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 @@
 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 @@
 		$(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() {