From: Markus Ullmann Date: Wed, 18 Apr 2007 17:29:17 +0000 (+0000) Subject: Use eclass function for check and error message ;) and we're stable on x86 now X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=427669427964908180ce9fdc707cea150cf3e793;p=gentoo.git Use eclass function for check and error message ;) and we're stable on x86 now Package-Manager: portage-2.1.2.3 --- diff --git a/net-libs/libnetfilter_conntrack/ChangeLog b/net-libs/libnetfilter_conntrack/ChangeLog index c81ba8d27c1e..b25e6cf7f4dd 100644 --- a/net-libs/libnetfilter_conntrack/ChangeLog +++ b/net-libs/libnetfilter_conntrack/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/libnetfilter_conntrack # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.5 2007/04/17 18:07:09 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.6 2007/04/18 17:29:17 jokey Exp $ + + 18 Apr 2007; Markus Ullmann + -libnetfilter_conntrack-0.0.31.ebuild, + libnetfilter_conntrack-0.0.50.ebuild: + Use eclass function for check and error message ;) and we're stable on x86 now 17 Apr 2007; Cedric Krier libnetfilter_conntrack-0.0.50.ebuild: diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest index 300c9a3ae9b6..92973a2cfa95 100644 --- a/net-libs/libnetfilter_conntrack/Manifest +++ b/net-libs/libnetfilter_conntrack/Manifest @@ -1,24 +1,26 @@ -DIST libnetfilter_conntrack-0.0.31.tar.bz2 223246 RMD160 9760f5a93b4c9a21b4485ce07b67caccb2ab72c5 SHA1 a8277dbd73641c3b43f0a9ab6d8d83fe2e26e9f4 SHA256 f91dcf1a9aa93c4371253b0a9b50c80a6bd7326283b60af8f3748466ad4d6bc4 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST libnetfilter_conntrack-0.0.50.tar.bz2 252035 RMD160 c6898b522e04dcf6adf35a6eecb988529d2fa9b8 SHA1 183753620eed7711caa78701cce6b3aa987ee06f SHA256 91a133fa9f4e7a0ff113d510d9f5e69a2e25dbc89909dbb4fd0de8cddcb8c413 -EBUILD libnetfilter_conntrack-0.0.31.ebuild 826 RMD160 ba6a52caf5770e90a3fb19aa455502dfb8783cc8 SHA1 ac6df0d13528bfc21ce5a6bff5ba129486923915 SHA256 77eda4f3cdf06bc994ddbe082ff1acbf507d13ec7171f93255045180261ed93d -MD5 1b3ff70915cd883b0b4e543fd3065f9d libnetfilter_conntrack-0.0.31.ebuild 826 -RMD160 ba6a52caf5770e90a3fb19aa455502dfb8783cc8 libnetfilter_conntrack-0.0.31.ebuild 826 -SHA256 77eda4f3cdf06bc994ddbe082ff1acbf507d13ec7171f93255045180261ed93d libnetfilter_conntrack-0.0.31.ebuild 826 -EBUILD libnetfilter_conntrack-0.0.50.ebuild 1235 RMD160 19cdc5aab3c78dd405f2f93b810d2c6a8abe1a63 SHA1 2b7a4bc225eda460430df23185578d2bb1dcdf05 SHA256 8ebddf7377780f14b32235d7f1e8887c7aa7b04642c3f14b99d2fa0a13a24aee -MD5 6e698f432a7c6d80a2c0d97af2904f2e libnetfilter_conntrack-0.0.50.ebuild 1235 -RMD160 19cdc5aab3c78dd405f2f93b810d2c6a8abe1a63 libnetfilter_conntrack-0.0.50.ebuild 1235 -SHA256 8ebddf7377780f14b32235d7f1e8887c7aa7b04642c3f14b99d2fa0a13a24aee libnetfilter_conntrack-0.0.50.ebuild 1235 -MISC ChangeLog 983 RMD160 7973327671015404725455691e72a42fb5065950 SHA1 b8f0e14881fb18cff53041bb544dcecd4525e243 SHA256 f1591b3509697f8e0ab5c0432a9f7b873b8c476b1667f49fbb607e844b89da6c -MD5 7d64f4f45ac4fd6ee40a4ea7e8adbc4c ChangeLog 983 -RMD160 7973327671015404725455691e72a42fb5065950 ChangeLog 983 -SHA256 f1591b3509697f8e0ab5c0432a9f7b873b8c476b1667f49fbb607e844b89da6c ChangeLog 983 +EBUILD libnetfilter_conntrack-0.0.50.ebuild 1028 RMD160 5f698bc10258f766e911cc26678e113de6348af7 SHA1 0d59565b63ad0ba498710662c1c1909165990b5a SHA256 02a32b78e1ea523acfafaf5c875cecacfa898cde44a7b4ba38f7e10b1f43feb7 +MD5 c4ee51b21404f7e65bb970afe6418124 libnetfilter_conntrack-0.0.50.ebuild 1028 +RMD160 5f698bc10258f766e911cc26678e113de6348af7 libnetfilter_conntrack-0.0.50.ebuild 1028 +SHA256 02a32b78e1ea523acfafaf5c875cecacfa898cde44a7b4ba38f7e10b1f43feb7 libnetfilter_conntrack-0.0.50.ebuild 1028 +MISC ChangeLog 1196 RMD160 da9acbe03cdf08043fb93873c1bb14af9e1a6f94 SHA1 f806dca8e6d9d4acc2d5d765041442ecbaa70575 SHA256 abbe03b9a3802c9b406374a9aa53b63ff6c076e4679868f2614eb43252788462 +MD5 782afd712774758bf674936b8909418a ChangeLog 1196 +RMD160 da9acbe03cdf08043fb93873c1bb14af9e1a6f94 ChangeLog 1196 +SHA256 abbe03b9a3802c9b406374a9aa53b63ff6c076e4679868f2614eb43252788462 ChangeLog 1196 MISC metadata.xml 331 RMD160 07e93d010ce6a8e6e384c8dd81c3888b0eb52da9 SHA1 d6454b530ba0d23387823bd1ac1817ef8b432e53 SHA256 feaa021b8f9e31b42d7dc79aabb51db3bf24eeca7b8917f84435c9ca1e17012e MD5 717ea0e4ffbe42c03cf426f33f3c9894 metadata.xml 331 RMD160 07e93d010ce6a8e6e384c8dd81c3888b0eb52da9 metadata.xml 331 SHA256 feaa021b8f9e31b42d7dc79aabb51db3bf24eeca7b8917f84435c9ca1e17012e metadata.xml 331 -MD5 35690cd0dca4292ff98da871e21c16a0 files/digest-libnetfilter_conntrack-0.0.31 292 -RMD160 a94a780c983450184350bb1013c1ed4293de8be5 files/digest-libnetfilter_conntrack-0.0.31 292 -SHA256 329fdbac3ee5cd42afa52974275d929dd548ad9dd84d8519e31a2376aa82abfc files/digest-libnetfilter_conntrack-0.0.31 292 MD5 87f304d217a9705f7415728117e27d48 files/digest-libnetfilter_conntrack-0.0.50 292 RMD160 bd33ec32bd8ebc47da6a3325ad1a43f1e99efe9a files/digest-libnetfilter_conntrack-0.0.50 292 SHA256 602dd86a55f9906c130a6708af0dd687418e45637e91f5310ef87c129d1cbf97 files/digest-libnetfilter_conntrack-0.0.50 292 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGJlVyz974XjDVpbkRAiqgAJ9nUVOO9+qNHDdfUn0y4xVCHUtdrQCdGjOC +v5LVoAHjDdyHpeDlNdyd8i4= +=UMzs +-----END PGP SIGNATURE----- diff --git a/net-libs/libnetfilter_conntrack/files/digest-libnetfilter_conntrack-0.0.31 b/net-libs/libnetfilter_conntrack/files/digest-libnetfilter_conntrack-0.0.31 deleted file mode 100644 index ac66e3cfb9a5..000000000000 --- a/net-libs/libnetfilter_conntrack/files/digest-libnetfilter_conntrack-0.0.31 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1871339b180b1b95a55517430bfb7d2b libnetfilter_conntrack-0.0.31.tar.bz2 223246 -RMD160 9760f5a93b4c9a21b4485ce07b67caccb2ab72c5 libnetfilter_conntrack-0.0.31.tar.bz2 223246 -SHA256 f91dcf1a9aa93c4371253b0a9b50c80a6bd7326283b60af8f3748466ad4d6bc4 libnetfilter_conntrack-0.0.31.tar.bz2 223246 diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild deleted file mode 100644 index b466bd68a5a6..000000000000 --- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild,v 1.1 2006/11/13 22:03:26 cedk Exp $ - -inherit linux-info - -DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table" -HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/" -SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="net-libs/libnfnetlink" -RDEPEND=${DEPEND} - -CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK" - -pkg_setup() { - linux-info_pkg_setup - kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild index 2a5bb34d4069..2a14a0c004c1 100644 --- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild +++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild,v 1.4 2007/04/17 18:07:09 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild,v 1.5 2007/04/18 17:29:17 jokey Exp $ inherit linux-info @@ -10,24 +10,27 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="" DEPEND=">=net-libs/libnfnetlink-0.0.25" RDEPEND=${DEPEND} -CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK" - pkg_setup() { - kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version" - - einfo "Checking for suitable kernel configuration options..." - if ! linux_chkconfig_present "IP_NF_CONNTRACK_NETLINK" -a ! linux_chkconfig_present "NF_CT_NETLINK" ; then - eerror "Could not find IP_NF_CONNTRACK_NETLINK " - eerror "nor NF_CT_NETLINK in the kernel configuration" - eerror "Please check to make sure at least one of the options are set correctly." - die "Incorrect kernel configuration options" + linux-info_pkg_setup + + if kernel_is lt 2 6 14 ; then + die "${PN} requires at least 2.6.14 kernel version" fi + + #netfilter core team has changed some option names with kernel 2.6.20 + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK" + else + CONFIG_CHECK="NF_CT_NETLINK" + fi + + check_extra_config } src_install() {