From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-387952-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1R8rSS-00060S-4x
	for garchives@archives.gentoo.org; Wed, 28 Sep 2011 10:33:44 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7CE1C21C020;
	Wed, 28 Sep 2011 10:33:33 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 2664521C020
	for <gentoo-commits@lists.gentoo.org>; Wed, 28 Sep 2011 10:33:33 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 871E71B4011
	for <gentoo-commits@lists.gentoo.org>; Wed, 28 Sep 2011 10:33:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 9FCDC80042
	for <gentoo-commits@lists.gentoo.org>; Wed, 28 Sep 2011 10:33:31 +0000 (UTC)
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" <sping@gentoo.org>
Message-ID: <577c601bc5985703de3d1bdcb64f4018e011a58d.sping@gentoo>
Subject: [gentoo-commits] proj/betagarden:master commit in: dev-libs/glib/
X-VCS-Repository: proj/betagarden
X-VCS-Files: dev-libs/glib/glib-2.29.14.ebuild dev-libs/glib/glib-2.29.4.ebuild
X-VCS-Directories: dev-libs/glib/
X-VCS-Committer: sping
X-VCS-Committer-Name: Sebastian Pipping
X-VCS-Revision: 577c601bc5985703de3d1bdcb64f4018e011a58d
Date: Wed, 28 Sep 2011 10:33:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: a5004e0c4ecd2c79910cd0137998a73b

commit:     577c601bc5985703de3d1bdcb64f4018e011a58d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Sep 28 10:32:35 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 10:32:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi=
t;a=3Dcommit;h=3D577c601b

dev-libs/glib: Remove 2.29.* as 2.30.0 is in the main tree by now

---
 dev-libs/glib/glib-2.29.14.ebuild |  199 -------------------------------=
------
 dev-libs/glib/glib-2.29.4.ebuild  |  199 -------------------------------=
------
 2 files changed, 0 insertions(+), 398 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.14.ebuild b/dev-libs/glib/glib-2.29.=
14.ebuild
deleted file mode 100644
index b463b10..0000000
--- a/dev-libs/glib/glib-2.29.14.ebuild
+++ /dev/null
@@ -1,199 +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/glib/glib-2.28.8.ebuild,v 1.=
10 2011/07/29 04:13:33 zmedico Exp $
-
-EAPI=3D"3"
-GNOME_TARBALL_SUFFIX=3D"bz2"
-PYTHON_DEPEND=3D"2"
-
-inherit autotools gnome.org libtool eutils flag-o-matic pax-utils python=
 virtualx
