Remove 1.1 SLOT now that nothing depends on it.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 10 insertions, 179 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index bc65fdd02c8f..aeb2e49f94de 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libnids
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.64 2014/04/08 14:02:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.65 2014/04/08 18:37:48 jer Exp $
+
+  08 Apr 2014; Jeroen Roovers <jer@gentoo.org> -libnids-1.18-r2.ebuild,
+  -libnids-1.18-r3.ebuild, -libnids-1.18-r4.ebuild,
+  -files/libnids-1.18-chksum.c-ebx.patch, -files/libnids-1.18-elif.patch:
+  Remove 1.1 SLOT now that nothing depends on it.
 
 *libnids-1.24-r5 (08 Apr 2014)
 *libnids-1.18-r4 (08 Apr 2014)
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index 1253fa034a4e..27c8bb7f03b8 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libnids-1.18-chksum.c-ebx.patch 542 SHA256 c5df5a514185855e86076df4b0a7cedd02a4c9bbf8373afd6751366abde3f5ff SHA512 95e13aef92c7e60232044b54a2d59d2004203588a9df830d6e69122d3d017b9d80f38497d59899c5a3c4fc9d05d4f4ae41074a9b4f2f3734f7f97a69f3fff1a1 WHIRLPOOL 7f9c1de19a4cd66ed28f2ace104d9985866ad86165a19223faec9cde1ab0cb3c7b46e25df4f3c337b27f11d13f702316a85cf2735163e9bdbfeccbd84df4302b
-AUX libnids-1.18-elif.patch 158 SHA256 f4d9ed494f4f3ef24d4d0631a080bc1bcb246bfcaf09783a32b7f1386ea32cb4 SHA512 d37515a88085569f669b0e27fc31738b1f8979f3c14c0014de1d558f94187502d0ebb4341255820a929af45fbd495c8ea4e65c7c9c5766f0c1482f3e1129e824 WHIRLPOOL 35490f931d78df8791f4ab4beb9bd4c1d49304abf9c4c3d7285c82038a394289c664167dd6a62edc3a08dd2d39e1738abb98ac2ac4b865e13576584a19073618
 AUX libnids-1.24-ldflags.patch 422 SHA256 5fea148d998e57da6197e46fdb6a063f1d59ed857b60995113bbf3b36a2abd28 SHA512 080a982ee45d69419fb45f8fc35eb53febfc098d24f5c52476933dae1333a11ffe3bffafa5dde302af308840ce17a4ed8fa210a87d6c65e16f78993d23492481 WHIRLPOOL 36aef4d6b4485fbd00a2a145c219ffe9fb006f2d754dbab842976055a28aba3c4ed0fb54025d49f0c27334b15351a322c204733aa3665af2e2b5a0391493c2a3
 AUX libnids-1.24-static-libs.patch 1018 SHA256 2a800ac6aec848081cb399db10331fbe69907deb7b5210c6f8f31f85b2dd0fae SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e WHIRLPOOL b0fa3d3779f728f7fa34ba1806d7bff3471dcc10e7708dc2a308113fdd7c6e16b722f01653b7702cce6f402cd467aeb8f88f737ca8e3a56df45cefea3e89b67a
-DIST libnids-1.18.tar.gz 114013 SHA256 b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd SHA512 0c76981a5d4ccca68f4a7365342f9fca5a18663b560dacf9a47e1d462dfd89683bbce85b95b159ac41e91e9a67f27bdfb1f8228f0d5d905d8ff488ee27ee0e45 WHIRLPOOL 26b4fe18088b018f828dcc94429cd000267096c0aa9a0025036c9f754af5dde014dc504a7b76378b4824f44e8407ae30965d6f3eea8935de35e65fb8dddb7e74
 DIST libnids-1.24.tar.gz 151021 SHA256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53 WHIRLPOOL c012e724c0f724cd817db4726a4ee1c0a438d717fe8534f96c41829e5574a3edaf4fd287c3acd65da4ee6591bb55dcd0f0bb71da7302e7b8ba43992ba85a1455
