Bump to 2.26.0, stable release with various bug fixes

(Portage version: 2.1.9.10/cvs/Linux x86_64)

2 files changed, 137 insertions, 1 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index a587d87f9e35..32630dcac175 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.424 2010/09/25 14:59:47 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.425 2010/09/28 10:52:09 nirbheek Exp $
+
+*glib-2.26.0 (28 Sep 2010)
+
+  28 Sep 2010; <nirbheek@gentoo.org> +glib-2.26.0.ebuild:
+  Bump to 2.26.0, stable release with various bug fixes
 
   25 Sep 2010; <nirbheek@gentoo.org> glib-2.25.17.ebuild:
   Drop patch that is no longer used for in-tree 2.24 ebuilds. Syncing error
diff --git a/dev-libs/glib/glib-2.26.0.ebuild b/dev-libs/glib/glib-2.26.0.ebuild
new file mode 100644
index 000000000000..faa70d477cd8
--- /dev/null
+++ b/dev-libs/glib/glib-2.26.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.0.ebuild,v 1.1 2010/09/28 10:52:09 nirbheek Exp $
+
+EAPI="2"
+
+inherit autotools gnome.org libtool eutils flag-o-matic
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc fam hardened +introspection selinux static-libs test xattr"
+
+RDEPEND="virtual/libiconv
+	sys-libs/zlib
+	xattr? ( sys-apps/attr )
+	fam? ( virtual/fam )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=sys-devel/gettext-0.11
+	doc? (
+		>=dev-libs/libxslt-1.0
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? ( >=sys-apps/dbus-1.2.14 )"
+PDEPEND="introspection? ( dev-libs/gobject-introspection )"
+# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
+
+src_prepare() {
+	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
+
+	# Don't check for python, hence removing the build-time python dep.
+	# We remove the gdb python scripts in src_install due to bug 291328
+	epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
+
+	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
+	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
+
+	# skip tests that require writing to /root/.dbus, upstream bug ???
+	epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.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"
+
+	# Needed for the punt-python-check patch.
+	eautoreconf
+
+	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+	epunt_cxx
+}
+
+src_configure() {
+	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) \
+		  --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 "${D}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
+
+	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
+
+	insinto /usr/share/bash-completion
+	for f in gdbus gsettings; do
+		newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
+	done
+	rm -rf "${D}/etc"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export XDG_DATA_HOME="${T}"
+	emake 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
+}