From: Stefan Briesenick Date: Sun, 28 Jan 2007 19:33:13 +0000 (+0000) Subject: fixed bug #160187 and #164137. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f37cd2b23b8613f44b04f6a67bc4fea58d1e4939;p=gentoo.git fixed bug #160187 and #164137. Package-Manager: portage-2.1.2-r2 --- diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog index 07f1a142bea3..146c292ec615 100644 --- a/net-dialup/capi4k-utils/ChangeLog +++ b/net-dialup/capi4k-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/capi4k-utils -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.48 2006/12/18 09:05:50 opfer Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.49 2007/01/28 19:33:13 sbriesen Exp $ + + 28 Jan 2007; Stefan Briesenick + capi4k-utils-20050718-r2.ebuild: + fixed bug #160187 and #164137. 18 Dec 2006; Christian Faulhammer capi4k-utils-20050718-r2.ebuild: diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest index 30ebf2510be8..e13dda921d04 100644 --- a/net-dialup/capi4k-utils/Manifest +++ b/net-dialup/capi4k-utils/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX README.gentoo 2800 RMD160 20def6cfff0f413e67f017179ae00fdb17ad6ed7 SHA1 6f7a68e7efa87d6d9e181a37085f7336f9f36a0a SHA256 809a82b753b12ad0bd75092ec249fe9044090eeb2c2f32b9f04cb3f46815c6fd MD5 c1f67e98c19fe5ece86b9242a00e6a38 files/README.gentoo 2800 RMD160 20def6cfff0f413e67f017179ae00fdb17ad6ed7 files/README.gentoo 2800 @@ -58,14 +55,14 @@ EBUILD capi4k-utils-20050718-r1.ebuild 5162 RMD160 e80262b7c9c40a4048023a8cc6f3b MD5 b2649900dfdcf522086f129fe3dbf660 capi4k-utils-20050718-r1.ebuild 5162 RMD160 e80262b7c9c40a4048023a8cc6f3b3a9a454f3da capi4k-utils-20050718-r1.ebuild 5162 SHA256 4d3c17ae9b2c0258cdfbeaeea8a97c6efaa389c2f2c6cf55712bc014c215eba0 capi4k-utils-20050718-r1.ebuild 5162 -EBUILD capi4k-utils-20050718-r2.ebuild 5233 RMD160 e62dbceda2c675d9d4999bca2ad2fd4b64293fb9 SHA1 91924e47f3327c41ed2c9890f53a91b3e58dad25 SHA256 c7de5669c35f8844c17ee6c9777f61071c97539ef09e635f4c09209f2bdb9d93 -MD5 7e62dc458fa330eb6c50290b4ab76edc capi4k-utils-20050718-r2.ebuild 5233 -RMD160 e62dbceda2c675d9d4999bca2ad2fd4b64293fb9 capi4k-utils-20050718-r2.ebuild 5233 -SHA256 c7de5669c35f8844c17ee6c9777f61071c97539ef09e635f4c09209f2bdb9d93 capi4k-utils-20050718-r2.ebuild 5233 -MISC ChangeLog 9411 RMD160 c015d13c9ca7af4fe1037526b5a09055d6e38190 SHA1 9c6d665a0346fe2337b78c5ae04794759b252a36 SHA256 b4c393d4beba3cfcdcfe9504b1d7ef7645dcb19071b14ba92bd39ba6d3291ff6 -MD5 f6f861e88b1c788cd324b62755017ea2 ChangeLog 9411 -RMD160 c015d13c9ca7af4fe1037526b5a09055d6e38190 ChangeLog 9411 -SHA256 b4c393d4beba3cfcdcfe9504b1d7ef7645dcb19071b14ba92bd39ba6d3291ff6 ChangeLog 9411 +EBUILD capi4k-utils-20050718-r2.ebuild 5072 RMD160 e93df91f615343fa8e6b3955bcf6d747071bfdcc SHA1 865ff76d142df9be45046f9d5df94b38d1c281a2 SHA256 017b54252d552577935f70162aa46c41f842a372aa98c17b7426e6c7c45b5f97 +MD5 8fe1c88e6f96d326f000b3ad4314bc49 capi4k-utils-20050718-r2.ebuild 5072 +RMD160 e93df91f615343fa8e6b3955bcf6d747071bfdcc capi4k-utils-20050718-r2.ebuild 5072 +SHA256 017b54252d552577935f70162aa46c41f842a372aa98c17b7426e6c7c45b5f97 capi4k-utils-20050718-r2.ebuild 5072 +MISC ChangeLog 9538 RMD160 4a164e9737b89abb446cd230d245ac6d295352ba SHA1 80f44e28d17bf9838e0c867e154c5e0bf4841c6a SHA256 c92902fea5e650f95e7770f443d47371abdcef4126b082c7393edcf01612a494 +MD5 38c71e729596a70f9c640d8ea075d03c ChangeLog 9538 +RMD160 4a164e9737b89abb446cd230d245ac6d295352ba ChangeLog 9538 +SHA256 c92902fea5e650f95e7770f443d47371abdcef4126b082c7393edcf01612a494 ChangeLog 9538 MISC metadata.xml 618 RMD160 7dc735e007ea83f896fae31e70ce14b5410035fa SHA1 89000a29d9233eb928388c169cb0993c0f187370 SHA256 b99ca46c9cdbd485f0fc6c1cfe135d9e999b515da81632fb5330ebae8a3d025c MD5 57ebf0922074a9d61182c51349de5d53 metadata.xml 618 RMD160 7dc735e007ea83f896fae31e70ce14b5410035fa metadata.xml 618 @@ -76,10 +73,3 @@ SHA256 1ec64e092e9d52395cf5d2eeb946130f512e430f54bab63ee7a5f2363e1fc4d1 files/di MD5 b4861d0c45b8a00cec2a5b865193129b files/digest-capi4k-utils-20050718-r2 271 RMD160 a4a39ae3b1cc0cbd42ff915bc8293d1d046f4422 files/digest-capi4k-utils-20050718-r2 271 SHA256 1ec64e092e9d52395cf5d2eeb946130f512e430f54bab63ee7a5f2363e1fc4d1 files/digest-capi4k-utils-20050718-r2 271 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFhlntNQqtfCuFneMRAm02AJwLJF7pe2Xeuz2CjrekvHqgL7gEpwCcCZNl -eeCP0enu9EMaSW89xHBW3AE= -=oMUQ ------END PGP SIGNATURE----- diff --git a/net-dialup/capi4k-utils/capi4k-utils-20050718-r2.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050718-r2.ebuild index 4f3710d577cd..beffa422a65c 100644 --- a/net-dialup/capi4k-utils/capi4k-utils-20050718-r2.ebuild +++ b/net-dialup/capi4k-utils/capi4k-utils-20050718-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r2.ebuild,v 1.2 2006/12/18 09:05:50 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r2.ebuild,v 1.3 2007/01/28 19:33:13 sbriesen Exp $ -inherit eutils multilib gnuconfig linux-info +inherit eutils multilib linux-info YEAR_PV="${PV:0:4}" MON_PV="${PV:4:2}" @@ -48,8 +48,6 @@ src_unpack() { cp -f "${FILESDIR}/config" .config # copy init-script config cp -f "${FILESDIR}/capi.confd" capi.confd - # patch includes of all *.c files - sed -i -e "s:linux/capi.h>$:linux/compiler.h>\n#include :g" */*.c || die "sed failed" # patch all Makefile.* and Rules.make to use our CFLAGS sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make || die "sed failed" # patch capi20/Makefile.* to use -fPIC for shared library @@ -77,7 +75,6 @@ src_unpack() { } src_compile() { - gnuconfig_update emake subconfig || die "make subconfig failed" emake || die "make failed" }