[gentoo-commits] proj/gnome:gnome-next commit in: net-libs/glib-networking/, dev-libs/gobject-introspection/files/, ...

[Nirbheek Chauhan]

commit:     fc8d03a95b0a761b57bd21878e9e2301b9d0a1d7
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 13:14:31 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 13:14:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fc8d03a9

glib, glib-networking, gdbus-codegen, gobject-introspection: moved to tree

---
 dev-libs/glib/glib-2.30.0.ebuild                   |  210 --------------------
 dev-libs/glib/glib-9999.ebuild                     |   15 +-
 .../gobject-introspection-1.30.0-c_prefix.patch    |   47 -----
 .../gobject-introspection-1.30.0.ebuild            |   73 -------
 ...gen-2.30.0.ebuild => gdbus-codegen-9999.ebuild} |   15 ++-
 .../glib-networking/glib-networking-2.30.0.ebuild  |   45 -----
 6 files changed, 19 insertions(+), 386 deletions(-)

diff --git a/dev-libs/glib/glib-2.30.0.ebuild b/dev-libs/glib/glib-2.30.0.ebuild
deleted file mode 100644
index e089386..0000000
--- a/dev-libs/glib/glib-2.30.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="2"
-IUSE="debug doc fam +introspection selinux +static-libs systemtap test xattr"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-fi
-
-RDEPEND="virtual/libiconv
-	>=dev-libs/libffi-3.0.0
-	sys-libs/zlib
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.15
-	doc? (
-		>=dev-libs/libxslt-1.0
-		>=dev-util/gtk-doc-1.15
-		~app-text/docbook-xml-dtd-4.1.2 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		>=dev-util/gdbus-codegen-2.30.0
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
-PDEPEND="introspection? ( dev-libs/gobject-introspection )
-	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
-
-# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
-	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
-	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
-
-	# Do not try to remove files on live filesystem, upstream bug #619274
-	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
-	else
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch"
-
-	# disable pyc compiling
-	ln -sfn $(type -P true) py-compile
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent croscompile failures, see bug #267603
-	# Also needed for the no-gdbus-codegen patch
-	AT_M4DIR="${WORKDIR}" eautoreconf
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig
-	if ! has_version dev-util/pkgconfig; then
-		export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-		export DBUS1_LIBS="-ldbus-1"
-	fi
-
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# Always use internal libpcre, bug #254659
-	econf ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable doc man) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--enable-regex \
-		--with-pcre=internal \
-		--with-threads=posix
-}
-
-src_install() {
-	local f
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# This is there for git snapshots and the live ebuild, bug 351966
-	emake README || die "emake README failed"
-	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
-
-	insinto /usr/share/bash-completion
-	for f in gdbus gsettings; do
-		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
-	done
-	rm -rf "${ED}/etc"
-
-	# Completely useless with or without USE static-libs, people need to use
-	# pkg-config
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export XDG_DATA_HOME="${T}"
-	unset GSETTINGS_BACKEND # bug 352451
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check || die "tests failed"
-}
-
-pkg_preinst() {
-	# Only give the introspection message if:
-	# * The user has it enabled
-	# * Has glib already installed
-	# * Previous version was different from new version
-	if use introspection && has_version "${CATEGORY}/${PN}"; then
-		if ! has_version "=${CATEGORY}/${PF}"; then
-			ewarn "You must rebuild gobject-introspection so that the installed"
-			ewarn "typelibs and girs are regenerated for the new APIs in glib"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
-	if has_version dev-libs/dbus-glib; then
-		ewarn "If you experience a breakage after updating dev-libs/glib try"
-		ewarn "rebuilding dev-libs/dbus-glib"
-	fi
-
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index e089386..1ec0f13 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="2"
-IUSE="debug doc fam +introspection selinux +static-libs systemtap test xattr"
+IUSE="debug doc fam selinux +static-libs systemtap test xattr"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -40,8 +40,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gdbus-codegen-2.30.0
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
-PDEPEND="introspection? ( dev-libs/gobject-introspection )
-	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
 
 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
 
@@ -182,14 +181,12 @@ src_test() {
 
 pkg_preinst() {
 	# Only give the introspection message if:
-	# * The user has it enabled
+	# * The user has gobject-introspection
 	# * Has glib already installed
 	# * Previous version was different from new version
-	if use introspection && has_version "${CATEGORY}/${PN}"; then
-		if ! has_version "=${CATEGORY}/${PF}"; then
-			ewarn "You must rebuild gobject-introspection so that the installed"
-			ewarn "typelibs and girs are regenerated for the new APIs in glib"
-		fi
+	if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
+		ewarn "You must rebuild gobject-introspection so that the installed"
+		ewarn "typelibs and girs are regenerated for the new APIs in glib"
 	fi
 }
 

diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.30.0-c_prefix.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.30.0-c_prefix.patch
deleted file mode 100644
index d15dcd1..0000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.30.0-c_prefix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e8b336cc0747b528263ec809d142f4803dcbdf35 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@××××××.org>
-Date: Wed, 21 Sep 2011 17:13:45 +0000
-Subject: repository: Fix g_irepository_get_c_prefix()
-
-It was returning the wrong data.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659749
----
-diff --git a/girepository/girepository.c b/girepository/girepository.c
-index cc81107..b5cd4c7 100644
---- a/girepository/girepository.c
-+++ b/girepository/girepository.c
-@@ -929,7 +929,7 @@ g_irepository_get_c_prefix (GIRepository *repository,
-   g_return_val_if_fail (typelib != NULL, NULL);
- 
-   header = (Header *) typelib->data;
--  if (header->shared_library)
-+  if (header->c_prefix)
-     return g_typelib_get_string (typelib, header->c_prefix);
-   else
-     return NULL;
-diff --git a/tests/repository/gitestrepo.c b/tests/repository/gitestrepo.c
-index cdaeb4c..05ea5d9 100644
---- a/tests/repository/gitestrepo.c
-+++ b/tests/repository/gitestrepo.c
-@@ -46,6 +46,7 @@ main(int argc, char **argv)
-   GIBaseInfo *siginfo;
-   GIEnumInfo *errorinfo;
-   GType gtype;
-+  const char *prefix;
- 
-   g_type_init ();
- 
-@@ -55,6 +56,10 @@ main(int argc, char **argv)
-   if (!ret)
-     g_error ("%s", error->message);
- 
-+  prefix = g_irepository_get_c_prefix (repo, "Gio");
-+  g_assert (prefix != NULL);
-+  g_assert_cmpstr (prefix, ==, "G");
-+
-   info = g_irepository_find_by_name (repo, "Gio", "Cancellable");
-   g_assert (info != NULL);
-   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_OBJECT);
---
-cgit v0.9.0.2

diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.30.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.30.0.ebuild
deleted file mode 100644
index 83b78fa..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.30.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild,v 1.10 2011/05/02 04:39:55 jer Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/glib-2.29.7:2
-	>=dev-libs/libffi-3.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	test? ( x11-libs/cairo )"
-
-pkg_setup() {
-	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable test tests)"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Patch from upstream git master to fix g_irepository_get_c_prefix
-	epatch "${FILESDIR}/${P}-c_prefix.patch"
-
-	# FIXME: Parallel compilation failure with USE=doc
-	use doc && MAKEOPTS="-j1"
-
-	# Don't pre-compile .py
-	ln -sf $(type -P true) py-compile
-	ln -sf $(type -P true) build-aux/py-compile
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,doc-tool,scanner}
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}/giscanner
-	python_need_rebuild
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib*/${PN}/giscanner
-}

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.30.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
similarity index 82%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.30.0.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index c9aeb52..2044c84 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.30.0.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -8,13 +8,24 @@ GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="xml"
 
-inherit gnome.org multilib python
+inherit multilib python
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
+	inherit git-2
+else
+	inherit gnome.org
+fi
 
 DESCRIPTION="GDBus code and documentation generator"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
+	~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+fi
 IUSE=""
 
 DEPEND=""

diff --git a/net-libs/glib-networking/glib-networking-2.30.0.ebuild b/net-libs/glib-networking/glib-networking-2.30.0.ebuild
deleted file mode 100644
index d9e7cf6..0000000
--- a/net-libs/glib-networking/glib-networking-2.30.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild,v 1.8 2011/07/28 18:35:49 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy +ssl"
-
-RDEPEND=">=dev-libs/glib-2.29.16:2
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-2.1.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.9
-	sys-devel/gettext"
-
-# FIXME: tls tests fail, figure out why
-# ERROR:tls.c:256:on_input_read_finish: assertion failed (error == NULL): Error performing TLS handshake: The request is invalid. (g-tls-error-quark, 1)
-RESTRICT="tests"
-
-pkg_setup() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-maintainer-mode
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_with gnome gnome-proxy)
-		$(use_with libproxy)
-		$(use_with ssl gnutls)"
-}