Version bump with bugfixes and translation updates, remove old and skip tests building when unneeded.

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

3 files changed, 47 insertions, 18 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 5a4fa5650552..7bbabe14b305 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.430 2010/10/17 15:12:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.431 2010/12/04 20:11:36 pacho Exp $
+
+*glib-2.26.1 (04 Dec 2010)
+
+  04 Dec 2010; Pacho Ramos <pacho@gentoo.org> -glib-2.25.17.ebuild,
+  +glib-2.26.1.ebuild:
+  Version bump with bugfixes and translation updates, remove old and skip tests
+  building when unneeded.
 
 *glib-2.26.0-r1 (17 Oct 2010)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index ec35db083d15..67ac8977a976 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -27,22 +27,22 @@ DIST glib-2.22.4.tar.bz2 5012207 RMD160 66dc6ec0f1b1d422f50f6d55700bee8d526318cc
 DIST glib-2.22.5.tar.bz2 4988402 RMD160 2e2f06f956f63a75121b335e4150edc44f5e04f2 SHA1 a35acb06c3155937651aaffc1f1895c6e19a91a4 SHA256 802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b
 DIST glib-2.24.1.tar.bz2 5332511 RMD160 c6ce09654c1bd28b8844435d150fcb51e6f4e872 SHA1 d4835bb1618fc1e1dfe88ef8443c12fcae69f90e SHA256 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
 DIST glib-2.24.2.tar.bz2 5326328 RMD160 259d2d0a92b1a01bb624a2b759d0f82eefc227ea SHA1 882350c31af929cd4e78ee6aad46108748240e78 SHA256 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c
-DIST glib-2.25.17.tar.bz2 6524161 RMD160 44755ad5290559f6bf0c0da14ccd8ac39985da7e SHA1 b800d4138145b6081c4191d808559409eff72b26 SHA256 ba2543fa9dceb7dbcfbf00dcc3773cd649ef1698d7f7ad401f136e980559777d
 DIST glib-2.26.0.tar.bz2 6632632 RMD160 176441944f24c274398903ae1816eecfe2cff36b SHA1 9d7e9dce2add3fadc35079ad291a94f45ebcf706 SHA256 4c18e3aadb5b20acc7c0f7d3a77da8a2843b85a9fd73fd3aa360a7aea953e3b2
+DIST glib-2.26.1.tar.bz2 6704686 RMD160 e8b00fce55aa539ee00588500c0162a8877dc060 SHA1 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 SHA256 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5
 EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
 EBUILD glib-2.20.5-r1.ebuild 2629 RMD160 463ad015124d8dd7385a78b2448dc2508825878a SHA1 6271695a9137c2d48a0528f059f4b307593f9b2a SHA256 30b08ebd051f72739ceb475a6163fa466bb663ddc7222782f28d7925aae5df5f
 EBUILD glib-2.22.4.ebuild 2732 RMD160 b79dfe5bb2b5cb9b3c7ecb9ccf46ab450aa87bc3 SHA1 13496a9a0f26f10173f433fb5843a1a9f6eb01f1 SHA256 b7ab7a260d974d1fcfb58a47055b3cc8f826a5a547ea6e8d663ca8e36619a00f
 EBUILD glib-2.22.5.ebuild 2732 RMD160 212f9e2c93dd48dea140d7f508ce945f7b8e8c6f SHA1 f4f14c0eef4d227469e6e958226d38667adc5fbe SHA256 6c3b9b2429665e3c056495a80959ab66a8d3bcd2112c74ef61331552252430d1
 EBUILD glib-2.24.1-r1.ebuild 3448 RMD160 16b18a9d5683e9ed87b1a43ba1d2b5421cdfbad6 SHA1 7c6df67e8cdb52bbde58bf46124ece854776faaa SHA256 f3b35203c7407b5bea3502a00018544a430f5e729569ff0b195010b47114e515
 EBUILD glib-2.24.2.ebuild 3706 RMD160 4f71057ef43982e66e8a9590c79e8a9651ec752a SHA1 c25ed3a3d44fa02b0fc6a2868156ec6ed497d5d1 SHA256 304a70b13887da7d33a187afd1156d2222cdf3490a0a81420d93d1d6423e5e9b
