From a70aeeccc16d872693925d4850da9ddb017ca9fa Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 31 Jan 2007 18:11:15 +0000 Subject: [PATCH] Added append-ldflags -lz for bug #160937. Package-Manager: portage-2.1.2_rc4-r1 --- sys-apps/hwsetup/ChangeLog | 5 ++++- sys-apps/hwsetup/Manifest | 24 ++++++++++++------------ sys-apps/hwsetup/hwsetup-1.2.ebuild | 9 +++++---- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog index 0873fea46c04..555af1e3155c 100644 --- a/sys-apps/hwsetup/ChangeLog +++ b/sys-apps/hwsetup/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/hwsetup # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.45 2007/01/05 19:44:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.46 2007/01/31 18:11:15 wolf31o2 Exp $ + + 31 Jan 2007; Chris Gianelloni hwsetup-1.2.ebuild: + Added append-ldflags -lz for bug #160937. *hwsetup-1.2 (05 Jan 2007) diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest index e2ce2feb1e70..1a2b43c70e9c 100644 --- a/sys-apps/hwsetup/Manifest +++ b/sys-apps/hwsetup/Manifest @@ -31,14 +31,14 @@ EBUILD hwsetup-1.1.ebuild 1367 RMD160 5231250e5a76b10ddd6fc78a210d51566c9d15c6 S MD5 64bede0a046727779d907915051de906 hwsetup-1.1.ebuild 1367 RMD160 5231250e5a76b10ddd6fc78a210d51566c9d15c6 hwsetup-1.1.ebuild 1367 SHA256 d077ee8a442a4bea7d6803636736f6ca99f8075c5b0c844f76c75e723b577b16 hwsetup-1.1.ebuild 1367 -EBUILD hwsetup-1.2.ebuild 1373 RMD160 4da17163285dacb877ec66a3455b071e22ea4ff3 SHA1 adbbc34e0bdba53d9c2773fda1a0caf8c6726fa6 SHA256 735f9d026e55953222a658785c1e39610ffddd47a76ae9943c0c044a30e466f0 -MD5 83194d0611cbd0e41379e0743c9068e8 hwsetup-1.2.ebuild 1373 -RMD160 4da17163285dacb877ec66a3455b071e22ea4ff3 hwsetup-1.2.ebuild 1373 -SHA256 735f9d026e55953222a658785c1e39610ffddd47a76ae9943c0c044a30e466f0 hwsetup-1.2.ebuild 1373 -MISC ChangeLog 7001 RMD160 abcc380d256d6f2081b3b4e740fde5a1dee8c14b SHA1 fa3ad2b7e84a6fb37346e247fd71070b53d1e313 SHA256 83784d1f17403065eb70f09fcfb886c325d6c107e3abd7a71ee793074533b008 -MD5 b9bddde668b3ea4735f69da148b708f9 ChangeLog 7001 -RMD160 abcc380d256d6f2081b3b4e740fde5a1dee8c14b ChangeLog 7001 -SHA256 83784d1f17403065eb70f09fcfb886c325d6c107e3abd7a71ee793074533b008 ChangeLog 7001 +EBUILD hwsetup-1.2.ebuild 1396 RMD160 117ac8ecc908b64fb1f5ddda5fd2ab6d470dd412 SHA1 a22853b756e1df3c932564d73298c644b4ad40f3 SHA256 ef1f44a3e5405490f54169c176feee1c38adb9e2c3c576935d7f2db1d5b9fcb8 +MD5 06a02f095a7f3b090f7d6c3b1e4b67c1 hwsetup-1.2.ebuild 1396 +RMD160 117ac8ecc908b64fb1f5ddda5fd2ab6d470dd412 hwsetup-1.2.ebuild 1396 +SHA256 ef1f44a3e5405490f54169c176feee1c38adb9e2c3c576935d7f2db1d5b9fcb8 hwsetup-1.2.ebuild 1396 +MISC ChangeLog 7120 RMD160 b9992e2b01b706e72a35b0599341cd539a133b6a SHA1 6b6f70c07ec6e164e35d880b26493d355a3770ff SHA256 73ff2ca7a7243bbe1f4132f705c24d1b35be199d758fb884d16c804ec207552a +MD5 f4b44d0859f2dc0e385c95bd262be6f6 ChangeLog 7120 +RMD160 b9992e2b01b706e72a35b0599341cd539a133b6a ChangeLog 7120 +SHA256 73ff2ca7a7243bbe1f4132f705c24d1b35be199d758fb884d16c804ec207552a ChangeLog 7120 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159 @@ -50,9 +50,9 @@ MD5 32fe03d6753fd120a255bc34406df63d files/digest-hwsetup-1.2 238 RMD160 eb4d62c171333cbd026cd5a639092a72a16d86f2 files/digest-hwsetup-1.2 238 SHA256 aed4897e28932ad6a8981b961ea8490a2a068dec41d0e659f275204a0b5da30c files/digest-hwsetup-1.2 238 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnqq6kT4lNIS36YERApviAJ4qKU2UdKT6LDSLzhmAxqNf5yHFeQCdFht/ -Zr+FQvJDyPk3M3ba1p32AlM= -=gzsb +iD8DBQFFwNvJkT4lNIS36YERAjB3AJ9UoI7T6MOAcrDfOM35j5qIxUOPQwCgoG3q +C/nbDHwxmXeie+HGl0qbtfs= +=+b2C -----END PGP SIGNATURE----- diff --git a/sys-apps/hwsetup/hwsetup-1.2.ebuild b/sys-apps/hwsetup/hwsetup-1.2.ebuild index 725d919766b6..fe2ad911c2f0 100644 --- a/sys-apps/hwsetup/hwsetup-1.2.ebuild +++ b/sys-apps/hwsetup/hwsetup-1.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.1 2007/01/05 19:44:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.2 2007/01/31 18:11:15 wolf31o2 Exp $ -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs flag-o-matic MY_PV=${PV}-3 DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD" @@ -12,7 +12,7 @@ SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 ia64 -mips ppc ppc64 sparc x86" IUSE="" DEPEND="sys-libs/libkudzu @@ -29,7 +29,8 @@ src_unpack() { } src_compile() { - emake LDFLAGS="-s ${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed" + append-ldflags -lz + emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed" } src_install() { -- 2.26.2