diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-03-30 20:31:38 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-03-30 20:31:38 +0000 |
| commit | 814fd7ce429b8125c277f1b997c0a6c31d3eb7f3 (patch) | |
| tree | 70afa3b570445c58c6f912272bdc039a0fbb0516 /sys-apps/util-linux | |
| parent | old (diff) | |
| download | historical-814fd7ce429b8125c277f1b997c0a6c31d3eb7f3.tar.gz historical-814fd7ce429b8125c277f1b997c0a6c31d3eb7f3.tar.bz2 historical-814fd7ce429b8125c277f1b997c0a6c31d3eb7f3.zip | |
Drop scanf hack as it is already in 2.21.1 (I read the wrong source tree).
Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/Manifest | 32 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.21.1.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.21.ebuild | 3 |
4 files changed, 23 insertions, 26 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 164be42ebe9a..5fedbf092136 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.375 2012/03/30 20:04:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.376 2012/03/30 20:31:38 vapier Exp $ + + 30 Mar 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.21.ebuild, + util-linux-2.21.1.ebuild: + Drop scanf hack as it is already in 2.21.1 (I read the wrong source tree). 30 Mar 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.21.ebuild, util-linux-2.21.1.ebuild: diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 574798f35a81..2e7c8b7e699b 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -21,25 +21,25 @@ EBUILD util-linux-2.20-r1.ebuild 3639 RMD160 8dad7cbdd3c818084c42cbbe49a37fbf179 EBUILD util-linux-2.20.1-r1.ebuild 3553 RMD160 ac25f9648a7a2031b809fc368008bb95191ed303 SHA1 77b95140a55d8c3f243c07e0039fab5427fbfdb6 SHA256 f6af57e96fde274749fd4df4ed4d7bca379b88a70a9a5c15d6423d3f1cbf260d EBUILD util-linux-2.20.1-r2.ebuild 3679 RMD160 13ce8cc23225aba2a484058d53866b014412ce52 SHA1 b349423497fe45f477a730e464a004d5535fe635 SHA256 490a3d40e23fb35eea315946fbee9f993b6900c7275b5970c4cebcd3e1e9e1a3 EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63 -EBUILD util-linux-2.21.1.ebuild 3640 RMD160 69502d9c529aff4279546d155373f43377cd48f3 SHA1 0083b527f49a9d2054dadf16ce09a23227a3b109 SHA256 6f9c13b466c5b909f005117c013fa6dcc13c8826fa9f2528252216a9a560d76f -EBUILD util-linux-2.21.ebuild 3638 RMD160 2e3216f4fc9e1e88dfce4ce13b054f7b588fcd38 SHA1 a7a107feb50c393bb3fb166900170ad9c5c6367d SHA256 62bb3aaa0cd1e8f4a879f7292027207189be95162dae82651af43aeba2e6e06e +EBUILD util-linux-2.21.1.ebuild 3413 RMD160 e96f52860e1770eb3fd951d777ec85abc87933d1 SHA1 b85abd402335d23dbdbc7d4dd68cecb1a77ee3e9 SHA256 1dbbc9714b73c0d6366ad65597f78bcada8b9e86fd70d3d00f00f4b789c97472 +EBUILD util-linux-2.21.ebuild 3608 RMD160 8f40b519ec0a7bc5d95d00f71dc7042d99614947 SHA1 fa91be772698974568e3a7d9ec7ff873c9f829c2 SHA256 aec386a2c0a8acf1e5ed3ebb2de308bcb384d8df58c0971c431880fd8aa37225 EBUILD util-linux-9999.ebuild 3412 RMD160 7c490b30962ff82c9f55144106222ce72be1d7d2 SHA1 0e7b8c482787a424b0853c5dc8cd20606b123853 SHA256 684a2d6929ba190d3711bdd406ad007e06152461aee2f9528f978ca9e537e835 -MISC ChangeLog 57606 RMD160 c908685a5d7825c8f6932b7d5e53e084717f0998 SHA1 f49ae3c3c08a3274f17a959f6897e036cfe10c20 SHA256 c84c2d791ea9adaa9cc116e9b2861c01f405100a31c637ccfb05bf8c7caee25d +MISC ChangeLog 57786 RMD160 42ee9b1452891529619f65f9745e97afa85ea44b SHA1 4a22fdd4cecc97b9f97a18da0a43a2eb909d4047 SHA256 21e73639ae11825e0c4f4c398cf54958c21240efc4193621a75fee0e6c5a7a33 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPdhHQAAoJELEHsLL7fEFW1N8QALKQZivZO1ldbdcaNDqruZKl -HI7zWZ8G9YWuGVAYRiyq/Mt6UWfOUwS9BVkZvIgRNOb4l807CN/D90hs6TFlVrN9 -acL3FJZkuUnqX2J7mznT4/Jc2mOQ9OzwZhIhWZkFPysWtM8Yeyj4yzelZezyejcx -/Oweqi0CcsHShAOEcWM2W8pReJr7ZHnUcHW7RZtekcU9A5ggO4mId/47PuxSwOkp -gp3uEUcBq7imA3edB4buoz3c2m5tLTARjLJf2T9/KPntG+67o8OMe0R8pSyeGvgI -RJ67nyBKD0M4SKAH6iWt/p8T7n7mG3U88zjOmH/EuTN8RgOHL7CwGQAB3SUnbsTo -LvM1fR2PQt28Gw55FuNXF9PWiRodgoHb8WkAt/QLCBGyUSvEYuJwrePbigFCVhO2 -2e6SWPvycfx1F9gcMe560rFBMgcg4LCgTW7SoMPGXj8zuaUgb5sQsNpPcd1nQ6og -jy7ItQOlNApwL+lpDTwSWC6rybhHvvmldhJCKAi1fUc1rdi7W1la8S/xSk/UkxHI -+l2ebo9Jhcx7b4gKzohy/pINLJo/jrxqXs//Po6bmhQxAUB+u4BpX3zwa3ngLgcP -K7SWgd/sKA6vmIDPuGzT9SekBhW38gM0ePZ9Gt6vfiLNpIauVSAUe2sWn0m4qYDk -GWWxFK/3/AowUWQ5yPON -=VeJb +iQIcBAEBAgAGBQJPdhg5AAoJELEHsLL7fEFWGUkP/369SSI8e4nOrSEJthvDIE3Q +DgStffV8zoAwrN4FuI1hqKju2F92CoYheXwuZ/Mo9a2yDuMGNX/EuwEAGlzNwC3J +O1cd/D2Sp0zr6d1K1SRDk2jw88LN3wqb0txp4fQN2QmdRYgEuToSR3q/5wKf3Por +s7IiChXdfWZnlbQao4+vGythO/iczNvzFFz5hqK6tkyUaeZDV4AavR+vjLMHh5DC +5ZcMQIGIZ/ouTJ7QsgJtSwRbFT2F0XeuS0OoZ8EhP+3pRWe1JIUefO2dLz9CEvYB +XNIbcAAor4weFP4uKF7DE7D00M8rKJq4Dn4H2W06p0VqMDXLMOyg/mSBOlh9iFGi +w0/iGXWPdlTSU8qg6VJcfbwALAE9fakVtFUzofCkfRaT6FpOsFXq2WSR5E4+g2Sj +pRLur5UexqShRIGxHBniwAFXxcRBa7jA4HNdI8V93VqeoncomzV6Xb25l9hWPHeR ++b7qJuvv1WQrkNZ7v0mVchpbbf1to19x6WoiFNCBQUn9m7V4MCJYJ8HBdJ+3R4Z+ +QyvcnzIoL5KSvzhcogTWlrTBMv1cOmSwgvUTwFrmodYRpbJUZ+IxOjQp+nC3ndRe +57iLkI7IX4MtCO0kysw8XUcnGcu9O9ibmT5P+wMDhFlbvJjvDPaHVy29Gjy7Zeh4 +4wcshxIKg9aB07kGJc3A +=+jpS -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/util-linux-2.21.1.ebuild b/sys-apps/util-linux/util-linux-2.21.1.ebuild index d584687927bc..90b5ce4efd32 100644 --- a/sys-apps/util-linux/util-linux-2.21.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.21.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.21.1.ebuild,v 1.2 2012/03/30 20:04:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild,v 1.3 2012/03/30 20:31:38 vapier Exp $ EAPI="3" @@ -68,12 +68,6 @@ lfs_fallocate_test() { src_configure() { lfs_fallocate_test - if tc-is-cross-compiler ; then - # newer util-linux has this fixed in the configure script already - [[ ${PV} != 2.21* ]] && die - export scanf_cv_alloc_modifier=no - [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms - fi econf \ --enable-fs-paths-extra=/usr/sbin \ $(use_enable nls) \ diff --git a/sys-apps/util-linux/util-linux-2.21.ebuild b/sys-apps/util-linux/util-linux-2.21.ebuild index 4c259ba8a813..518bcf0b356a 100644 --- a/sys-apps/util-linux/util-linux-2.21.ebuild +++ b/sys-apps/util-linux/util-linux-2.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.21.ebuild,v 1.2 2012/03/30 20:04:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v 1.3 2012/03/30 20:31:38 vapier Exp $ EAPI="3" @@ -70,7 +70,6 @@ src_configure() { lfs_fallocate_test if tc-is-cross-compiler ; then # newer util-linux has this fixed in the configure script already - [[ ${PV} != 2.21* ]] && die export scanf_cv_alloc_modifier=no [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms fi |