-EBUILD glib-2.25.17.ebuild 4155 RMD160 2403a18e5ec037394b2e1425669fcdc86cbc77ce SHA1 11a660d139348b48a8b380472b748c0b70245bba SHA256 6a9584025dda464c65fe2d5dc1256875b17dd8ad3f1086a235cbe76bdea7fba9
 EBUILD glib-2.26.0-r1.ebuild 4985 RMD160 ae9e8e0da7d854ceefbe45767473bbb5d892a390 SHA1 8c18e803987da081a48f763ca2d6e5604a9c0b76 SHA256 774508b7696f0a7fa9a8c087ebc561e01c58f0eb412c64d8d90b5021eee8ab75
-MISC ChangeLog 54204 RMD160 021228f19bed44555f0aa57a2a01bdc8422c2fbb SHA1 83438a4df8f6fd781d6d660c1ef33820e583fa09 SHA256 9ab1c0d6d4fe9850bb1906fb322515761a49bf4b4c45f3439ef211e5b21b223a
+EBUILD glib-2.26.1.ebuild 4877 RMD160 98c3104fc6f2f7b6d78e40ed0261e23075919fc1 SHA1 91502e19a6440d8e4c053d51cf7d6aa0b785b8fa SHA256 0c6e8fb848d18284087259d6fc817df7a8abd37978ca61d790a8faeb13e746a4
+MISC ChangeLog 54430 RMD160 f113f22d0e7fa58e339a71246aac9e4940718d98 SHA1 efc6b0a5bd6aca12bd62f92a7d8beef02c9c247c SHA256 b7fc69594354ebc698c1ece7bf82fc47390a41a669363bf1365041da2c1e8cde
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky7EnAACgkQCaWpQKGI+9RPWACdEF63mLqo2+o7B0zyWaSUZn8E
-yxUAnij04/Y+YVm4zwpFRh0ENOeNKKz8
-=/McS
+iEYEARECAAYFAkz6oH8ACgkQCaWpQKGI+9RccwCdGnUV9w3TPn+Lr8AHuVM2JW0y
+3F8An25ZLHAsa3i3x7cmqPcJR8FVYwPI
+=j1s2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.25.17.ebuild b/dev-libs/glib/glib-2.26.1.ebuild
index 50282b4fbadf..b380d3c501e7 100644
--- a/dev-libs/glib/glib-2.25.17.ebuild
+++ b/dev-libs/glib/glib-2.26.1.ebuild
@@ -1,10 +1,10 @@
 # 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.25.17.ebuild,v 1.3 2010/09/25 14:59:47 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.1.ebuild,v 1.1 2010/12/04 20:11:36 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 
-inherit autotools gnome.org libtool eutils flag-o-matic
+inherit autotools gnome.org libtool eutils flag-o-matic pax-utils
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -12,7 +12,7 @@ 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"
+IUSE="debug doc fam +introspection selinux +static-libs test xattr"
 
 RDEPEND="virtual/libiconv
 	sys-libs/zlib
@@ -21,12 +21,15 @@ RDEPEND="virtual/libiconv
 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.11
+		>=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 )"
+
+# eautoreconf needs gtk-doc-am
 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
 
 src_prepare() {
@@ -60,7 +63,18 @@ src_prepare() {
 	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.
+	# Also needed to prevent croscompile failures, see bug #267603
 	eautoreconf
 
 	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
@@ -75,7 +89,8 @@ src_configure() {
 	# 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"
+	# disable-visibility needed for reference debug, bug #274647
+	use debug && myconf="--enable-debug --disable-visibility"
 
 	# Always use internal libpcre, bug #254659
 	econf ${myconf} \
@@ -92,21 +107,21 @@ src_configure() {
 
 src_install() {
 	local f
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${ED}" install || die "Installation failed"
 
 	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
+	rm -f "${ED}/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/"
+	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 "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
+		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
 	done
-	rm -rf "${D}/etc"
+	rm -rf "${ED}/etc"
 }
 
 src_test() {
@@ -114,6 +129,13 @@ src_test() {
 	export XDG_CONFIG_DIRS=/etc/xdg
 	export XDG_DATA_DIRS=/usr/local/share:/usr/share
 	export XDG_DATA_HOME="${T}"
+
+	# 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
+
 	emake check || die "tests failed"
 }