-EBUILD libnids-1.18-r2.ebuild 946 SHA256 b45750183b8179350ca56fda7568a4503e4a8ae59e3687bd75b29c111265df71 SHA512 45faa4752ba5f3f6875a55585e741ba7366b8e0dedbc08b9e74571197408e98c0d44831fa12a0de347fc077526c61ae0fe26eea9fbf16770624fa4a87df7a0ca WHIRLPOOL 784be52a0085dc88be27c206fe8c07b74166c20ae7c6b2e911fbda7635599ef4b9212021ece918239015afa2c5909173111c96e6182f79d6361f66e000b2bce7
-EBUILD libnids-1.18-r3.ebuild 1119 SHA256 2f582ce26b29b3c5664ba57978763835cbf32bdf7bf29ae87abf79aab061ce00 SHA512 0562ec29bdc69d0def9fbbadb1579eb3a4419d7d4fca8de8a8ff5f15d411d8612403549187948a9cc070a8a22743f0adffabe88f0b45e2eb7c6349ee3d129042 WHIRLPOOL 8702f2a30c5e5d4b1b0065b76f0fb3f65c6fe4fc2f2a4007a38cccf35ad84860e77b9ad2b546fc203db610cc9fee32609b5ce4064f1769d6effc58e8667b767e
-EBUILD libnids-1.18-r4.ebuild 1168 SHA256 da8c706c26a64ec25d0e789a05a000f3d69190a757518ab7d3236d3ad0a087b9 SHA512 a6b32b6a6c762bb6edf2bad6ca095846226f6f476173904288d449c62531389d4bc7f9273aa28a8e1ac4ce950d9b0b63382df54c19d2783b6e2d8727ac259527 WHIRLPOOL bed52ddc5b6656319dae5192e29496e809a3f28ae267b3f2bb7c9edb02d93c2e7cc96e996e3662514044662273f1394ad138c76041bffde324accac45b95eeec
 EBUILD libnids-1.24-r3.ebuild 1108 SHA256 d3d94675772caaf2b9e3b38713461e56aaff010dbcdd31d6bff4df983e7459b1 SHA512 4d6d66c0590e6db5ef0bc9b2e4fa549c12b4ce73a02409203069ec0839f1ee0bb9e15737b3bbf167c99498449913704e6b9bdfaa2827a310db615793fdfbe8e9 WHIRLPOOL 6ed7ac6397db9066de7d4295d37f51cd43195550f1f78349965ddcabfb864cdfe0a35d87b912dd7e0f0d86036d441d3c0e8b56a766e3d4ff66931b1992c10b5e
 EBUILD libnids-1.24-r4.ebuild 1139 SHA256 963c69cfd1858b58f1fca0e6e93a07640b6b84b12b2ed57afad002e0dc69464d SHA512 0b1f8915342a9e0c099662a15505502e8c7f649da4ab4afe396e7015fa6463164706b3b829ed916024bfc19d1a1b71eab9442ab1d585983999e6a52c372ede43 WHIRLPOOL 71afce8a593dd1fe5e9edeea7f2a6a1a37b6ce684cad10ee121673fa711060c0c4c78bde960c75acba14dd98ed2e8d6d68ef85d59e30b9ab9bef990c8098b51b
 EBUILD libnids-1.24-r5.ebuild 1188 SHA256 591164628239ca1d49850053646bd903069b4c3177418d5ada59983af3a33b44 SHA512 73a80a309bbe363a904c7782102baa6cd66870532a859e0604357f3c8f1c49198b3c554f3332994bffe60b45bb813b99bf1f65e78f2e62eee5481db4f354d683 WHIRLPOOL 4b24f694587c07a9cf3ec50a896c2b6327c38d22dd8137dcbf58f64a822c68f5d6ec9f2e19ea2557e008e963e92eedc0ba62f5e1ad5b5ac4dead7be76626c7ff
