Bump to 2.28.5, fixed g-i annotations

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

3 files changed, 194 insertions, 5 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index a261ff9be90c..9a606dc9c875 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.454 2011/03/26 18:34:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.455 2011/04/01 19:33:37 nirbheek Exp $
+
+*glib-2.28.5 (01 Apr 2011)
+
+  01 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +glib-2.28.5.ebuild:
+  Bump to 2.28.5, fixed g-i annotations
 
   26 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> -glib-2.22.5.ebuild,
   -glib-2.24.1-r1.ebuild, -glib-2.28.3.ebuild, glib-2.28.4.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 6f2c40a51932..6fd28f587772 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -25,15 +25,27 @@ DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a
 DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
 DIST glib-2.26.1.tar.bz2 6704686 RMD160 e8b00fce55aa539ee00588500c0162a8877dc060 SHA1 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 SHA256 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5
 DIST glib-2.28.4.tar.bz2 6880678 RMD160 65195df54c07f2011e456dd972b16fa5d6d17896 SHA1 46b4e9eca27a936c686c32a768d5e352d1275673 SHA256 ae627cf35c6a2b4bb9b0ea624046de5fa4c40d81c29e75718bc6c2088b6bd7a1
+DIST glib-2.28.5.tar.bz2 6943896 RMD160 939aea42ea77d173712135ffcbcd10e3d01ecd29 SHA1 6cfc1a4e5ed069f0282b90de7635a5704cf7c04c SHA256 8eb4b56b228c6d0bf5021dd23db5b0084d80cc6d8d89d7863073c2da575ec22a
 EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
 EBUILD glib-2.26.1-r1.ebuild 6043 RMD160 2ee2ee629bd983a44e8f086838343ee73bd97748 SHA1 a1f5bb2a567a583241b5d262ddbe32bb5d3cf515 SHA256 a82428b2be2220ca2a9aa2bf10084812482b5dd2a85b600cfa3e84d83983a2ef
 EBUILD glib-2.28.4.ebuild 5441 RMD160 6da0561257f761f347a101cdefea3c0f2a41a455 SHA1 6c197442d1ef1a5140202dc249fa165776048497 SHA256 98178414571b2f9f5cc76e617ba6992ed8126888ce5a99323772f656569c0b61
-MISC ChangeLog 58639 RMD160 ea61a907a73975ff0c1a487530a42f8531d17b1c SHA1 969ddfcec3ba1e78669df092fa32347b14605005 SHA256 1f235added62865b9173df23f603354c3967935acccacdebfc4ad145cc851dea
+EBUILD glib-2.28.5.ebuild 5446 RMD160 4bb6678cfc302ac5e5e440656caac9f3a9750b23 SHA1 7f46e1004a78693d9472a0644f304f8b48a388ed SHA256 f2d6cbd016d018ef89a49eac29b668e41cdfbf47b338b10c92e3bbe798f12224
+MISC ChangeLog 58788 RMD160 62d67daf7ecd3642bfb11b23fbf7f14a65a68979 SHA1 ff8e1d6c31954ca4738d10118f1a1f03422cf0aa SHA256 aeb6692320ea125148781c9d5568576ddaef7ce254c5c55d4ab6c5f7b0a80bab
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2OMaYACgkQ1fmVwcYIWAbHAwCeP0oiBcF1MMckz9bmOJZyClup
-3BwAnRqXnkJNPU71kFtuFKaDmPSXbGyU
-=EgDI
+iQIcBAEBAgAGBQJNliiXAAoJEO/kOhxWD91kdhYP/0JEA+ZQ/uNeyqv0Xq4gETYb
+Kl8584JeleVzNNpvV/M20OzPXS7DTAwN2Z8G/Usr88qDBPWfpPaLfjuca8zRD2RE
+uz3FaRS135+VHnlepv1YGaRLQSCGLylFRqPvMMjtJKN6VKa3TdPrpSGP2mNWSZg9
+vobixcWYHCqMDBGX97Fljp3A731tKviplh1/s5rEIJ95asbXorjWW/plVxMqcN0A
+H253RQLHz/aSA1cYZoLq/u08uxLn3uf06mcswMfDdUBJ18ibZL13VeLxrTiBC+00
+L264lmvuPH77OKLupgcir9QQFUyIuTrANb9NRQAEu3+zXAaWrnk/Kzq5ERnDGeZW
+UfXkfjp51yIHnPGyrjH4tiihwMDdGt7ZNZH/G1N4O/LIhB7wPHiX9KhqWpheDVXL
+C6zFkr8iJGY0q/9hUF8iuKWG6QlZwQYjiPrKMy05t7bRc1oxd2GTb8kyti9mHvPs
+UwGk0SOGo77omgLUW6xga405EvxgZnJ1Up7x4YEG/d/nw+cy5gZTvfzyBPtCklLR
+1fD+wyBF9Ol7IHxrAH8ZFAV4A38lqsw4NnCMfwVM2k/oE4Jd4N8xgc1pv7PlN+A+
+E6JzI6udrdnwJF74IvVnPymzazz/jN1fkf0SNleGPeOcFwMFKb6hN50v417djLNU
+IpzZBKNAAZa3bvhgb7DJ
+=l8nl
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.28.5.ebuild b/dev-libs/glib/glib-2.28.5.ebuild
new file mode 100644
index 000000000000..6aa1421a6014
--- /dev/null
+++ b/dev-libs/glib/glib-2.28.5.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.5.ebuild,v 1.1 2011/04/01 19:33:37 nirbheek Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit autotools gnome.org libtool eutils flag-o-matic pax-utils python virtualx
+
+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 +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
+	>=dev-util/gtk-doc-am-1.13
+	doc? (
+		>=dev-libs/libxslt-1.0
+		>=dev-util/gtk-doc-1.13
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? ( >=sys-apps/dbus-1.2.14 )"
+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
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+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"
+
+	# 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"
+
+	# Disable failing tests, upstream bug #???
+	epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch"
+	epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch"
+
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	# Needed for the punt-python-check patch, disabling timeout test
+	# Also needed to prevent croscompile failures, see bug #267603
+	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)
+	# disable-visibility needed for reference debug, bug #274647
+	use debug && myconf="--enable-debug --disable-visibility"
+
+	# 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 \
+		--disable-dtrace \
+		--disable-systemtap
+}
+
+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/"
+
+	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"
+}
+
+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
+}