summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-11-09 09:10:57 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-11-09 09:10:57 +0000
commitc3d8751ec51f993351d031ddf122611f84aabe32 (patch)
tree74abb6d5d525143817570c90349fffeb0d674f0a /sys-apps
parenttest phase re-invoked with known and filed failed tests excluded (diff)
downloadhistorical-c3d8751ec51f993351d031ddf122611f84aabe32.tar.gz
historical-c3d8751ec51f993351d031ddf122611f84aabe32.tar.bz2
historical-c3d8751ec51f993351d031ddf122611f84aabe32.zip
Fixed unconditional call of python-single-r1_pkg_setup (bug #490778)
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/util-linux/ChangeLog5
-rw-r--r--sys-apps/util-linux/Manifest30
-rw-r--r--sys-apps/util-linux/util-linux-2.24.ebuild6
3 files changed, 24 insertions, 17 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 6ae92ef39b35..762a57e1e918 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.440 2013/10/29 20:25:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.441 2013/11/09 09:10:56 polynomial-c Exp $
+
+ 09 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> util-linux-2.24.ebuild:
+ Fixed unconditional call of python-single-r1_pkg_setup (bug #490778).
29 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> util-linux-2.24.ebuild,
util-linux-9999.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index fe28cfca7099..7d24472a8f6a 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -43,24 +43,24 @@ EBUILD util-linux-2.23.2-r1.ebuild 3453 SHA256 dd8f1438d0f30a369df1414f7fe8f8972
EBUILD util-linux-2.23.2-r2.ebuild 3564 SHA256 e89186a72e09d92b1b2bada7234abe8c23294b65e550383c84737f091641b8cb SHA512 18e02c2c0037d53b74ccaf26c57560ece78dded55ece1a0ec4e310d0faa931def8c0c7fc2da4807f1200c76cd185a860884c0be92d3d1cea186b64b33ac49b75 WHIRLPOOL 6689802b39541053297a1adb76ee50a4a6a4eee3913db6411bee16bba96d430c16f1586c0e07e86cf106ca7dac0ef7343a77dbf97225eeeb418917b2bd8c12f7
EBUILD util-linux-2.23.2.ebuild 3364 SHA256 89ab236da7f29d87ff603e1d8e978c155da0f0da8dd9160a3a564e950e26a5fb SHA512 17bb2ed953edb9b1e28108bb60f5f98134b0fd5abce0426d5f860ce4a340410aa7bb9d4e25bc8903a6fce1044bde1cb5f796a9a9b2e70e166049c077f8191eeb WHIRLPOOL cc7942713f0acd969e2eeebb889813f4016e2e4a0b7d030980abf002031a4eb881c7a08220f892a16e89943e1173d4e73f3e3e7fbe628138a69266fdafc377b9
EBUILD util-linux-2.23.ebuild 3393 SHA256 b4a256fb297c657c06b7708848f887a7cc6238ac87b6f1afea990bfc993c3de7 SHA512 9e6081da539ee17ed8f47b5913b22b5cfbbe6689893f2fcc8dc3f69a2e3c19c145ac54227db43b5e56bb5374f63cf625b910f71df953bc974eee3a4439056dbd WHIRLPOOL 0e2b2223c56b278a1d62189e5325171d5846d0b4ce916544600551808ffd9071e12af8ed4d8a2ef412c49f46fcaaabd7a8f19f3b1e705dfee01b5269a2bad4cd
-EBUILD util-linux-2.24.ebuild 3741 SHA256 f6e3161897fd920a8628acd64d348b8b846369ef83b5c50631d018b0c6f279c8 SHA512 47ccbf7f7e9edc557796bca53fc481034ee170f38468b22744b121179636f81caea6d1eb182999007bfedd6d29f34842ce205fa7b2333e3f62c0619d5ff9fa4f WHIRLPOOL 9b4ccce87c4291c196fa6ef93141b3014423f42499e8ebb12bd307f5cb78905c5e5685b77ca772a64265f50db12d9fe6bc171008053760ff8491a48b413c63fc
+EBUILD util-linux-2.24.ebuild 3800 SHA256 8e5b53457138c4cc7c4908fd8a47e10b91a0fd8ba9fc12ad38e627e0c2c45f4c SHA512 354c688c8f94594f9596268db5ef81034b55c9f4f72506ec73dba97c97d1dc79b6f01429e36dfb81532af4530d014ae2e09fac171a63b958de1ad26197e0f8b1 WHIRLPOOL e39f1c2c275f4c97763d58e0a3511dacc68f74398cda4dcb5c3e8ba323864369a3e1e36a8b10734450bb28c9f465e088c509b28648ba058987d217e00baba8c9
EBUILD util-linux-9999.ebuild 3742 SHA256 f2faba25647f086250a64f1a1b83a7454ce858bb478638132f82d70566813e6e SHA512 93bd85462de24c7069edd5f4a1756a6b3eb1dcc543ce0fafeda3edf5fd6a7bbaec4730ad1ffd47f73b94963896ead4729794a2cb7321721c2af4181e3abcaa0d WHIRLPOOL e6db53c8319066c8b2a99dc58a942c4f715b39768b75e2a4851f67baa94fa7b8f7266b946a54c07a40db07eec34aefecf7ec6e5dd02698cfa9ea9b8344bcd4e4
-MISC ChangeLog 67827 SHA256 c68113bf09d1afeee98a9663371009519edb538935881cd9cf1b404dd6198c0d SHA512 428692cf5ae4a99334a57c314893bb6e14e20d8e2c3d4d940dbd4c41f6a1054584b249ff0e03c59dc9321b485d188723dd450e469f3679e3e29164fdd36d27bc WHIRLPOOL 6d9534301c4684a0d7d81470bb504359886291c796e0d27bdec74b5bd091e0916aabc319a8a51f6c2252fddd42444f4a9989759167ed999b1258f4a9de27d3e4
+MISC ChangeLog 67978 SHA256 1df76dc3f3e401ec283ced65076bb9f1e7aef90bcfad5b37a66deb1ae2af4374 SHA512 3856ab249c4b697b7baefc34e990588a602fd54fb66414e86be806f7d109fc32329b6cb1161809258b62c2a4141add7d57ede06be0bf9e9892fb461ee74ea535 WHIRLPOOL dd85d200f24d5e52ffad90ac35bf37555b6beb06be72e6806f1f4572c0830bb886a0de8ea0b661e91e5fc53a1c63889712b44d6a28e97c9722f2ed2778aee049
MISC metadata.xml 1089 SHA256 cc475077acdfbdd9bb9d7ce99e844f5befcbd5a0939b35c032c8e79a1ea951a6 SHA512 33929335a39c373fc37768e44986d14571f7af1fb6cbade3847dd14adf09e7f0c62b16bcc5906283558fe50fe9e141a5b8562961045c83bacc9c3d1707744b06 WHIRLPOOL 7cacbfb5283ee9600da67d5c284db8a96d49a01ba2bf884bcb9ea056f4fa75b2296b5804dcd88c5832f1f6aacd4c7c1f498ffa1d4a8ede963c184c2b7097905f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJScBmmAAoJEPiazRVxLXTFCjYP+wRd6zcDIcz5PAeAaIL0O0BB
-DLc2Y1JwNYtNa8aa8AnnZywvzGGxGPVcAhwYUQmNnQ69G/0pGKsxCx5NUw3ZWuer
-+uA2wyweWqMw+efSz72wF1fXMMRj/DLesx4T4dw8FIfmkFixLkDr54RH1lbeLQlM
-Vp3c6TCuImVZKZNjALbYVesDbBJJC++Ll51V3uu8Bvd01ODz1BWbgX639sYaKJmG
-vtMqzn5KVkza/grb2KComeLhmJwyEgammc8q0foabbR13XkTrN6FYtsIzfRk9f60
-8iUgQORDJfxM2hGs1I7GVvqZSI7kW4Oi+mRLMabyVcac2x0q7LQnKWgss/JkZyte
-m8e5Un2esDpjC8CyrqfPDpI4H7fXScT1UcosHle/BnfgM1loxBje+84+Hn3nF/qd
-ZY0I9j2+pOj4+l7mnlX0pNkGYlRJzoeIilwHHFmMPS8rQZKjZvST/SRGW5GnlxAo
-QG5bszdwLlj/4eG+Lu2HfKi2mB5MXsz2tvP/R9UVyFFitJhHEZXu7FLHoE0109/H
-nQztkEqTBa2DEfNBEv+IJVrBhmeWCBs7+SwGAOssYx1Vl7QrZsHkC5bTxMbIpvFV
-HkFY0bG/OSyw66WAPU0JAZ+CV+hRQt/1DbBNJ544Q8/KTFsbZ9gDWW0xzQyDyM77
-shxTJVW9RXFwGn3FiykY
-=dZQT
+iQIcBAEBCAAGBQJSffwhAAoJEPiazRVxLXTFJG8P/3G0ao67r/EMsYM4ctW9EbPl
+1EyJgjxEkwIvDSkBDZ7uHNApwETyIctmd/hI3m24pXerbwg1vJpmO7vxQ8ISKQ7g
+O6Wyl/wL6CPKhwtP5u9fn95bDe04g+HkdhyXUJVO0INHLU2GUv57rl2zRdklW9oW
+SCkUVZ4xI3ooGxpj5gh3DToMAcpjQLR7g31gmN7166lwYxpRGDZMCNGNno2xtaw5
+T/0wwPqaxHalgkv8jPQEYPO7Str8zo9XCM5KcNBQ2UcSYD+R6QznlabsOU2KMdI+
+tnklR4jH9PIIYmWnGD2i1UMjxOX8i0aiyw53KSti58DYVc3KbBqomdh62pWwPlTR
+PEWoTiLVmmUPYHOEgCKaP5E0F8o+iQFrua+OIa4wiZSoQ6Lev1ELZpn7bM0MEkPT
+d7cA7PYPN8Dqwo41+8IoYxMiqD6lPkcf0KkRCxXJ4jRU8/YTs1npw+VaBNfZoid2
+v4lQBzTsODAVj4hW1sc7OBLPcQ7hJKEN7PnyEobHdxxOoUpeJY8qk2KeknBsLTrh
+HjU356yyrFjHomJcO4Mw4Pmn8le+gYRbKinbeZDwfjde+aSuVZVlgQu/yPe7T4CV
+H4gL+QgQSTETp98leAPIYJXLh8C0a8YaS9lZPLQXbQrLHTeeiMtD1d/m3Zp4Iy1C
+FewmYpVHiKcXVSvQlKd2
+=HmcH
-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.24.ebuild b/sys-apps/util-linux/util-linux-2.24.ebuild
index 3464adf04278..358102e059f9 100644
--- a/sys-apps/util-linux/util-linux-2.24.ebuild
+++ b/sys-apps/util-linux/util-linux-2.24.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/sys-apps/util-linux/util-linux-2.24.ebuild,v 1.2 2013/10/29 20:25:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.ebuild,v 1.3 2013/11/09 09:10:56 polynomial-c Exp $
EAPI=5
@@ -51,6 +51,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${MY_P}
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
src_prepare() {
if [[ ${PV} == 9999 ]] ; then
po/update-potfiles