summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-08-01 06:49:26 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-08-01 06:49:26 +0000
commit2c559f3b65bc6a979d754f78a2e61772f0ec5f9b (patch)
treed231c1d12712b28d596fe9f35ab4e5d3e49c47a7 /sys-apps/util-linux
parentbump & drop old (diff)
downloadhistorical-2c559f3b65bc6a979d754f78a2e61772f0ec5f9b.tar.gz
historical-2c559f3b65bc6a979d754f78a2e61772f0ec5f9b.tar.bz2
historical-2c559f3b65bc6a979d754f78a2e61772f0ec5f9b.zip
Fixed installation aborting with header checksum error. Added some more changes from 9999 ebuild
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r--sys-apps/util-linux/ChangeLog6
-rw-r--r--sys-apps/util-linux/Manifest30
-rw-r--r--sys-apps/util-linux/util-linux-2.25.ebuild10
3 files changed, 25 insertions, 21 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index a0714a9e743f..730503bbc331 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.476 2014/08/01 06:26:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.477 2014/08/01 06:49:25 polynomial-c Exp $
+
+ 01 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> util-linux-2.25.ebuild:
+ Fixed installation aborting with header checksum error. Added some more
+ changes from 9999 ebuild.
01 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> util-linux-2.25.ebuild:
Removed cytune support.
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 7291cd27b3f9..cfb20383e122 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -14,24 +14,24 @@ EBUILD util-linux-2.22.2.ebuild 3295 SHA256 3756908b5207220298b26b2c0b7b610b980f
EBUILD util-linux-2.24.1-r2.ebuild 4130 SHA256 a2bc50f994ff17185a3680841110ab1a320f51b3ff96291ac28b4d0440761895 SHA512 1253cb5bb86ad131ae32817bc45924804a8e48819a45314f75117fb1035f24100edd2b61a9241cb9bea0855c2877fd6fa51d56ae8dd8014ccac711efe9d04172 WHIRLPOOL 7b98c36037379421ed154c0e86f5fe308c0dc8458df01b9d87dc0110f4053292b16ce6d96949e2f5f3f315dea1a5d538b8e713ac52e2eca40cffabe75f3b7976
EBUILD util-linux-2.24.1-r3.ebuild 5152 SHA256 a633ca41cd7c268dd69851eab1c3befe8b58f62a77b9f5b69c3fb1fa4cba1ed7 SHA512 11a77703a5aad1ddcb4690bf21520c4d619ceac0c2e3ecda456aa2bf12e96ceb120a0b6ecfac26a20b3e4d8d2caf206970e810873c8c67ec1224d6c8441fff6b WHIRLPOOL 54996623a7433e6d8eb693c58e8411752b4b6cf70abad25410ab6b9f2cc293fcc4c0283c42b603fc09a62be7442f974f54f60f4612bb10b43898963a73d9f002
EBUILD util-linux-2.24.2.ebuild 5102 SHA256 19ef2c840e46a3600049475a21314b28fcdd824b25eea7886643231b63434f2c SHA512 fa2faef82f23af4f389f334b5ed9798a252e769bfd561ca99bf0782a681c9666da2c02c1da22ed24f0aa12371f483a46daa61fc4ed67b6c5da342aa0c5a772a5 WHIRLPOOL 91b334c7c95b6ed7db1cba484b1d9ed42d76bd116e1d522390128193e7fa5d7112f110957eb5bd8b921750981eb07670ca93d0a7225abd57447ab176ebf1332a
-EBUILD util-linux-2.25.ebuild 4874 SHA256 1aa993a5e5d1d4e2d2d36e08136b7b11bae2a04dbefe48bf506a6c3c538f5fac SHA512 6f15f36fa44c0bd668e36e621475b8521f8bf24472aa2971a6b170b4b2be802164929b00445417c90ea07e0f8fe0ac0f0b309661ca6aeb9b18b3caf3cef6e872 WHIRLPOOL 4c225d3840addd1f1c38cbfb7c4a83ca6f39787368aeb61b907611019a0d0ef62801f0d778d46eb4e050bd88516d3228c31fd5158ae9e80c96d305ee3674589e
+EBUILD util-linux-2.25.ebuild 4859 SHA256 c9142ca08b4c6db3e5bd77af61692e9749244f4b91138e61bde39f97bc53750b SHA512 242ba37f224d7dbf4a644871044c5aa34bb0eff6436c5ef4e2fca0d40ee718cf4a0a10f7f961914d824642059998f94aacf2c9b5812d9bc087f1fbc17f77c0d6 WHIRLPOOL a6afde60dae6dc2779cdc456f031e1e5542e48abf57470b381776ab9b0c2d074da17e3d75e41e87264c1d728bebacfd1b3941eaf846071c6ff899234320386bf
EBUILD util-linux-9999.ebuild 4878 SHA256 ed0234c6ae85ed64d9d105eef4dd83774704c5dfddb888bc1c209245b67bde33 SHA512 962fa4b76ca001a14e1442e2eba51988796640a50a5ebd574b7dca544c1aa37d8195c9452342b1eda5dd9c126f2550977539518d65fa9cc3954741cf6476dbe6 WHIRLPOOL d00bfbf0a201c68acc313eb6b72c3ec1a5fa8db549eff3f6ad1ad5ac9b5a6c2e01d700b09caf89b93684706bddd3646f4851ffca3eba98896b250e3829ca4180
-MISC ChangeLog 73994 SHA256 3e653a0de1e24491a3d76ac33d0ddd67c9f50ab05eb1116b4358ab7c25791510 SHA512 2833d14bd510e19baa7c1651293dde2161dd39bbfb5f64b389bbb683090368bf67a7e776029b6d8ee33230a0781263914fb15007cf05d5dee5fec74fa7d85e12 WHIRLPOOL c5695e1ec4164ad02e4603e3ff2705fdcf37e316709300954ff4c473a6a939c6f317dd3caf0ef555ff2c0ac716c31e4caac89d23e8ad4c95f9f83c9258c74a23
+MISC ChangeLog 74175 SHA256 dd118dd8e2ccf181e5ec4843c7dcbee137e7a6532a09ad8121f6f3ffc4b6b5af SHA512 0f848d9e010bb57504c3a5fad51bbddda3e3b4c74edc96ba492b3343f22724ac5871020ff48b78b09baa93ed14425790f3a4d6b39308c496af62cfd063191d4a WHIRLPOOL c4c6e73a8ffe98f90aa6751d1643050aff56be138134d5ffac033c86d814e3b1b10f91c2a3f9c378c68e81551ddc27d12c5c35ffb7c04ce18a8645bc03095ff9
MISC metadata.xml 1019 SHA256 62affc682c5c13f06f677085089543d447e7a94315cbc8f8291f8ff771e68af0 SHA512 345eb075280ced11dd52ceb37ca3f971953c00ed6a47c281281c0e8f197863a94b8c0dd7781ef91b85d53696b2b877cdbaa60a39cca1bc3c39c10f160b148e11 WHIRLPOOL 41204aed1d5a7e0a1ebcf36ffb28d88eba79d83162c134e09e02eec490d54cf2ae22b2896a2dee73dca6ad7a7d411d8f545c23581c55e90e252f80b4722f1a7a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJT2zMMAAoJEPiazRVxLXTFDVsQAIZzJnf9cTyDycD2rGF4vkkk
-sN3lObs5Qek/UPA487fYUufT+rw46jBgoHEeUz8GBGAcyWXZDN/vpfzECTlOarIy
-pncMZeheRNgPum7Jsl7Kc1YqqzFpRLR3yRboOfEDHVtoIdOyRFKHUF2QT3VnjM3s
-Pegql2M7I9cjPwZotabG7YnNwYoZcGuyRio7C5RUplAvDAz/EpmiNpnXcLb9YX/W
-o/w/9mAIWHGojuEhzk4xQq00v8p3hKjrYlqlWx74z8t5q6PNFBZSOJKBW/fBvriK
-ExHu5a4fpLPm5hs5+IQtm4FZPmL7VtnRzMXJEbft8wdDRr4ZTMkHB5oZSfBejFjQ
-D7kNr9m5K2n7wIM8B3jmC4vzLc4Wg78Z72a5C96A+FtroAaTKCf7gErVEv1GDJ25
-GMwMVBcwe+W/KrHvIyNalrZcAQJnwRlLwmyZSvGyjH3l6IQhJQbUEXVnv48yeaPQ
-/YhH2Yandl6E03iYt0ogagmk4NLyAs3iddX++7HimccVOpCLVzcQSraactHwgKym
-g6s5H8p3z2SjVU52z8FLgK+9/+dd6yKUpqOV3oGzFCfx3U6rW22k/LjB/j+Z8XZR
-2eqypc437XvK+qIr81ek7iZcBQUKTTtfDS6UKz6L53WUBkX0ImMBXtZYZOCAWam9
-q5ulnGCy0uA/jnZY9ff0
-=NDCV
+iQIcBAEBCAAGBQJT2zh2AAoJEPiazRVxLXTFxEgQAN1246ThUsSnM4Ag4W/lLDdP
++0MIZKlQL+kIRFhem1OmSLMjdpYfiSiEuyTuNZCRHX6nvMh3k1QkVEx10UsmqjnC
+H+8TQMQgO+IehjHSvqiPWy48IgLtKUiBDh88ThWyQ57mUiPBQM9GdMksZx8IGfGJ
+xqHlmly/qGGPuOLqjuxdWsGzbydIuYoCrc7H4UnQmxR9BJ0xI7V1NcUcHEGWIulq
+/Ik2GDxLrdBPB6lBnMlJh3VGfhas4BfO+dUmMaeCPo1i3gT1U433k+trfhv/mdM+
+UbQFWQcf85pXQDiIz8Qy4p+NFzk4JJ+Pg8tf9AVDvLdPd26FMkmV0w7G8rDyInw2
+MK7ABKhqilJB9MJrF35xXCE5dzo3mRS4hKC8uDtqJliGSZD9UXZRSkw5biVZYBgb
+0wzPLyIM/dCdKcC+L+R0j94dj27yp9qUSLttPJA0i35B02AMtD8z4Z/kRJgPDibV
+qehlrOHSsoF7DOF2y987L921usXs/WdIvCHuGwtlvzRAcGmSA78W2GP3GixSEJqQ
+GrYBrmrweQF9yG8xqm1lW1XCmZ88QwX8eVCbd/zqaSZs+UmP1lsQ9r8kRdr42zuC
+Rt9k/BCJfFcON7ZY+LQ+7udP7RE0j0S6XPvSThZ1hrUFxB0QxV64vAPr1/rWJf34
+Mq4J1KXrE4WFmMRkw4ak
+=MTaU
-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.25.ebuild b/sys-apps/util-linux/util-linux-2.25.ebuild
index a2194f9ac891..e575275d189d 100644
--- a/sys-apps/util-linux/util-linux-2.25.ebuild
+++ b/sys-apps/util-linux/util-linux-2.25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.25.ebuild,v 1.2 2014/08/01 06:26:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.ebuild,v 1.3 2014/08/01 06:49:25 polynomial-c Exp $
EAPI="4"
@@ -65,7 +65,6 @@ src_prepare() {
po/update-potfiles
eautoreconf
fi
- find tests/ -name bigyear -delete #489794
elibtoolize
}
@@ -87,13 +86,13 @@ multilib_src_configure() {
export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
ECONF_SOURCE=${S} \
econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
$(multilib_native_use_enable nls) \
--enable-agetty \
--with-bashcompletiondir="$(get_bashcompdir)" \
$(multilib_native_use_enable bash-completion) \
$(multilib_native_use_enable caps setpriv) \
+ --disable-chfn-chsh \
$(multilib_native_use_enable cramfs) \
$(multilib_native_use_enable fdformat) \
--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
@@ -139,12 +138,13 @@ multilib_src_install() {
else
emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
install-pkgconfigDATA install-uuidincHEADERS \
- install-nodist_blkidincHEADERS install-nodist_mountincHEADERS
+ install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
+ install-nodist_smartcolsincHEADERS
fi
if multilib_is_native_abi; then
# need the libs in /
- gen_usr_ldscript -a blkid mount uuid
+ gen_usr_ldscript -a blkid mount smartcols uuid
use python && python_optimize
fi