-MISC ChangeLog 9777 SHA256 9f6269e2dbccea6f4527e27bdf3a3856c1910f3a3819d605c60f0a6db8323b6f SHA512 1652e5dbec24051107947c44d5a275ddb68f7a4fa890e11cd4e367a95bcb35e03d907d4624bbf40187571be08fe5ffcf01caf96504233574bacf73b7704c64a3 WHIRLPOOL 093ca113b29dd0a34b33d2551ad7f8efe154e9808bde58841fd88ed66df483d742fa1bd8d138dfa7e25c0feb1dced3655b12f7e1a09b9bcf003348db9858a71e
+MISC ChangeLog 10026 SHA256 cb7b80d80412b598442a00e8da0934aed48d25f327d279abe3793bb6ed8f83ee SHA512 e96def858777d02a1fc7f1a2d8766221ef801e5bec6d5a68fabaf2a30cf3252247d716c231c26071ab11d9ffdc6fdcde858a89e9b4e96ec1995f28c958687b53 WHIRLPOOL 62b8b0c7bf9c21fd0ae029a882430ddfc972f96353c73ca5efd07d99ee03dd26818a00f15aac0eb266eecfec4d96980387b40a3f7b44bbab88db9e8bd90eda06
 MISC metadata.xml 483 SHA256 fea8cd5f14b2ecdcb26227be10d73862452542ea2ac9e41738c8dd1a1a093015 SHA512 96e105f85a639099f19a2f7ec4f3b11e43208b6a4c672d3b82d086e3395ed1e774e2af0caa052300dff1dfdc19bb4f6c4db3f6b5cae16f5173794e7bcb34be62 WHIRLPOOL c50852fa54623a77718eeb95309a7f9f3a71cbef8da85b6eac6e3809e639d9dc5c91eb72ab3839cb02246dec6c50a979e7e63f9e8ae31c306bf1582e293e1696
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNEAWQACgkQVWmRsqeSphMl5ACeILRFSkB9wScQyXZoQtbP7d8Y
-AxsAnjuyYio3pIH6QxvYG0jJZvD5tJml
-=xudA
+iEYEAREIAAYFAlNEQf0ACgkQVWmRsqeSphOg4ACeK/Yca0Yl2Yk6fTWOHFrgT7bc
+0RQAnigeOsCEYNlLeMPIe0ptetbEu8Is
+=gDFI
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch b/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
deleted file mode 100644
index b3e9e2cf4a92..000000000000
--- a/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/checksum.c
-+++ b/src/checksum.c
-@@ -29,6 +29,7 @@
- 	movl 16(%esp),%ecx	# Function arg: int len
-         movl 12(%esp),%esi	# Function arg: u_char *buff*/
- 
-+"	push %%ebx						\n"
- "	testl $2, %%esi						\n"		
- "	jz 2f							\n"			
- "	subl $2, %%ecx						\n"		
-@@ -84,10 +85,10 @@
- "5:	movb (%%esi),%%cl					\n"
- "6:	addl %%ecx,%%eax					\n"
- "	adcl $0, %%eax						\n"
--"7: 								\n"
-+"7: 	pop %%ebx						\n"
-        : "=a"(sum)
-        : "0"(sum), "c"(len), "S"(buff)
--       : "bx", "dx");
-+       : "dx");
- 
-   return (sum);
- }
diff --git a/net-libs/libnids/files/libnids-1.18-elif.patch b/net-libs/libnids/files/libnids-1.18-elif.patch
deleted file mode 100644
index cb7dfe8ee02b..000000000000
--- a/net-libs/libnids/files/libnids-1.18-elif.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/killtcp.c
-+++ b/src/killtcp.c
-@@ -100,6 +100,6 @@
-     if (initialized)
- 	abort();
- }
--#elif
-+#else
- #error Something wrong with LIBNET_VER
- #endif
diff --git a/net-libs/libnids/libnids-1.18-r2.ebuild b/net-libs/libnids/libnids-1.18-r2.ebuild
deleted file mode 100644
index aebf2c8fc915..000000000000
--- a/net-libs/libnids/libnids-1.18-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r2.ebuild,v 1.5 2013/06/29 18:27:09 ago Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
-SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.1"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.0-r3"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-chksum.c-ebx.patch \
-		"${FILESDIR}"/${P}-elif.patch \
-		"${FILESDIR}"/${PN}-1.24-ldflags.patch
-}
-
-src_configure() {
-	econf --enable-shared
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	use static-libs || rm -f "${D}"/usr/lib*/libnids.a
-	dodoc CHANGES CREDITS MISC README
-}
diff --git a/net-libs/libnids/libnids-1.18-r3.ebuild b/net-libs/libnids/libnids-1.18-r3.ebuild
deleted file mode 100644
index 918eb180436a..000000000000
--- a/net-libs/libnids/libnids-1.18-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r3.ebuild,v 1.1 2014/03/19 15:47:03 jer Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
-SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	net-libs/libpcap
-	>=net-libs/libnet-1.1.0-r3
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-chksum.c-ebx.patch \
-		"${FILESDIR}"/${P}-elif.patch \
-		"${FILESDIR}"/${PN}-1.24-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.24-static-libs.patch
-}
-
-src_configure() {
-	tc-export AR
-	econf --enable-shared
-}
-
-src_compile() {
-	emake shared $(usex static-libs static '')
-}
-
-src_install() {
-	local tgt
-	for tgt in _installshared $(usex static-libs _install ''); do
-		emake install_prefix="${D}" ${tgt}
-	done
-
-	dodoc CHANGES CREDITS MISC README
-}
diff --git a/net-libs/libnids/libnids-1.18-r4.ebuild b/net-libs/libnids/libnids-1.18-r4.ebuild
deleted file mode 100644
index 9b781f772f49..000000000000
--- a/net-libs/libnids/libnids-1.18-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r4.ebuild,v 1.1 2014/04/08 14:02:10 jer Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
-SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	net-libs/libpcap
-	>=net-libs/libnet-1.1.0-r3
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-chksum.c-ebx.patch \
-		"${FILESDIR}"/${P}-elif.patch \
-		"${FILESDIR}"/${PN}-1.24-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.24-static-libs.patch
-}
-
-src_configure() {
-	tc-export AR
-	append-flags -fno-strict-aliasing
-
-	econf --enable-shared
-}
-
-src_compile() {
-	emake shared $(usex static-libs static '')
-}
-
-src_install() {
-	local tgt
-	for tgt in _installshared $(usex static-libs _install ''); do
-		emake install_prefix="${D}" ${tgt}
-	done
-
-	dodoc CHANGES CREDITS MISC README
-}