From 828445a3dd13f008e7b4d2b6af0e7a545eb6a580 Mon Sep 17 00:00:00 2001 From: Ruben Bressler Date: Tue, 20 Jul 2010 11:57:55 -0400 Subject: 20100720 - Cambio automático MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-libs/glib/Manifest | 5 +- dev-libs/glib/glib-2.25.11.ebuild | 132 ++++++++++++++++++++++++++++++++++++++ dev-libs/glib/glib-2.25.12.ebuild | 132 -------------------------------------- 3 files changed, 135 insertions(+), 134 deletions(-) create mode 100644 dev-libs/glib/glib-2.25.11.ebuild delete mode 100644 dev-libs/glib/glib-2.25.12.ebuild diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 90f1fe6..b3efd5b 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -2,6 +2,7 @@ AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f7731183 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af +AUX glib-2.24-punt-python-check.patch 541 RMD160 8783f765b97814bc95a6143b75f317dbbdd8ba0c SHA1 dbaf420d3b8acd7691bc677f1fcc6e2fca04ed54 SHA256 0bdcc11d1434f695a5b5f6ec4c54ab7fa5a9f8a5c22d71b94f97378e92aaff84 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8 -DIST glib-2.25.12.tar.bz2 6040637 RMD160 511d71cef07ffd1974d93dced8d896a6f1ebc404 SHA1 358c1457a8a54515943160f888d8ad36d5cee46c SHA256 fc6f97a3dd3a7fe980abe73f27e7c3146b42d138ae712ab820b22eda95fccfca -EBUILD glib-2.25.12.ebuild 4021 RMD160 c9721aebd5ef952c0e1bd2d95b5475a2869cde74 SHA1 c3de69945bed613ba903f72a96f6254c29140a27 SHA256 2da20e2580fcd01ab851706c891feb29143f601a1b9e3b032218598ffa5ad279 +DIST glib-2.25.11.tar.bz2 6021908 RMD160 a949384227eaa7491c2fa903d84771ea3be00215 SHA1 3794dac04e4a4c5dabf2452d1d7e98b3d0c83edb SHA256 f83cdc74b9a0a8514c496c68f3d4887d38d5de64ffb9b8cdede7e94bb140b16f +EBUILD glib-2.25.11.ebuild 4020 RMD160 772a4bd07f131819ea054ce240bc05eef3861928 SHA1 b10396e9d344e0b5c034f79de515f364e2d78fb7 SHA256 58d6eab06faa8f104b35eddfb41286482b285538928940410b42dafcce48f9a9 diff --git a/dev-libs/glib/glib-2.25.11.ebuild b/dev-libs/glib/glib-2.25.11.ebuild new file mode 100644 index 0000000..7aac564 --- /dev/null +++ b/dev-libs/glib/glib-2.25.11.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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 + 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 ppc64 && use hardened ; then + replace-flags -O[2-3] -O1 + epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" + fi + + 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.24-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, bug #XXX ? + 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 +} diff --git a/dev-libs/glib/glib-2.25.12.ebuild b/dev-libs/glib/glib-2.25.12.ebuild deleted file mode 100644 index aa1eab9..0000000 --- a/dev-libs/glib/glib-2.25.12.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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 - 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 ppc64 && use hardened ; then - replace-flags -O[2-3] -O1 - epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" - fi - - 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.24-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, bug #XXX ? - 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 -} -- cgit v1.2.3-65-gdbad