Introduce SLOTting thanks to Azamat H. Hackimov (bug #384229).

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

7 files changed, 15 insertions, 141 deletions

diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog
index 6cc77a511d8b..14e1146b2c78 100644
--- a/dev-libs/libnl/ChangeLog
+++ b/dev-libs/libnl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libnl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.52 2011/10/10 11:05:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.53 2011/10/26 15:43:37 jer Exp $
+
+  26 Oct 2011; Jeroen Roovers <jer@gentoo.org> libnl-1.1-r2.ebuild,
+  -libnl-2.0.ebuild, -libnl-3.0.ebuild, -libnl-3.1.ebuild, libnl-3.2.1.ebuild:
+  Introduce SLOTting thanks to Azamat H. Hackimov (bug #384229).
 
 *libnl-3.2.1 (10 Oct 2011)
 
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 21c21c81bfbf..3f3a6117b424 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -6,21 +6,15 @@ AUX libnl-1.1-glibc-2.8-ULONG_MAX.patch 263 RMD160 574379a94679da2a5a76df66c8e8f
 AUX libnl-1.1-minor-leaks.patch 1179 RMD160 cde1b9a84e4e4446de6c65e4c13a633a3d1cd280 SHA1 152af4e17647881eed453eb2aa58239d43e88dfe SHA256 b423657e30be6b2589b9da7fc98507b658028786c4950295138769b0ff0cb171
 AUX libnl-1.1-vlan-header.patch 2378 RMD160 a4e5d43743fba547d3c7714c9d1894bec7e28697 SHA1 acd9b121ba4cb8c2c3db27b84a485bf8b94e0e8c SHA256 c9c7d8bf94ab06884f91ecd98977433be952530555aff37befc335f1f6312619
 DIST libnl-1.1.tar.gz 288932 RMD160 ebfc660302f31e5a94f03683f1ba85a3e057cf30 SHA1 54c7d02f93b09b43338e5cbf42f1373e83566577 SHA256 35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3
-DIST libnl-2.0.tar.gz 665303 RMD160 9d8b4665c53c302bb2e0d12abba05f7daf64d298 SHA1 7986fe6d7b4621afe484df4441c0b30bb7ff9681 SHA256 5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c
-DIST libnl-3.0.tar.gz 702592 RMD160 25b6e059e64db09dabe86a469a4693892fc690cf SHA1 200f750070ec49119c40eb6a3fdb1f67279f3a6c SHA256 7a505c3e1eabcfef277ae8e3bfa615e859fe9bd0303379bda6a5023e2a084ced
-DIST libnl-3.1.tar.gz 1138985 RMD160 06da8e6453c76442d75c1b2188f0c7aa36d8452b SHA1 2d21fe1ffe7fb975f160e35e05222aaeff6f7437 SHA256 a8daf538eaa99dee08b9f39c0558626837efc4696ce8ff6b5e92e89f2f3a31d4
 DIST libnl-3.2.1.tar.gz 1122313 RMD160 1adbeafe9b8aa536a17aa290c1aa5538f249828a SHA1 5d11f2f7abcb20de371b25621524a544e4cd3d19 SHA256 ab73a9c90e13ae39f0a3e8bf6c5255f9ed01d6164074b3ee5cedd8ae3d0b25e3
-EBUILD libnl-1.1-r2.ebuild 1057 RMD160 2454df5b693b9552c5568bb7b4a53f0b6cd59db7 SHA1 efe20c3f3943ca0b5542a42681fb718684d02408 SHA256 17b35d3fd30125a24963554f62d3b78fa3eecc7009ca037806c8f57135e25e00
-EBUILD libnl-2.0.ebuild 1008 RMD160 13cd5fd6028dbf98c833e317d027d212b60d7b32 SHA1 6eff9cfb1678d11234ec62c9fb81816a906ca00a SHA256 ae80e0f4e9da02c6d7ab98f75ebe63eeb3206efb4f4442ed2d97dc3b234890f7
-EBUILD libnl-3.0.ebuild 1008 RMD160 19cfaa10f8f533103cf24a17251b66e08f629551 SHA1 b9eae8c05eba6f80f18e2b6b09f362e27c9030e8 SHA256 15fe7474b1b958ec7648737cad51199d6f60484656d850985416453cdacb7a03
-EBUILD libnl-3.1.ebuild 818 RMD160 878beb089f0e81756e494485b575bf517be2d5b9 SHA1 72e7c5075f574e1e33b2b18a79ea34ab93b1d660 SHA256 05304b507aefd8f9c9abf322b1e86c5586b0bcab45ec0cf0034820c1eb200be4
-EBUILD libnl-3.2.1.ebuild 820 RMD160 ce9ac5015c4727ec1d9ba8c14adc719de08b58af SHA1 91cc9b53c9771d64cccbfa21cf365dafea6d5d43 SHA256 7029ad826d0ae9d7db2a3466aeb22526303b2c0737dc1e9260fa270e78c4f7ba
-MISC ChangeLog 7725 RMD160 105a19e3beaa3c9ad462f741c4c5d0ec5a20c887 SHA1 b5fc3d7263630e59e16e18c4866404d0a583cb9e SHA256 e7406d22426a5ecf0cc1f00fd6d6d95ec7a8b6e30d2a7628ea70a6d28a8be1e7
+EBUILD libnl-1.1-r2.ebuild 1059 RMD160 64bfab644ae4c94e2d4085a8a62f0682605a8021 SHA1 cb676346637c34b38cfb5888adc4d5bfa3174095 SHA256 17231e0cfd5a3983bc0476b862e7c8bd74cb19f45b3d4f2e768422f8acc64368
+EBUILD libnl-3.2.1.ebuild 820 RMD160 8cfeb9635e94f95cb32cf3f574af9c52d635988f SHA1 320ad98f0e0f896b5bc378c841177dc068471fe1 SHA256 c2aade7278b618550ba09429d568b37fa708c04fac915447c6a3eeeb2d03d534
+MISC ChangeLog 7938 RMD160 f8d5d176ae14f723b259e574c87c9d9aa93ecd15 SHA1 ed25f2885ad7d7454642bf5a8f9357dd7ce9198d SHA256 63a9ce35793725142466bedd62193fc03d8170ad8599b5a8e5b277bb55bd04d5
 MISC metadata.xml 257 RMD160 31a33f71ad088fc55f06494ce46f4278383bb012 SHA1 909146c787ae6f940d598fa431d6d3c2dbcbf594 SHA256 1cfcb15424f420e1604498f361a397b5f45a29da83a51808a6a0c14a9cabe219
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6S0YUACgkQVWmRsqeSphPD9ACfYdUAj+Tas87Tyk+gEC37s764
-82UAn1ZU+Fgjv1BvnMf1OCFmxRm3Gc/G
-=/KeQ
+iEYEARECAAYFAk6oKq8ACgkQVWmRsqeSphM69ACfaBSIwO/XLGBQY2GRtBglYW0p
+cLgAn34txts5NcAelFmYLkQkuV8p7nV0
+=A+ux
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libnl/libnl-1.1-r2.ebuild b/dev-libs/libnl/libnl-1.1-r2.ebuild
index 4a8fcf1a8e16..b85bc1805e88 100644
--- a/dev-libs/libnl/libnl-1.1-r2.ebuild
+++ b/dev-libs/libnl/libnl-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1-r2.ebuild,v 1.13 2011/03/29 14:20:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1-r2.ebuild,v 1.14 2011/10/26 15:43:37 jer Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="A library for applications dealing with netlink socket"
 HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
 SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="1.1"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc"
 
diff --git a/dev-libs/libnl/libnl-2.0.ebuild b/dev-libs/libnl/libnl-2.0.ebuild
deleted file mode 100644
index 8b1705312682..000000000000
--- a/dev-libs/libnl/libnl-2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-2.0.ebuild,v 1.2 2011/03/29 14:20:51 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc"
-		emake gendoc || die "emake gendoc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-
-	if use doc ; then
-		cd "${S}/doc"
-		dohtml -r html/*
-	fi
-}
diff --git a/dev-libs/libnl/libnl-3.0.ebuild b/dev-libs/libnl/libnl-3.0.ebuild
deleted file mode 100644
index 8f5da77ed5a0..000000000000
--- a/dev-libs/libnl/libnl-3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.0.ebuild,v 1.1 2011/03/29 14:20:51 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc"
-		emake gendoc || die "emake gendoc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-
-	if use doc ; then
-		cd "${S}/doc"
-		dohtml -r html/*
-	fi
-}
diff --git a/dev-libs/libnl/libnl-3.1.ebuild b/dev-libs/libnl/libnl-3.1.ebuild
deleted file mode 100644
index b9e488b645eb..000000000000
--- a/dev-libs/libnl/libnl-3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.1.ebuild,v 1.1 2011/08/20 22:32:44 jer Exp $
-
-EAPI="4"
-
-inherit eutils multilib autotools-utils
-
-DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	use static-libs || remove_libtool_files
-
-	dodoc ChangeLog
-}
diff --git a/dev-libs/libnl/libnl-3.2.1.ebuild b/dev-libs/libnl/libnl-3.2.1.ebuild
index 90cecea47492..f057a0f44cb1 100644
--- a/dev-libs/libnl/libnl-3.2.1.ebuild
+++ b/dev-libs/libnl/libnl-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.1.ebuild,v 1.1 2011/10/10 11:05:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.1.ebuild,v 1.2 2011/10/26 15:43:37 jer Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="A library for applications dealing with netlink socket"
 HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
 SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static-libs"