Remove old. Clean up patches.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

14 files changed, 14 insertions, 226 deletions

diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog
index 4b187c60b7ca..a04838c82ec2 100644
--- a/dev-libs/libnl/ChangeLog
+++ b/dev-libs/libnl/ChangeLog
@@ -1,6 +1,15 @@
 # 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.49 2011/03/29 14:20:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.50 2011/06/09 17:54:37 jer Exp $
+
+  09 Jun 2011; Jeroen Roovers <jer@gentoo.org> -libnl-0.5.0.ebuild,
+  -files/libnl-0.5.0-include.diff, -files/libnl-0.5.0-libdir.patch,
+  -libnl-1.0_pre6.ebuild, -libnl-1.0_pre6-r1.ebuild,
+  -files/libnl-1.0_pre5-__u64_x86_64.patch, -files/libnl-1.0_pre5-include.diff,
+  -files/libnl-1.0_pre6-__u64_x86_64.patch, -libnl-1.1.ebuild,
+  -libnl-1.1-r1.ebuild, files/libnl-1.1-flags.patch,
+  files/libnl-1.1-glibc-2.8-ULONG_MAX.patch, -files/libnl-1.pc:
+  Remove old. Clean up patches.
 
 *libnl-3.0 (29 Mar 2011)
 
diff --git a/dev-libs/libnl/files/libnl-0.5.0-include.diff b/dev-libs/libnl/files/libnl-0.5.0-include.diff
deleted file mode 100644
index f858953c8aef..000000000000
--- a/dev-libs/libnl/files/libnl-0.5.0-include.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-0.5.0.orig/include/netlink/route/tc.h	2005-09-08 19:13:15.000000000 -0300
-+++ libnl-0.5.0/include/netlink/route/tc.h	2005-09-08 19:32:33.000000000 -0300
-@@ -24,6 +24,7 @@
- #include <netlink/netlink.h>
- #include <netlink/cache.h>
- #include <netlink/data.h>
-+#include <linux/pkt_sched.h>
- 
- #define TCA_HAS_HANDLE    0x001
- #define TCA_HAS_PARENT    0x002
diff --git a/dev-libs/libnl/files/libnl-0.5.0-libdir.patch b/dev-libs/libnl/files/libnl-0.5.0-libdir.patch
deleted file mode 100644
index e9200ff54e02..000000000000
--- a/dev-libs/libnl/files/libnl-0.5.0-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/Makefile	2005-04-05 01:08:04.000000000 +0200
-+++ lib/Makefile	2005-10-08 13:15:52.000000000 +0200
-@@ -22,6 +22,8 @@
-     include ../Makefile.opts
- endif
- 
-+LIBDIR=$(prefix)/lib
-+
- # Core
- CIN      := $(wildcard *.c)
- # NETLINK_ROUTE
-@@ -67,12 +69,12 @@
- 	find .deps -iname \*\.d -exec rm -f '{}' \;
- 
- install:
--	mkdir -p $(DESTDIR)$(prefix)/lib/
--	install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib
--	rm -f $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) ; \
--	$(LN) -s $(DESTDIR)$(prefix)/lib/$(OUT_SLIB) $(DESTDIR)$(prefix)/lib/$(LN1_SLIB)
--	rm -f $(DESTDIR)$(prefix)/lib/$(LN_SLIB) ; \
--	$(LN) -s $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) $(DESTDIR)$(prefix)/lib/$(LN_SLIB)
-+	mkdir -p $(DESTDIR)$(LIBDIR)/
-+	install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
-+	rm -f $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) ; \
-+	$(LN) -s $(DESTDIR)$(LIBDIR)/$(OUT_SLIB) $(DESTDIR)$(LIBDIR)/$(LN1_SLIB)
-+	rm -f $(DESTDIR)$(LIBDIR)/$(LN_SLIB) ; \
-+	$(LN) -s $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) $(DESTDIR)$(LIBDIR)/$(LN_SLIB)
- 
- $(DEPS): ../Makefile.opts
- 
diff --git a/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch b/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch
deleted file mode 100644
index ffa61a182e4f..000000000000
--- a/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libnl-1.0-pre5/include/netlink-local.h.__u64_x86_64	2005-11-02 12:29:06.000000000 -0500
-+++ libnl-1.0-pre5/include/netlink-local.h	2006-05-26 20:09:28.000000000 -0400
-@@ -30,11 +30,7 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- 
--typedef uint8_t		__u8;
--typedef uint16_t	__u16;
--typedef uint32_t	__u32;
--typedef int32_t		__s32;
--typedef uint64_t	__u64;
-+#include <asm/types.h>
- 
- /* local header copies */
- #include <linux/if.h>
diff --git a/dev-libs/libnl/files/libnl-1.0_pre5-include.diff b/dev-libs/libnl/files/libnl-1.0_pre5-include.diff
deleted file mode 100644
index f858953c8aef..000000000000
--- a/dev-libs/libnl/files/libnl-1.0_pre5-include.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-0.5.0.orig/include/netlink/route/tc.h	2005-09-08 19:13:15.000000000 -0300
-+++ libnl-0.5.0/include/netlink/route/tc.h	2005-09-08 19:32:33.000000000 -0300
-@@ -24,6 +24,7 @@
- #include <netlink/netlink.h>
- #include <netlink/cache.h>
- #include <netlink/data.h>
-+#include <linux/pkt_sched.h>
- 
- #define TCA_HAS_HANDLE    0x001
- #define TCA_HAS_PARENT    0x002
diff --git a/dev-libs/libnl/files/libnl-1.0_pre6-__u64_x86_64.patch b/dev-libs/libnl/files/libnl-1.0_pre6-__u64_x86_64.patch
deleted file mode 100644
index fb89baa71bac..000000000000
--- a/dev-libs/libnl/files/libnl-1.0_pre6-__u64_x86_64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libnl-1.0-pre5/include/netlink-local.h.__u64_x86_64	2005-11-02 12:29:06.000000000 -0500
-+++ libnl-1.0-pre5/include/netlink-local.h	2006-05-26 20:09:28.000000000 -0400
-@@ -30,11 +30,7 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- 
--typedef uint8_t		__u8;
--typedef uint16_t	__u16;
--typedef uint32_t	__u32;
--typedef int32_t		__s32;
--typedef uint64_t	__u64;
-+#include <linux/types.h>
- 
- /* local header copies */
- #include <linux/if.h>
diff --git a/dev-libs/libnl/files/libnl-1.1-flags.patch b/dev-libs/libnl/files/libnl-1.1-flags.patch
index bb09b362660f..dc512c587b9e 100644
--- a/dev-libs/libnl/files/libnl-1.1-flags.patch
+++ b/dev-libs/libnl/files/libnl-1.1-flags.patch
@@ -1,5 +1,5 @@
---- libnl-1.1/lib/Makefile.orig	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/lib/Makefile	2009-05-26 09:47:42.000000000 +0200
+--- a/lib/Makefile
++++ b/lib/Makefile
 @@ -48,7 +48,7 @@
  
  $(OUT_SLIB): ../Makefile.opts $(OBJ)
