Version bump

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 61 insertions, 16 deletions

diff --git a/net-libs/libnetfilter_conntrack/ChangeLog b/net-libs/libnetfilter_conntrack/ChangeLog
index 4272f93692ef..09643be985a6 100644
--- a/net-libs/libnetfilter_conntrack/ChangeLog
+++ b/net-libs/libnetfilter_conntrack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libnetfilter_conntrack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.75 2013/07/06 17:05:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.76 2013/08/20 09:17:52 pinkbyte Exp $
+
+*libnetfilter_conntrack-1.0.4 (20 Aug 2013)
+
+  20 Aug 2013; Sergey Popov <pinkbyte@gentoo.org>
+  +libnetfilter_conntrack-1.0.4.ebuild:
+  Version bump
 
   06 Jul 2013; Agostino Sarubbo <ago@gentoo.org>
   libnetfilter_conntrack-1.0.3.ebuild:
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index b904a76995d9..9a0fa537ce84 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,30 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST libnetfilter_conntrack-1.0.0.tar.bz2 380555 SHA256 0a09a61ad26a43190a1858cb0391198ae3c952a9bdc4488e63dcb5c59aa3d608 SHA512 fcceba5a6c3c059f9489af64bd9c2d967e2492813631ce047b5b623d8ab7e8dbd66ab556cbf3d8a227cb26deb206d0c8315572e757a779916c188948dc09a835 WHIRLPOOL 743e3dd87b16f7d34cc5b7abf7e045072ed28b3e2bdaa49855aa5e1da6173be3485b615901f2c67ab4f1a9c76678084dd0808a27967f005bedf891775a70359f
 DIST libnetfilter_conntrack-1.0.1.tar.bz2 377423 SHA256 279090d28a676299cba6e8a6a3def97f1e8560525aee475e7e1e23cc46162f57 SHA512 6ab1325c949dc29dc7cc5d66511d940429dd877e232359cd8453d4530663a9e8075487c9607b75a849a7569ea2edc0808dad742804f4e75d49f5cc56daa96b89 WHIRLPOOL 71643099cf3e44da23855001b372200fbb4bf7dfe3831e876a6f592f696493451cf1a695225534243f4cfaddcbf6745e49b260eb0c3e048ce91b143f222c99c4
 DIST libnetfilter_conntrack-1.0.2.tar.bz2 386929 SHA256 a0bd747dd58ae1513586b43c7125b41e6325f97eb95ac63d53cf5aeb33254d12 SHA512 1c8b7b0889eb264acdd7c48d9b748189d47110d09d58190f2e3a392b9bbdf6516a9f2c2f3950c82667b91bff6adb8ef1e6e6583d8db31ca25af05fdaae440a84 WHIRLPOOL ffd365b07e677381689d96d360a577981e344304abe90568c0365cc10eebe97698525a67fa5393b803d4d67b48c6817a3657ed58ec1e918215b09b2780229225
 DIST libnetfilter_conntrack-1.0.3.tar.bz2 390454 SHA256 fc1710854d26d527087dbbefb110193650d9aae1876f90cb64b8d5c0a8dd95a4 SHA512 9949d3b3352e2cad3310128089de024950a1178a2a42c7a0ecec026dfe3b51b9b1b658d291d95d1a7d2ea038608ada4f77b9b8b2c72f9e887fb6211a1e25f628 WHIRLPOOL 4daab5dddf617fc00c6f21796b56a14eebe77e67601bd2fb9a4bd8b178c700ff83746496f6f88fe549ad964e85d31f8c7294b99204adbc2fc19223bdfaa83bac
