diff options
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/Manifest | 16 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.36.3.ebuild | 6 |
3 files changed, 17 insertions, 11 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index c9e08b7aa088..386164963cec 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.563 2013/06/11 13:30:29 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.564 2013/07/17 04:59:44 ssuominen Exp $ + + 17 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> glib-2.36.3.ebuild: + Stop applying glib-2.32.4-bashcomp.patch because the upstream default of + /usr/share/bash-completion/completions is correct as is wrt #477064 11 Jun 2013; Pacho Ramos <pacho@gentoo.org> glib-2.36.3.ebuild: Add gobject-introspection blocker to ensure people don't mix different g-i and diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 781d28795b06..61585fa4cd5c 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -26,13 +26,17 @@ EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e6213 EBUILD glib-2.32.4-r1.ebuild 8283 SHA256 dd2679288fa2fc9ac701c7e28802ea9cd651e0ecfeb21aba77408fd7f3cad044 SHA512 84dff6719a77eb70d2b80473750521518b49cd353927034192f83e58e5ce81ff7a4333545a300f0ad71e4eb1a4d6b69fa0cf55c1cd85ce603fd47ccdb170373d WHIRLPOOL 8e06ee1377e42d79ab138e5775b6ba86bad3183213a3b6053e8f841019b53c23f3907a1a34a7f2b57e9f83e804c06868d39493ca8bc7abb719cf7190af824e65 EBUILD glib-2.34.3.ebuild 8559 SHA256 f1af100fd9f3ee7723687b8cb62ba4c31c1460f745bf4fd0ab5a61546ca72841 SHA512 b0fde730dab39339c838474b28097a73d7300f4b50dae36544a1dde6b57a22fbdb02e21df2c087f44e14de8d272fdcb77b2fe91b5ea28a4aa922aba860dca00d WHIRLPOOL a3422c3a2c9068fcd45cfd0a1d428ec19760620fe10030f1de4ca19b348f19d4a0eab97dee982f04986d3038413b3fcb980b6846d38d32dec1fd67590d21f0b4 EBUILD glib-2.36.2.ebuild 8926 SHA256 8b3b72415c41eee28c05a28c74466cba565c14fd248a263fd4502da8ba4ce687 SHA512 0c5e0d4e98c3f8b5da803a4bf020cbabee465ef00863594a008ffde7b1018fc2eaa9b50b55ff8d9694c9570106828d6a0c2c2c44052a65902a0e06da7265236b WHIRLPOOL f4ed22c4188d72d80c8548396a424524d90cb2b8ed18bd0fcc0a7cc85c6e7d7b2168971ebe6c9666af811678e2b9fd6d45a855fe3ea9e658af7d15e2eefa77ca -EBUILD glib-2.36.3.ebuild 9259 SHA256 1fce8fa44257fe7acc15ae6700393ff7c425d3103439beb5078cb76d9014b761 SHA512 cd13c80ae9e4463c0a4c254e79badcc91a8deeb428a8d92b54d8792500d525f110c95aefc440ba076a578f3a575d3237a3efa8bcfa608eaa5d4928bb18cacb5a WHIRLPOOL 334b691343e571c029f91bb594dede0769cf085fa839c14fcd80f11a6e574b8bc114a0a0e792faab2dd11fc8fe3b0fb8a51ff6ce32e005ad54286568928c6253 -MISC ChangeLog 78056 SHA256 8a5e81bbac222eb446c89d89a36a8dfe7f551777687a9c1195109cdb32b09c96 SHA512 a4f724ff59263cfc210908acfaf72572de506803362ec09bf45edf81572862fde23d3526244ec8f5352451450927b8ad57a821ede5dd39f16851d47b126608ef WHIRLPOOL 8c9f790ce81bf50d693b6d7c43fc393785ab2233cc77e2c4afbc109d81c100f44f1d7aaa29ede2d30d100ea52bdf0be3bcccc7446c9b3a136061018f3a7337ec +EBUILD glib-2.36.3.ebuild 9202 SHA256 c806edb96874dd4d9e3a8fff70f8091723b0cd884bff0032e2c78b98db57da21 SHA512 7ebfcc9df549e1ed1cff863fd3d6c2458609e44f58698d2f37262950de552e9985e3d33a07917268054f9a8dfef0f179e6c77ef5c01b7d47b7941e1e9cd4df8b WHIRLPOOL 024a575e623d2710752afa2eea1ae6a38ec35e2dcf795854172dbb06e6bc1c8760b90c5e43883d1833481fdf77cce03c16d0e80f47692b987658b89efed23558 +MISC ChangeLog 78280 SHA256 d45fc0bca320a3212abe977ebaef65c3f9741721d38505e7f7b051ecba9a293d SHA512 201c3ca28638b4eae8b84b996b43f0d4df7d90d1cc08cdc2551cb041ce1a96e58b8ce15a13d5a8ba42123d34267b353c505687ef136116657c68a763b1f33542 WHIRLPOOL eb41e3ba089c51676ef7ce925d7565d8c6e3cf08b5d335748c85f86d99b5680ab5e89a710456262a4ef7e4cf9be4a33ea3f130a7a17c64026249b9c027e84dc8 MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlG3JncACgkQCaWpQKGI+9Qx9ACbBe7q18IO+1OUvNZAH7nX9StW -YvIAn25K4CoAFgeeFnxftyHYDnx5m/QL -=sTCD +iQEcBAEBCAAGBQJR5iS0AAoJEEdUh39IaPFNvm4H/j4RgNYbSAly+N1gto4Oe0GE +krD0tI9+Wg4FqLCsLIyF4qGuXYdYt03zUkoL6HaRMA5tfr9iZLM37F5ASYIF2wAd +W3KmYjvSe+MSI4HL9w1FCkBHSgDmAwKZDjZo7ZqVH5ejkUZDKBTFWpW6+//mBXlb +o4a4y/3VIfQYmDSTdu+95fTaw2++a+Hjp8zYF/VlMWnZY0nj02XVsxRA3KwlEK4O +GgOcbPsu425niUhS52dCmrR6HHBrYyonIME4FXrHJVRdGozj410wSBJMFRh9yR7U +HWbW0usPF0p0kKMKJ3XAi2J76ENIaJnab7Q6qcM+EHsLOf1MUJwh0f5FlNNoP5c= +=p3Bs -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.36.3.ebuild b/dev-libs/glib/glib-2.36.3.ebuild index d4ec20006ec6..8f8c0bb18ac3 100644 --- a/dev-libs/glib/glib-2.36.3.ebuild +++ b/dev-libs/glib/glib-2.36.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3.ebuild,v 1.3 2013/06/11 13:30:29 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3.ebuild,v 1.4 2013/07/17 04:59:44 ssuominen Exp $ EAPI="5" PYTHON_COMPAT=( python2_{5,6,7} ) @@ -42,6 +42,7 @@ DEPEND="${RDEPEND} >=sys-apps/dbus-1.2.14 ) !<dev-libs/gobject-introspection-1.$(get_version_component_range 2) !<dev-util/gtk-doc-1.15-r2 + !<app-shells/bash-completion-2.1-r1 " # gobject-introspection blocker to ensure people don't mix # different g-i and glib major versions @@ -123,9 +124,6 @@ src_prepare() { # gdbus-codegen is a separate package epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch" - # bashcomp goes in /usr/share/bash-completion - epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" - # leave python shebang alone sed -e '/${PYTHON}/d' \ -i glib/Makefile.{am,in} || die |