diff --git a/dev-libs/libnl/files/libnl-1.1-glibc-2.8-ULONG_MAX.patch b/dev-libs/libnl/files/libnl-1.1-glibc-2.8-ULONG_MAX.patch
index 6042067e741c..67c67128c306 100644
--- a/dev-libs/libnl/files/libnl-1.1-glibc-2.8-ULONG_MAX.patch
+++ b/dev-libs/libnl/files/libnl-1.1-glibc-2.8-ULONG_MAX.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/show_bug.cgi?id=225393
 
---- include/netlink-local.h	2008-06-09 07:54:20 +0000
-+++ include/netlink-local.h	2008-06-09 07:54:47 +0000
+--- a/include/netlink-local.h
++++ b/include/netlink-local.h
 @@ -26,6 +26,7 @@
  #include <sys/socket.h>
  #include <inttypes.h>
diff --git a/dev-libs/libnl/files/libnl-1.pc b/dev-libs/libnl/files/libnl-1.pc
deleted file mode 100644
index 6dd5a895e28d..000000000000
--- a/dev-libs/libnl/files/libnl-1.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: libnl
-Description: Convenience library for netlink sockets
-Version: 1.0-pre3
-Libs: -L${libdir} -lnl
-Cflags:
diff --git a/dev-libs/libnl/libnl-0.5.0.ebuild b/dev-libs/libnl/libnl-0.5.0.ebuild
deleted file mode 100644
index 1f7e874067e5..000000000000
--- a/dev-libs/libnl/libnl-0.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-0.5.0.ebuild,v 1.11 2008/01/30 08:16:45 pva Exp $
-
-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="amd64 hppa ppc ~ppc64 x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-include.diff"
-	epatch "${FILESDIR}/${P}-libdir.patch"
-}
-
-src_install() {
-	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die
-}
diff --git a/dev-libs/libnl/libnl-1.0_pre6-r1.ebuild b/dev-libs/libnl/libnl-1.0_pre6-r1.ebuild
deleted file mode 100644
index ddfd4bc867fc..000000000000
--- a/dev-libs/libnl/libnl-1.0_pre6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.0_pre6-r1.ebuild,v 1.3 2010/05/22 13:33:30 armin76 Exp $
-
-inherit eutils multilib versionator
-
-MY_PV=$(replace_version_separator 2 '-' )-fix1
-MY_P="${PN}-${MY_PV}"
-
-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/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-	sed -i Makefile -e 's:install -o root -g root:install:'
-
-	cd "${S}/include"
-	sed -i Makefile -e 's:install -o root -g root:install:g'
-	epatch "${FILESDIR}/${PN}-1.0_pre5-include.diff"
-	epatch "${FILESDIR}/${P}-__u64_x86_64.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/dev-libs/libnl/libnl-1.0_pre6.ebuild b/dev-libs/libnl/libnl-1.0_pre6.ebuild
deleted file mode 100644
index 61137cbd099f..000000000000
--- a/dev-libs/libnl/libnl-1.0_pre6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.0_pre6.ebuild,v 1.10 2010/05/22 13:33:30 armin76 Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://dev.gentoo.org/~steev/distfiles/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 ~s390 x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/lib
-	sed -i Makefile -e 's:install -o root -g root:install:'
-	cd "${S}"/include
-	sed -i Makefile -e 's:install -o root -g root:install:g'
-	epatch "${FILESDIR}/${PN}-1.0_pre5-include.diff"
-	epatch "${FILESDIR}/${PN}-1.0_pre5-__u64_x86_64.patch"
-}
-
-src_install() {
-	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die
-	insinto /usr/share/pkgconfig/
-	doins "${FILESDIR}"/libnl-1.pc
-}
diff --git a/dev-libs/libnl/libnl-1.1-r1.ebuild b/dev-libs/libnl/libnl-1.1-r1.ebuild
deleted file mode 100644
index 910eb443d40f..000000000000
--- a/dev-libs/libnl/libnl-1.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1-r1.ebuild,v 1.14 2010/05/22 13:33:30 armin76 Exp $
-
-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"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-vlan-header.patch
-	epatch "${FILESDIR}"/${P}-minor-leaks.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.8-ULONG_MAX.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}
diff --git a/dev-libs/libnl/libnl-1.1.ebuild b/dev-libs/libnl/libnl-1.1.ebuild
deleted file mode 100644
index 741ae52dcace..000000000000
--- a/dev-libs/libnl/libnl-1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1.ebuild,v 1.3 2010/05/22 13:33:30 armin76 Exp $
-
-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="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}