+DIST libnetfilter_conntrack-1.0.4.tar.bz2 428147 SHA256 d9ec4a3caf49417f2b0a2d8d44249133e8c3ec78c757b7eb8c273f1cb6929c7d SHA512 53b5e5b26ca58abd6b9d83979bbb61aac4b24a85aa425c6b4fc4472b8273e30393678d6acd1aec0e959916b919cd561582ddd4b2ee656b6cb774aa9d9819c046 WHIRLPOOL 5028ca559a734019c6796b6ed73b120a1cf84c27748ae640f084ee5f1fd0c9b0f34e485a526761e35eb29c0e65e9126853b489bdb5e7d45b7cbe960113584a82
 EBUILD libnetfilter_conntrack-1.0.0.ebuild 1046 SHA256 5f110c6f8943685f8f539e1cad627b26c6d191efe5d9a1e54ff786778a9f5d29 SHA512 e9dac21c02589ae47a9c24ad0482be3af76754ea4c5abc91b852c411f2d1f57eef6ca72ef4d58f948692d5e441f90e731f554611c9fc66147d309006469dc03c WHIRLPOOL 3ff82401d062e2d2954305f57ab517f30dc1b748102e617d99de5c584806d9e8a44442f26e89f607f1c2d4364c0af314b9847d0b6845d6f93f633689c4c934ff
 EBUILD libnetfilter_conntrack-1.0.1.ebuild 1056 SHA256 6abfa918c4a3640c0feba38abcf170631aaee0c96fe5be8bc808c98f72b85bb0 SHA512 3ce232e440ed20c75e423c8175c00131ee3f0d119706dcfe92b95bb4249de752341a1bb9a96ed8838ff34438e733d3cafff229b4006904c16e3c48eb1b15c1d3 WHIRLPOOL c9b19655fad3af96879c7db6f4c9134c3903ed2f2f9b88f6762804c8ae04a758cfd574f91049802facdd641aea39ac203ed10ca66a6efbd2e84608cef6d540a2
 EBUILD libnetfilter_conntrack-1.0.2.ebuild 1087 SHA256 b9061daa0dc2cda804789a2a771ca58daf126c2d6e682df656c8d1029459a5f0 SHA512 0e46d99ecec446e7741c5f3cca5c4a8f13fe69d5be28acb1ee93bc9dd14e1f499eb831fe1da6d5adfbb418983d6a4b46873b0a44ad1b81fbbdda96c15f1cc97a WHIRLPOOL 70a81986f2111c5374daba4a7def0f15790d346daabbb2669b8fffd83eca0c67eb918e58a7f16bd66e7c0cd969958c1391292dae4fc69dc0ac6ed9e53d0674c0
 EBUILD libnetfilter_conntrack-1.0.3.ebuild 1087 SHA256 6b422106fd8d42657a908904584dacad6dea3cbd8456b5332b288268d505eb3b SHA512 cd8c54d3be18d6bb0a1e93ffe9ae1807e0f7257e9b4a0b453493bfb3008b5f36281299ca0b75ed25636bc72d5e101df01f2710d7a676d4b7e53973f202134cc9 WHIRLPOOL 36b88278b6b7b5c822bac8e9352e81d87319a665239ec1dd02c762091dc9f8f2bd28532b9b376aa6ab4e155077370e4caf7324cd705e803b43711ada3a8ed773
-MISC ChangeLog 12219 SHA256 3079a8bcf5dea26d2e0a76098de798dbf0cec83b9a16a128b58ded1effcaa280 SHA512 710555df9055b3aec28fedb91f85ccd1ad32165576585833e35c5e055701d5957740756a7d209114fb24fb9d2de99fb099dc3acfb549330703ee3a96029da40a WHIRLPOOL a65f2d0becba3b67d89c02d9268ad7f4f787dc8e733a86e1e789222d56bd0fc76f22750d514334ee05ba8d7e1850d8d75484f42517aa76a7b17d2ca3259af1c7
+EBUILD libnetfilter_conntrack-1.0.4.ebuild 1100 SHA256 fe48e5135e80250a42bda3ba0588c40ac9c62856bdb10ea13f1e9cd3465ccd2b SHA512 56c1d85c11379b616d6387045c1a480b0e735031e627f2e4784d2d46d7b59ab40017601d6c26a29191a241b86cfc1a28ca698a27c2444cf1a8d8394a74f4ba4e WHIRLPOOL 9ae69aeaaebf9192bb079b94a28892ac9553d0e96e5c598ce8b4e605c99792a637717657363666d1d2bd124ba48640c40ea5fdde0dcd6164f02897764585f077
+MISC ChangeLog 12375 SHA256 95cd705be79df7f1014fa44e04b82f4ecb19519f1b2d6e2e195f9d92bf3b6e10 SHA512 1c4ed88370479cf061becc99b8d4e2b024c57e089be427655ff0e1cfc4ed4f3636f5e222cdb20a3f8c12bd1ab187b99f1525948077753a05a3e4d741d22ee70a WHIRLPOOL 7d764d4f7907775fa6f41eb05a40bb0c213cf7330355fbc6b304209b1cd44008f0a86ba1a54d1b4437ee2b27313a8108c5a8e2503cc3da75e461e211500bfa23
 MISC metadata.xml 271 SHA256 ad2bbbf5ef703ebb8c3e1601caf05ec4f33d3bd59cfeede1892c2672e68fbbbf SHA512 167d9231343e91788e648bef3276e2d80a0531fdc2c081ff5d7c299b93fd3ca951bc6b3777eccb160268139d291724e696855b0e60d602b7c9b2b9cb5a9ad65f WHIRLPOOL a969e7e45bc6bed15dadfe155bc97488096b4c1c6b12d32f93920ea1e723b07906bb0794f7b5717f152c6bf31d8969a98e8e66a0d63779c031ef78b7548ae29b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR2E2KAAoJELp701BxlEWfe2AP/3PBIeDib/HjHthOm4cNZVxg
