summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-06-11 03:05:04 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-06-11 03:05:04 +0000
commitf77b8fb27ebcc26c3a48618b3753fe9bd083a681 (patch)
tree191a8238c738b61363b013d4b62c2729461bb7a5
parentBump to 1.3.12, minor bugfixes. Use gnome mirrors and xz tarballs. (diff)
downloadhistorical-f77b8fb27ebcc26c3a48618b3753fe9bd083a681.tar.gz
historical-f77b8fb27ebcc26c3a48618b3753fe9bd083a681.tar.bz2
historical-f77b8fb27ebcc26c3a48618b3753fe9bd083a681.zip
Use xz tarballs, remove old
Package-Manager: portage-2.1.9.50/cvs/Linux x86_64
-rw-r--r--dev-libs/glib/ChangeLog6
-rw-r--r--dev-libs/glib/Manifest24
-rw-r--r--dev-libs/glib/glib-2.28.7.ebuild176
-rw-r--r--dev-libs/glib/glib-2.28.8.ebuild3
4 files changed, 23 insertions, 186 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 28275bbe378e..3053d89abbe2 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
# 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.469 2011/06/08 17:47:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.470 2011/06/11 03:05:04 nirbheek Exp $
+
+ 11 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -glib-2.28.7.ebuild,
+ glib-2.28.8.ebuild:
+ Use xz tarballs, remove old
08 Jun 2011; Pacho Ramos <pacho@gentoo.org> glib-2.28.8.ebuild:
Notify people about some tests will be skipped in certain situations and
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 5dc08772ffc2..af97961fdcd7 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -22,20 +22,28 @@ 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.6.tar.bz2 6955725 RMD160 5858c29829352c0c59fe12dbd6dceba81aabe5f6 SHA1 51996339c823cf36ba28c774c4afad933d5f5744 SHA256 557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578
-DIST glib-2.28.7.tar.bz2 6972304 RMD160 1fbb64463d89478f0e7b4c4c8818ee6644c17751 SHA1 82ea79fc2c73df29da1c6d33e0fa027e6c77ec68 SHA256 0e1b3816a8934371d4ea2313dfbe25d10d16c950f8d02e0a7879ae10d91b1631
-DIST glib-2.28.8.tar.bz2 7017806 RMD160 f087a71445eb40fae5eab45a14cb74d4e239d5e6 SHA1 20cd63705a8805260da0320c65b979233f2e3c18 SHA256 222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f
+DIST glib-2.28.8.tar.xz 5223564 RMD160 9f665eee95990ace173676a4ad7aeeb0cc17fef9 SHA1 9b11968fedf4da45bcd10c4a8c50012d41b3af50 SHA256 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
EBUILD glib-2.26.1-r1.ebuild 6043 RMD160 2ee2ee629bd983a44e8f086838343ee73bd97748 SHA1 a1f5bb2a567a583241b5d262ddbe32bb5d3cf515 SHA256 a82428b2be2220ca2a9aa2bf10084812482b5dd2a85b600cfa3e84d83983a2ef
EBUILD glib-2.28.6.ebuild 5649 RMD160 1a57e73c13cae0a708808053ed6bd3e92c1ce29c SHA1 3c607a96e34dad256b32d9b006f2f5a8a333f454 SHA256 4a9d0a6f835a2aced9de540091acf8eaccf74cb054ce6d55576ea2ef34bdb78e
-EBUILD glib-2.28.7.ebuild 5579 RMD160 821e71c46d3c51a573cae1e1d37a7b35a229d4da SHA1 d5f742c3f98cb6d27ca61ab56055b6b126fc7b14 SHA256 786799bd0d34f50a429b479fb69deb1d0fe2d1bbda4ceecd0077906899d9a4a3
-EBUILD glib-2.28.8.ebuild 7006 RMD160 2b1655d1192697aac6adcfb9fc1237391d3f6750 SHA1 947eb81f379a565bb3afef4354ff7f49acd9cadf SHA256 ddffc23b6875bf81d683a42193152aa9e1a26518ddbf559b781ed7889f94483c
-MISC ChangeLog 61195 RMD160 99416fb34c147d445f49f8c19407b19c799cb2b3 SHA1 908b6a9653c10c9fc8be2dc302c5b55ad3d34e6e SHA256 ea674b69eb12b2c26fa49775364b0578fb3761d7cbb3201ddba37bfca2e58039
+EBUILD glib-2.28.8.ebuild 7035 RMD160 ad566ef14597538910230603fc41cc5eb246cd77 SHA1 723e036976c7533e046500f22bbaee54cee3b042 SHA256 6e48d022b84ea6f4628eac544943ae6e1393be2e811463c2414b5da435f78ab6
+MISC ChangeLog 61326 RMD160 01c4c3d8f8c6372fbd04ac9c067c4f8945194517 SHA1 5b29279a5dda9561d70ed1413720937f434ec0e2 SHA256 604ed26908695d0e8b9a43e745b3486c2623f923be539bb9268149a95918d8be
MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk3vtcYACgkQCaWpQKGI+9T3cQCeM1y1Z3jdHZad2+wkLZrjN4LW
-zT0Anjrt1foRErdRAxpq+ZLzo30gYNkN
-=9Bjx
+iQIcBAEBAgAGBQJN8ttpAAoJEO/kOhxWD91kILkP/06NPKiWde+LM8nI667dl/zS
+++jaBgjy8Uqyo13JsWBiYcD67DW8+/2Ex+oyp06DJtf5NmGonGy+9KMLkmdWhhaz
+sRk70ok0x/cBfF1OlDjCvwrAwNRdfybfY3UfJMDKsfJof7M7agrNKLiTgS0kV2qV
+2gyjhsqJIevMggtNu7+fh2aqMVVk/yF9HN7ORIDe2I8tSHc3BKBO0ZPLQnCm6A2L
+kwvYc4aJdMPq0x1E9c63tY1AxRwAKWL13FfEmS3/r321vGP7AV1ZheEtNwo2rp4E
+f+BC7nVuAdxhJX4oVDUPDiMIpxiIhDc70KKYdopo7y3ZQKDNzLiLZfBOCaivaQ37
+ZdKkdwMZSQxDpKg9T2cOJCTmBIB5v77WyvY3tF8iWdaI/9DVjNx4fAoVvvJA2gny
+WkCcVViNBOT8SrYM2nCU+tP5QFPdxfOkkbYa+30Eb+kY3F+tZ4PpL3RgxuqQWS9R
+WNLG4B5owczdF/GQXg0wbPr8QGkQ58Dms7EpRXL1dZoGsArhFkrDsoagU+s39qIB
+ICJugcoBW3fndb88FLIopjzxbQimFa7ZfYq3gdix/ZAr4Afe9InMtBBthf3KAOpY
+AW7IbNcduTe4gRzOYdPI2WRXc8yB0IE7zXz/XeyYohphyFDMyiw3t4KC/NQtxIWC
+dY8yjC0PUEcE5Am78bEq
+=Dq0a
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.28.7.ebuild b/dev-libs/glib/glib-2.28.7.ebuild
deleted file mode 100644
index c3aa4607a3a1..000000000000
--- a/dev-libs/glib/glib-2.28.7.ebuild
+++ /dev/null
@@ -1,176 +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.7.ebuild,v 1.2 2011/06/05 13:12:30 pacho 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/"
-SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-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}
- >=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? ( dev-util/pkgconfig
- >=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2"
-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() {
- mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
- 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
- AT_M4DIR="${WORKDIR}" 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 \
- --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
-}
diff --git a/dev-libs/glib/glib-2.28.8.ebuild b/dev-libs/glib/glib-2.28.8.ebuild
index 39c51aaaf3f6..eac1980efce6 100644
--- a/dev-libs/glib/glib-2.28.8.ebuild
+++ b/dev-libs/glib/glib-2.28.8.ebuild
@@ -1,8 +1,9 @@
# 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.2 2011/06/08 17:47:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.3 2011/06/11 03:05:04 nirbheek Exp $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
PYTHON_DEPEND="2"
inherit autotools gnome.org libtool eutils flag-o-matic pax-utils python virtualx