From: Sergey Popov Date: Thu, 25 Dec 2014 13:02:26 +0000 (+0000) Subject: Version bump, respect compiler, CFLAGS and LDFLAGS, wrt bug #377757. Drop old version X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52503f3cde44b6a785132b03e21e57f72a4296d4;p=gentoo.git Version bump, respect compiler, CFLAGS and LDFLAGS, wrt bug #377757. Drop old version Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x1F357D42 --- diff --git a/sys-fs/iprutils/ChangeLog b/sys-fs/iprutils/ChangeLog index b80cde9f947a..f34250efa1e8 100644 --- a/sys-fs/iprutils/ChangeLog +++ b/sys-fs/iprutils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/iprutils # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.40 2014/11/04 09:31:35 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.41 2014/12/25 13:02:26 pinkbyte Exp $ + +*iprutils-2.3.18 (25 Dec 2014) + + 25 Dec 2014; Sergey Popov -iprutils-2.3.0.ebuild, + +iprutils-2.3.18.ebuild: + Version bump, respect compiler, CFLAGS and LDFLAGS, wrt bug #377757. Drop old + version 04 Nov 2014; Mikle Kolyada iprutils-2.3.0.ebuild, iprutils-2.3.13.ebuild, iprutils-2.3.9.ebuild: diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest index c3ec5d580306..c547edf679c4 100644 --- a/sys-fs/iprutils/Manifest +++ b/sys-fs/iprutils/Manifest @@ -4,20 +4,22 @@ Hash: SHA256 AUX iprdump 255 SHA256 f2aa711e346b3a8030879dec4ff7197087070a474cc3b6cb58bcc29047cc7a9a SHA512 7403246196c811546c0733445e7018b50868484ecd1fc66dc038a8569e158ef436289256fba2f6b983fe439a7dabb95fd71e90f3dbc0763cbe4c93a14ee3abb5 WHIRLPOOL bfe2dca45c33fab5639580a620159afaa77a15b006dd0f1b73e124efc64cd7e659774b1957ad56ae14820ff45ac18d80a1706d84cbd4b780903dcc9027d67a1d AUX iprinit 345 SHA256 b3f07b3cd9ac828a2faa3be7c598fb709f929996e6ee46cb6d2c6628d77a2a2b SHA512 8f2f95d6c59ba786ac0e98564fa76a832fa42d1b039c456a0f3f41a3b14e041eeccb814791ce35ccaa61674da2e94b53be8defbf1f0fdc2b90827bc3c9f18a51 WHIRLPOOL da404337ccee3ff9ccd61d38a05c2e1cfd0840fe7d32ef31162508242d2ae4ea2f4b4f06f508f56f38c3c345e21aef637c5d5c41637e3bdf8383c186790f279d AUX iprupdate 188 SHA256 44380207d4ef8897f6d7a30c8515cce1c67a9342fefb112f84e9ad40ee460ef8 SHA512 4d128dc63f3a93b5f0e0ed5a1c036cce1935a45c3913c64db56f69d28f17f2f0a3ae0dd2f23a6062c2291dea023236bfdce5ed3cd983cb391387737e42a65beb WHIRLPOOL a47bcf7cb6fdd256fb7da6e07745f50e616b98ab90cfd6030764544a3f901e5f63b67bb6fb5dad1d2a333e7a182450dc88b291754eefb6593753a24cf83c441f -DIST iprutils-2.3.0-src.tgz 453479 SHA256 805a1000b79680e911c45fa65847a348011c858e42bbf3c6a5cfed4df7f516fc SHA512 6b5af99dd50a972ceed0e59cfc4340f3911735beef162204c9cba5f98b8c2bd48f7cfbe7f56bc1592d24413e703f8f0d41463679d328222991dfae06cbb15606 WHIRLPOOL 44a946ac252989cf1f7822350965512a48106e137d49117fbd03d82b0aa442a8c9ab22cd018b9565772e3a8e0746d52cae31b977141030c1be10b24872a1f1e0 DIST iprutils-2.3.13-src.tgz 180225 SHA256 a225095819dce9402a24066ee65062ad57e0d9ba7f338477042ad7e45193ae7d SHA512 7c185f05300a25147e2b3a7c2e66be7fd5d8a9d5b2655dd86a1c845b9c71175cf8f211b869836b16c9b93655e701837496d736990f022bbccd5eff0056d1ecf0 WHIRLPOOL caeb901d78cf94b24dc4510a5de8b8a45561e583084f0ee4e22a0f1bf33d5c9f2b7998ef455a8bcacf7f0225495fd9ec6d4abc54259e1f1b5b11a62f50337fea +DIST iprutils-2.3.18-src.tgz 1384924 SHA256 8e510659e740c00e2200bb3d1726c3bbe0c0f93e1c4320a63c007ff5ceceffa3 SHA512 230722556c080b6784574f05066230cfd932e0fb9812a19ec6d911f2b281b6a52b15dd4084c7dc29c2004edbfcc6e4b94080a6f0869746a9021116949ec318e0 WHIRLPOOL 88bb686c3128806a77b55a9a871c95c63fc31a3d24046f8ac519a04204e6ec3ce1a74c259322762ab3f1f35204a0938c11cb6af496da2f80bbfe78864d5c3603 DIST iprutils-2.3.9-src.tgz 169854 SHA256 9d56d058dc377ec21323e6a8710742168f5d2148d13dc249021f7123b8ba360f SHA512 d9b05d070941970827140ef6b2b69d2566f862b06e85c91ceec2561dfb08c4c428fd3fafe36657acb7481f2f7c695d355cd1b43f60ad241275facd6bb8d43535 WHIRLPOOL 7f21d6212465338f93f97e0ee7a521065923a57ce9c28b266e7f8929927e0a4bb2d6dd2f89af9bbb8c43c8ad2498abd8a3370d8b7fdf72b1bc0725617f097162 -EBUILD iprutils-2.3.0.ebuild 1102 SHA256 cd9a0c1281ff6380988d2e71b24d0dd66b5dd280436d1dcb2e17f67ca7368191 SHA512 42065e02773273da4f80447875743db6573fa7bb53e6d2403fc3d109d9edc51689a69d73add16fd3918105cf863b06b8d2f2a9a8d7f1df046526f434d49c7096 WHIRLPOOL 0db2f784953aec15162fda366745f1b53e8450e4c8c98dbca5a21907ccbc0d7fc41204c2d8a483f8ad517d4d0a951670a1dc04a3b9e676538ded4b5755159f60 EBUILD iprutils-2.3.13.ebuild 1103 SHA256 b153d3a595c9bfcd60ad075a5a8b6dbc5a2d4b5209ada1948659f7f825bcad64 SHA512 9afba4c3a49d9cba7d71e418ed702b027f1abce2f8fb26eef6cffa6e982c5423236d7536661fc7b3cad24eaa91ab962f2714aedf713c2b9313997423272e4020 WHIRLPOOL 18b183372e12ddb2f00543638b67d7d1b64791ac3b9cf0f348ca7dba4eed24cc45f32a7727d7f2597bd61e7d88f19588ffa2b0cd828257e38a1abf304900c6a7 +EBUILD iprutils-2.3.18.ebuild 1331 SHA256 f72a7f478dc9d34aa55b69860b966c16083bbec8b5d8e4e4c0cedd7c821b0ee2 SHA512 1ca0e3a1f4e5fba8f3230088942a03f80ef415dad6a88e392b027058d2a669663a3dafae3ed8e9f5eedb3b47f0907b6fb49ff60aeb46f71dd5ab9a519465f95f WHIRLPOOL 2ed3798127156cfcdbb847e644c9743a2df2a213c231502d17145abdb10a52704f8791eac843a64ea5b07a69033ef87b5817b30c76c789afa1fbfc041df9306e EBUILD iprutils-2.3.9.ebuild 1100 SHA256 a8158f95d4d234c93dbb024063c42e941ad0833836ae84d24a97c0c6cf5d93bd SHA512 c955b237a33eddd7a31bef7d430eb02044985048cf4f9e6355c2a481ba483472cbd80e82540950a5653f9e8913457cd7aa76537380b5cb1adf11a8a398046962 WHIRLPOOL 72d63a0a3bf30e2c511e849910365764253759bd089f8bdf8702d1349059956dbf93aa6bd0e6d60793345d6050e073af1018c92a4471d64539ec9b139f7ea101 -MISC ChangeLog 6803 SHA256 28d12dd5b77c60f9fd0624de001cc334841e6aa3ec8ebd56c3f960314a6f30cd SHA512 7929f7f860b38a8160f2693e4daf85c72d9ee17f79fbdcf1401379e2efbfeaec1575678fc08df8bc5ac05f8b75fc145d0f0a675201ec547f79d9eda94447765e WHIRLPOOL 28a48ba89cacadf6c757a4312cd29291af4cf186b5b7110096428cea22d0351fcbb2bd197c8c7814ad7606c717c5031533d43facb7642a53b0dc14ec41f7b15b +MISC ChangeLog 7028 SHA256 fdaa19e8171250c7d3438a488614e19a9fb0678da0ec49b93ad1b8e6515318ee SHA512 0184fbe82f8273bcdf30ab7d500abec0ed4af6d254f4c9a04d4340f3d4717db80f5753570382cd517d0063298ab67e16d64c9288aebc191436709859fd05919a WHIRLPOOL 6bc369c50ce40f10bb39838def05ced77bd2380c4b2a9ddd87c0a9d1c2072c10157255bbae6acb380247528c2bf38236cf4978f9bcd742c384498a44bba324fa MISC metadata.xml 158 SHA256 32350539e29186f246efdc4907b750f94365676eaf013b11832b2a7015e8e218 SHA512 2b3864962e76bbd67cfb69646b7d711d56b4683d06affa2a6368a2f929cc7a07519db67aeba222992481ff45f933685af3ece8c14369564758c1415159bcd67d WHIRLPOOL b385a4234685513271b55e7533c02a268c12138467441c9fbf2e2f4bc7516d04495fbc006fba3022244f0a5f71a7e85136166195a6355a9a7f2bf763d0857b77 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iJwEAQEIAAYFAlRYnKMACgkQG9wOWsQutdarwgP/ZQKt/XgnGMbQYCC2rvK+4jVu -Zf9HLdKR/a/qXPk1y7FB9Nz5+KnKPq1pKyWgcujU9pnQYK8DOUY5TQEie2cntp5a -hzd3a0dk09bvqlUiwNTTI3+0jgpdDLFOjKk4DP2iFM6zLmTJoz2E5z9IYN16LIEm -LbNP8lu7Ne8orbwOY10= -=jxzM +iQEcBAEBCAAGBQJUnArhAAoJECo/aRed9267DG8H/i9t6UIrVDxc6s85jiHxVFyC ++TezLBcUYC0nH7PPNcGh/z3sQjF/xVZD93tdr0a/ezL5gU3wteJDTZ7c2KT5Cnmp +m6tSe6IIESypwJBsEwjgEBsj56cZK8hASalZaNuM7MZ3HOwd19QsOXsLdfkT9aRm +GOFJbxK9YwRwGgBC5rBXx6p49d6nFZ2bfqOJYe3ooN8MHB4mj4/XS40D4ef6P3vg +xVCEIWdZ4DQ59B/zxbgEL9MYrUnyYDSLnVdBq/wnvvx6xNPPC9niTbo7OHwPniLx +bHEdctzI1gI5Gxiq//rbKGxp4AzNhhhV0oEHJBwNJ0YX+UYbCbjcXpqNLE50EaQ= +=obNg -----END PGP SIGNATURE----- diff --git a/sys-fs/iprutils/iprutils-2.3.0.ebuild b/sys-fs/iprutils/iprutils-2.3.18.ebuild similarity index 70% rename from sys-fs/iprutils/iprutils-2.3.0.ebuild rename to sys-fs/iprutils/iprutils-2.3.18.ebuild index d502e252fe60..21405effa662 100644 --- a/sys-fs/iprutils/iprutils-2.3.0.ebuild +++ b/sys-fs/iprutils/iprutils-2.3.18.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.3.0.ebuild,v 1.4 2014/11/04 09:31:35 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.3.18.ebuild,v 1.1 2014/12/25 13:02:26 pinkbyte Exp $ -inherit eutils +EAPI=5 + +inherit eutils toolchain-funcs -S=${WORKDIR}/${PN} DESCRIPTION="IBM's tools for support of the ipr SCSI controller" SRC_URI="mirror://sourceforge/iprdd/${P}-src.tgz" HOMEPAGE="http://sourceforge.net/projects/iprdd/" @@ -12,7 +13,6 @@ HOMEPAGE="http://sourceforge.net/projects/iprdd/" SLOT="0" LICENSE="IBM" KEYWORDS="~ppc ~ppc64" -IUSE="" DEPEND=">=sys-libs/ncurses-5.4-r5 >=sys-apps/pciutils-2.1.11-r1 @@ -22,9 +22,25 @@ DEPEND=">=sys-libs/ncurses-5.4-r5 RDEPEND="${DEPEND} virtual/logger" +S="${WORKDIR}/${PN}" + +src_prepare() { + # Respect CFLAGS and LDFLAGS, bug #377757 + sed -i \ + -e '/^CFLAGS/s/= -g/+=/' \ + -e 's/$(CFLAGS)/\0 $(LDFLAGS)/g' \ + Makefile || die + + epatch_user +} + +src_compile() { + # Respect CC, bug #377757 + emake CC="$(tc-getCC)" +} + src_install () { - make INSTALL_MOD_PATH="${D}" install || die - dodoc ChangeLog + emake INSTALL_MOD_PATH="${D}" install newinitd "${FILESDIR}"/iprinit iprinit newinitd "${FILESDIR}"/iprupdate iprupdate @@ -37,5 +53,4 @@ pkg_postinst() { einfo "rc-update add iprinit default" einfo "rc-update add iprdump default" einfo "rc-update add iprupdate default" - ebeep 5 }