-rvu01lD6XjdIIfrFtn+9bGmhNpgUS/YdL0may7emf+4RRFyAyG5zUDFpTA+uqNEa
-FTpFplppCPj65RgYT+EiNTtDG/OFmq1gig5egxSf6OQ24ZQE6BW9iJoNLAxxdyhV
-9aeFnh/2cDV9VfsTswJ5K/lXXNAEt9S73FdQiYTQth80DVMOsN1jbaIUmtKIjWmt
-414yhGQcMu42qaENB6IptPg5PAsLdtf9CMtXj7vuMADjfPm/wYqkTk3Ti/lr4xjW
-HkEfGVaI0uDF3ZAw+GwgmSOhw3D06LmmOG9hsqaOjn5tyBBTKSxseJOrykt38gOJ
-wF4Rk0KzizNRUZBdjfCC1iJlbNcPnAh8MG5qsJJaafUSJ1Q/L19LwfJ5Ke54ItZw
-giDTU4DRBsvAUw9k954G7f4WhyMfiMyhgG5+/8VUByW8iOdM2xFxo0kWgzlqcHE8
-DD3B8Zl2X3umpDdtZa2WqqIrPaeUQc7GSfRYIUx2lGYQJJaVdxRJEyovStdOv6RM
-Tvh4QaMS7NPCi8c5Kzs4OLdKf6e989iDWU2+Ai23EEtLvjTeAVVjkNL3OMKuZ3wz
-GoCsVgswixwpKqvq+OY83m2QFhB0pf5q3IjuqR7pPsrGtNXHgvXsjocxNafyeS0C
-L1i6EL+I0UQOmxNPIdUi
-=y9Qt
+iQEcBAEBCAAGBQJSEzPhAAoJECo/aRed9267HOYH/3Xut+CiNQLb2Q15xwoLnFWL
+Bbam4A+FfUp+LEl7OY4eeiO0+M/TtDpobJuLx/sMGAdlD4mceW/0EU+q0UbZ5XyR
+2pjvghYZXDeI/eNNGazOijvhuc+udDfM3K/oGibKMNIISliFrbs1au7HFKVW8J5v
+dVn+/XZarPRguFrfDbp5m9o0Wyvsner0QithbdrjOew7f5rSfSiOCD78akZ3Z5Gc
+ZUIeKNt/oM5ZliZGYNYAx9XF+rqPggPnmkIupEEk6WK83+kVNuoB5PumFevo7Kw3
+c3bPNjM8Mvdoc4aJB2sgxOIVkr8H0dMnvPfvq8P0OCS0FWoADnw3JYB0XOCFpb4=
+=YjOY
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
new file mode 100644
index 000000000000..b911cf027925
--- /dev/null
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild,v 1.1 2013/08/20 09:17:52 pinkbyte Exp $
+
+EAPI=5
+inherit autotools-utils 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.3
+	>=net-libs/libnfnetlink-1.0.0
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( README )
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 18 ; then
+		die "${PN} requires at least 2.6.18 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
+}