diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-10 17:44:49 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-10 17:44:49 +0000 |
| commit | a446b9b25c865ccc1cc052b1645f6b7165146fb4 (patch) | |
| tree | 43fff0388bd4221c828f40e05cb9f6ab737da5c9 /dev-libs/glib | |
| parent | Version bump to 2.02. Fixes bug #450080, reported by Adam Randall, 7v5w7go9ub... (diff) | |
| download | historical-a446b9b25c865ccc1cc052b1645f6b7165146fb4.tar.gz historical-a446b9b25c865ccc1cc052b1645f6b7165146fb4.tar.bz2 historical-a446b9b25c865ccc1cc052b1645f6b7165146fb4.zip | |
Add blockers on emul-libs so that it is stacked for baselibs r10
Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/glib/Manifest | 10 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.36.3-r2.ebuild | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index b6c97f825bda..5a0df61625aa 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,9 @@ # 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.566 2013/08/10 14:24:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.567 2013/08/10 17:44:41 aballier Exp $ + + 10 Aug 2013; Alexis Ballier <aballier@gentoo.org> glib-2.36.3-r2.ebuild: + Add blockers on emul-libs so that it is stacked for baselibs r10 *glib-2.36.3-r2 (10 Aug 2013) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index c6b7930810f9..2c07aac18360 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -26,14 +26,14 @@ 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.3-r1.ebuild 8459 SHA256 5f6c191593d6cc0a44442c9cec540b48b4791416fdf22010acd9ad858b735c55 SHA512 1c56ce38aa7333e39fbbda431f212bfac83b70975ae49de55a11bb700e17771310b16237ff5673f61c370ced886cbeb72e4c898cf79749bf55744cea699fd76a WHIRLPOOL 826c64dfcc60b293d659c45e1ece35ac60e758a6b7a0d6a71e4ce00a87bc30c881decf1dd2f18410f156383dbf5bc062397ae74e53321cc7654ec452edd17d4c -EBUILD glib-2.36.3-r2.ebuild 8726 SHA256 decb1b98b30db6a0ced4a53b68a91455df3822661a97ba74514a41b964a479b1 SHA512 38cfc1ffd924aa966f5d044f743197df453a7db8b5fd47ceee4deec8d10ff08e92ae254ebbcde89346b5dada280e32e3bc091fe22c07a270ae3859de1e0cb66d WHIRLPOOL f234c22495014ed985f2177c274327cafa09fb0bae84abcd342dee8eb6141ea2e7cd8dd35f15f4cbfc1ae1f05096f038de3e14bbe40afcb1125cac00b2530c9a +EBUILD glib-2.36.3-r2.ebuild 8856 SHA256 bc802923bfe099921d17ac502a3784d2343862284163d82089697eb8f2a7543a SHA512 691f462872a85c588b85a03db778752a8b3df5f01a28dd1cca4ee8d343bc0159b5cbf0be1051c15d1da6a5eaab2bee09c4579dcf60f0fae274b03dd5f12ab00c WHIRLPOOL a4a8fc11a3b1cc56c2a9ae94f55f846cd980fc03b1f6ca083a783b58ffcc41dc599763928fa5f1f39a2a37ff960111fd4239b8614db31a6e5a8188e44a7cdb22 EBUILD glib-2.36.3.ebuild 9202 SHA256 c806edb96874dd4d9e3a8fff70f8091723b0cd884bff0032e2c78b98db57da21 SHA512 7ebfcc9df549e1ed1cff863fd3d6c2458609e44f58698d2f37262950de552e9985e3d33a07917268054f9a8dfef0f179e6c77ef5c01b7d47b7941e1e9cd4df8b WHIRLPOOL 024a575e623d2710752afa2eea1ae6a38ec35e2dcf795854172dbb06e6bc1c8760b90c5e43883d1833481fdf77cce03c16d0e80f47692b987658b89efed23558 -MISC ChangeLog 78738 SHA256 943788520dfa3ffebade76b9aea1cd5e71bd3521db750889bf6efe3517bfccdf SHA512 7bdbd9c3bf95d72e103a303f0a4e8420503a71cdcf1d7c92111ab4b1d00c37cab52ea7dc826f7684f030ed1161ac05e2e9d265dcb6cdc505d55f2a54801de85b WHIRLPOOL e19bd2e77a43ae1ce00e398575e4aa3dbec32816867b7cf9a33840f3b9372a5343dfb4636429150eb6a3500330cdf126a5e9e68c66187d8cb5c36b499b089884 +MISC ChangeLog 78881 SHA256 14ebce71ffef444e43754c106795b7937d725ae71a8cf55dc7d0049bfa5eaedc SHA512 e109b395b2716133f51411234647baeabb2eebdf3327f6528bf71501033f135cd11756a6879e64eee416ac11e62571c7238be5de1cd0c87f7f0cdd2b20565984 WHIRLPOOL 044db812aa3e94c2423826c9d7bb089568432f67afe59499b949b9ec53204059c1350b38e447df0eb370e8688ec5abe970b036e1a7a818ae3706d04a8e556e36 MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlIGTSIACgkQvFcC4BYPU0ryawCgpdStAq0Tl+DAslBCDZyrEYgi -tPoAn3nMbJbw1tUDlse1pQa2XNMxXCmN -=Dxfo +iEYEAREIAAYFAlIGfAsACgkQvFcC4BYPU0qssgCgniDp55owR4nJDwr1CQYoQqan +OigAn0vlHnzav5bpet+uS3hN/4bcAIX/ +=Z9Dp -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.36.3-r2.ebuild b/dev-libs/glib/glib-2.36.3-r2.ebuild index 004ad8b48a3c..ea4698194fd7 100644 --- a/dev-libs/glib/glib-2.36.3-r2.ebuild +++ b/dev-libs/glib/glib-2.36.3-r2.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-r2.ebuild,v 1.1 2013/08/10 14:24:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r2.ebuild,v 1.2 2013/08/10 17:44:41 aballier Exp $ EAPI="5" PYTHON_COMPAT=( python2_{5,6,7} ) @@ -28,6 +28,10 @@ RDEPEND=" utils? ( ${PYTHON_DEPS} >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) " DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.1.2 |