-
-DESCRIPTION=3D"The GLib library of C routines"
-HOMEPAGE=3D"http://www.gtk.org/"
-SRC_URI=3D"${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg=
.m4 for eautoreconf
-
-LICENSE=3D"LGPL-2"
-SLOT=3D"2"
-KEYWORDS=3D""  # blind-bump + patches disabled
-IUSE=3D"debug doc fam +introspection selinux +static-libs test xattr"
-
-RDEPEND=3D"virtual/libiconv
-	sys-libs/zlib
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
-DEPEND=3D"${RDEPEND}
-	>=3Dsys-devel/gettext-0.11
-	>=3Ddev-util/gtk-doc-am-1.13
-	doc? (
-		>=3Ddev-libs/libxslt-1.0
-		>=3Ddev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? ( dev-util/pkgconfig
-		>=3Dsys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
-PDEPEND=3D"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() {
-	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=3D$(gcc-major-version)
-		local minor=3D$(gcc-minor-version)
-		if (( major < 4 || ( major =3D=3D 4 && minor =3D=3D 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 62136=
8
-	######## 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-te=
st.patch"
-	########### epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-brok=
en-test.patch"
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(.*\SUBDIRS .*\=3D.*\)tests\(.*\)$/\1\2/' -i $(find . -name M=
akefile.am -o -name Makefile.in) || die
-	else
-		# Disable tests requiring dev-util/desktop-file-utils when not install=
ed, 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
-
-		# Disable tests requiring dev-python/dbus-python, bug #349236
-		if ! has_version dev-python/dbus-python ; then
-			ewarn "Some tests will be skipped due dev-python/dbus-python not bein=
g present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-s=
low.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/bus-watch-name/d" gio/tests/gdbus-names.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-wel=
l-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspect=
ion.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threadin=
g.c || die
-		fi
-	fi
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent croscompile failures, see bug #267603
-	AT_M4DIR=3D"${WORKDIR}" eautoreconf
-
-	[[ ${CHOST} =3D=3D *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build gl=
ib in
-	# an unusable form as it disables some commonly used API.  Please do no=
t
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf=3D"--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=3Dinternal \
-		--with-threads=3Dposix \
-		--disable-dtrace \
-		--disable-systemtap
-}
-
-src_install() {
-	local f
-	emake DESTDIR=3D"${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} || d=
ie
-	done
-	rm -rf "${ED}/etc"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=3D/etc/xdg
-	export XDG_DATA_DIRS=3D/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR=3D"${T}/temp"
-	export XDG_DATA_HOME=3D"${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 "=3D${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
-}

diff --git a/dev-libs/glib/glib-2.29.4.ebuild b/dev-libs/glib/glib-2.29.4=
.ebuild
deleted file mode 100644
index b463b10..0000000
--- a/dev-libs/glib/glib-2.29.4.ebuild
+++ /dev/null
@@ -1,199 +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/glib/glib-2.28.8.ebuild,v 1.=
10 2011/07/29 04:13:33 zmedico Exp $
-
-EAPI=3D"3"
-GNOME_TARBALL_SUFFIX=3D"bz2"
-PYTHON_DEPEND=3D"2"
-
-inherit autotools gnome.org libtool eutils flag-o-matic pax-utils python=
 virtualx
-
-DESCRIPTION=3D"The GLib library of C routines"
-HOMEPAGE=3D"http://www.gtk.org/"
-SRC_URI=3D"${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg=
.m4 for eautoreconf
-
-LICENSE=3D"LGPL-2"
-SLOT=3D"2"
-KEYWORDS=3D""  # blind-bump + patches disabled
-IUSE=3D"debug doc fam +introspection selinux +static-libs test xattr"
-
-RDEPEND=3D"virtual/libiconv
-	sys-libs/zlib
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
-DEPEND=3D"${RDEPEND}
-	>=3Dsys-devel/gettext-0.11
-	>=3Ddev-util/gtk-doc-am-1.13
-	doc? (
-		>=3Ddev-libs/libxslt-1.0
-		>=3Ddev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? ( dev-util/pkgconfig
-		>=3Dsys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
-PDEPEND=3D"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() {
-	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=3D$(gcc-major-version)
-		local minor=3D$(gcc-minor-version)
-		if (( major < 4 || ( major =3D=3D 4 && minor =3D=3D 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 62136=
8
-	######## 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-te=
st.patch"
-	########### epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-brok=
en-test.patch"
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(.*\SUBDIRS .*\=3D.*\)tests\(.*\)$/\1\2/' -i $(find . -name M=
akefile.am -o -name Makefile.in) || die
-	else
-		# Disable tests requiring dev-util/desktop-file-utils when not install=
ed, 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
-
-		# Disable tests requiring dev-python/dbus-python, bug #349236
-		if ! has_version dev-python/dbus-python ; then
-			ewarn "Some tests will be skipped due dev-python/dbus-python not bein=
g present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-s=
low.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/bus-watch-name/d" gio/tests/gdbus-names.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-wel=
l-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspect=
ion.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threadin=
g.c || die
-		fi
-	fi
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent croscompile failures, see bug #267603
-	AT_M4DIR=3D"${WORKDIR}" eautoreconf
-
-	[[ ${CHOST} =3D=3D *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build gl=
ib in
-	# an unusable form as it disables some commonly used API.  Please do no=
t
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf=3D"--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=3Dinternal \
-		--with-threads=3Dposix \
-		--disable-dtrace \
-		--disable-systemtap
-}
-
-src_install() {
-	local f
-	emake DESTDIR=3D"${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} || d=
ie
-	done
-	rm -rf "${ED}/etc"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=3D/etc/xdg
-	export XDG_DATA_DIRS=3D/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR=3D"${T}/temp"
-	export XDG_DATA_HOME=3D"${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 "=3D${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
-}