public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.30.2.ebuild glib-2.30.2-r1.ebuild
@ 2012-01-11 20:44 Mike Frysinger (vapier)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2012-01-11 20:44 UTC (permalink / raw
  To: gentoo-commits

vapier      12/01/11 20:44:17

  Modified:             ChangeLog glib-2.30.2.ebuild glib-2.30.2-r1.ebuild
  Log:
  Assume pkgconfig exists in cross-compile setups since we need to execute `pkg-config` from ROOT=/ and not the cross-one from .
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.498                dev-libs/glib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.498&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.498&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.497&r2=1.498

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- ChangeLog	10 Jan 2012 21:25:04 -0000	1.497
+++ ChangeLog	11 Jan 2012 20:44:17 -0000	1.498
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.497 2012/01/10 21:25:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.498 2012/01/11 20:44:17 vapier Exp $
+
+  11 Jan 2012; Mike Frysinger <vapier@gentoo.org> glib-2.30.2.ebuild,
+  glib-2.30.2-r1.ebuild:
+  Assume pkgconfig exists in cross-compile setups since we need to execute
+  `pkg-config` from ROOT=/ and not the cross-one from .
 
 *glib-2.30.2-r1 (10 Jan 2012)
 



1.6                  dev-libs/glib/glib-2.30.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?r1=1.5&r2=1.6

Index: glib-2.30.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glib-2.30.2.ebuild	31 Dec 2011 21:26:59 -0000	1.5
+++ glib-2.30.2.ebuild	11 Jan 2012 20:44:17 -0000	1.6
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.5 2011/12/31 21:26:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.6 2012/01/11 20:44:17 vapier Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -129,8 +129,10 @@
 }
 
 src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig
-	if ! has_version dev-util/pkgconfig; then
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! has_version dev-util/pkgconfig; then
 		if has_version sys-apps/dbus; then
 			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
 			export DBUS1_LIBS="-ldbus-1"



1.2                  dev-libs/glib/glib-2.30.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?r1=1.1&r2=1.2

Index: glib-2.30.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glib-2.30.2-r1.ebuild	10 Jan 2012 21:25:04 -0000	1.1
+++ glib-2.30.2-r1.ebuild	11 Jan 2012 20:44:17 -0000	1.2
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.1 2012/01/10 21:25:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.2 2012/01/11 20:44:17 vapier Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -132,8 +132,10 @@
 }
 
 src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig
-	if ! has_version dev-util/pkgconfig; then
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! has_version dev-util/pkgconfig; then
 		if has_version sys-apps/dbus; then
 			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
 			export DBUS1_LIBS="-ldbus-1"






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.30.2.ebuild glib-2.30.2-r1.ebuild
@ 2012-03-25 15:28 Raul Porcel (armin76)
  0 siblings, 0 replies; 2+ messages in thread
From: Raul Porcel (armin76) @ 2012-03-25 15:28 UTC (permalink / raw
  To: gentoo-commits

armin76     12/03/25 15:28:53

  Modified:             ChangeLog glib-2.30.2.ebuild glib-2.30.2-r1.ebuild
  Log:
  ia64/m68k/s390/sh/sparc stable wrt #393007
  
  (Portage version: 2.1.10.49/cvs/Linux ia64)

Revision  Changes    Path
1.508                dev-libs/glib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.508&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.508&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.507&r2=1.508

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- ChangeLog	25 Mar 2012 03:42:44 -0000	1.507
+++ ChangeLog	25 Mar 2012 15:28:53 -0000	1.508
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.507 2012/03/25 03:42:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.508 2012/03/25 15:28:53 armin76 Exp $
+
+  25 Mar 2012; Raúl Porcel <armin76@gentoo.org> glib-2.30.2.ebuild,
+  glib-2.30.2-r1.ebuild:
+  ia64/m68k/s390/sh/sparc stable wrt #393007
 
 *glib-2.32.0 (25 Mar 2012)
 



1.12                 dev-libs/glib/glib-2.30.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?r1=1.11&r2=1.12

Index: glib-2.30.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- glib-2.30.2.ebuild	23 Mar 2012 16:02:41 -0000	1.11
+++ glib-2.30.2.ebuild	25 Mar 2012 15:28:53 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.11 2012/03/23 16:02:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.12 2012/03/25 15:28:53 armin76 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -16,7 +16,7 @@
 LICENSE="LGPL-2"
 SLOT="2"
 IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 
 RDEPEND="virtual/libiconv
 	virtual/libffi



1.5                  dev-libs/glib/glib-2.30.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild?r1=1.4&r2=1.5

Index: glib-2.30.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glib-2.30.2-r1.ebuild	23 Mar 2012 16:02:41 -0000	1.4
+++ glib-2.30.2-r1.ebuild	25 Mar 2012 15:28:53 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.4 2012/03/23 16:02:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.5 2012/03/25 15:28:53 armin76 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -16,7 +16,7 @@
 LICENSE="LGPL-2"
 SLOT="2"
 IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 
 RDEPEND="virtual/libiconv
 	virtual/libffi






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-03-25 15:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-25 15:28 [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.30.2.ebuild glib-2.30.2-r1.ebuild Raul Porcel (armin76)
  -- strict thread matches above, loose matches on Subject: below --
2012-01-11 20:44 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox