Bump to eapi4 and make static libs optional, punt overshadowed as only consumer does not care about version.

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

9 files changed, 19 insertions, 445 deletions

diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog
index 264d3abe749d..ded146334d2e 100644
--- a/net-misc/vde/ChangeLog
+++ b/net-misc/vde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/vde
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.23 2010/08/26 01:28:02 dang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.24 2011/10/23 12:18:42 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/Unixterm_20070403.patch, -vde-1.5.7.ebuild, -vde-2.0.2.ebuild,
+  -vde-2.1.6.ebuild, -vde-2.1.6-r1.ebuild, -files/vde-2.1.6-gcc43.patch,
+  -vde-2.2.3.ebuild, vde-2.3.1.ebuild:
+  Bump to eapi4 and make static libs optional, punt overshadowed as only
+  consumer does not care about version.
 
 *vde-2.3.1 (26 Aug 2010)
 
diff --git a/net-misc/vde/files/Unixterm_20070403.patch b/net-misc/vde/files/Unixterm_20070403.patch
deleted file mode 100644
index 0d5a2a6cb8ee..000000000000
--- a/net-misc/vde/files/Unixterm_20070403.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -Naur vde2-2.1.6/unixterm/unixterm.c vde2-2.1.6-unixterm/unixterm/unixterm.c
---- vde2-2.1.6/unixterm/unixterm.c	2006-07-07 16:54:39.000000000 +0200
-+++ vde2-2.1.6/unixterm/unixterm.c	2007-04-03 12:49:14.000000000 +0200
-@@ -4,6 +4,8 @@
-  * Minimal terminal emulator on a UNIX stream socket
-  */
- 
-+/* render: addedd support for stdin commands */
-+
- #include <stdio.h>
- #include <fcntl.h>
- #include <stdlib.h>
-@@ -11,10 +13,12 @@
- #include <sys/poll.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--
-+#include <getopt.h>
- #include <vde.h>
- 
- #define BUFSIZE 1024
-+#define LINESIZE 1025
-+#define THRESHOLD 4
- char buf[BUFSIZE];
- 
- int main(int argc,char *argv[])
-@@ -23,25 +27,168 @@
- 	int fd;
- 	int rv;
- 	static struct pollfd pfd[]={
--		{STDIN_FILENO,POLLIN | POLLHUP,0},
--		{STDIN_FILENO,POLLIN | POLLHUP,0}};
-+		{STDIN_FILENO,POLLIN | POLLHUP, 0},
-+		{STDIN_FILENO,POLLIN | POLLHUP, 0}};
- 	static int fileout[]={STDOUT_FILENO,STDOUT_FILENO};
-+	int optret;
-+	char *sockpath, *sockname;
-+	char sentinel = 0;
-+	unsigned char injecting = 0;
-+	unsigned char optcount = 0;
-+	unsigned char failures = 0;
-+	unsigned char loggedout = 0;
-+	unsigned char ok_to_write = 0;
-+	
-+	/* options management loop */
-+	while (1) {
-+		static struct option options[] = {
-+			{"inject", 0, 0, 0},	/* get command list from stdin */
-+			{"socket", 1, 0, 0},	/* management socket */
-+			{0, 0, 0, 0}			/* default case */
-+		};
-+		int option_index = 0;
-+		
-+		if ((optret = getopt_long (argc, argv, "is:", options, &option_index)) == -1)
-+			break;
-+		
-+		optcount++;
-+
-+		switch (optret) {
-+			case 0:
-+				switch (option_index) {
-+					case 0:
-+						injecting = 1;
-+						break;
-+					case 1:
-+						if ((sockpath = strdup(optarg)) == NULL)
-+							fprintf(stderr, "strdup error\n");
-+						sockname = (char *)basename(sockpath);
-+						break;
-+					default:
-+						fprintf(stderr, "unknown long option\n");
-+						break;
-+				}
-+
-+				break;
-+
-+			case 'i':
-+				injecting = 1;
-+				break;
-+
-+			case 's':
-+				if ((sockpath = strdup(optarg)) == NULL)
-+					fprintf(stderr, "strdup error\n");
-+				sockname = (char *)basename(sockpath);
-+				break;
-+
-+			case '?':
-+				fprintf(stderr, "unknown short option\n");
-+				break;
-+
-+			default:
-+				fprintf(stderr, "default case!\n");
-+				break;
-+		}
-+	}
-+
- 	sun.sun_family=PF_UNIX;
--	snprintf(sun.sun_path,sizeof(sun.sun_path),"%s",argv[1]);
-+	snprintf(sun.sun_path,sizeof(sun.sun_path),"%s", optcount ? sockpath : argv[1]);
-+	
- 	fd=socket(PF_UNIX,SOCK_STREAM,0);
--	rv=connect(fd,(struct sockaddr *)(&sun),sizeof(sun));
-+
-+	if (connect(fd, (struct sockaddr *)(&sun), sizeof(sun)) < 0) {
-+		perror("connect");
-+		exit(-1);
-+	}
-+	
- 	pfd[1].fd=fileout[0]=fd;
-+	
- 	while(1) {
--		int m,i,n=poll(pfd,2,-1);
--		for(i=0;n>0;i++) {
--			if(pfd[i].revents & POLLHUP)
--				exit(0);
-+		int ccount,m,i,n = poll(pfd,2,-1);
-+		for(i = 0; n > 0; i++) {
- 			if(pfd[i].revents & POLLIN) {
--				n--;
--				if((m=read(pfd[i].fd,buf,BUFSIZE)) == 0)
-+				--n;
-+				if (injecting) {
-+					switch (i) {
-+						case 0:
-+							if (!feof(stdin)) {
-+								ccount = 0;
-+								
-+								if (sentinel > 0) {
-+									buf[ccount] = sentinel;
-+									ccount++;
-+								}
-+
-+								while ((buf[ccount] = fgetc(stdin)) != '\n' && !feof(stdin))
-+									ccount++;
-+								/* avoid write of empty lines */
-+								if ((ccount > 0) && (buf[0] != '\n')) {
-+									write(fileout[i],buf,ccount);
-+								}
-+								sentinel = fgetc(stdin);
-+							}
-+							/* end of stdin: logout from management console */	
-+							if (feof(stdin) && !loggedout) {
-+								write(fileout[i],"logout\n",strlen("logout\n"));
-+								loggedout = 1;
-+							}
-+
-+							break;
-+						case 1: {
-+							int cursor = 0;
-+							int base = 0;
-+							char line[LINESIZE];
-+							unsigned char start = 1;
-+							
-+							if ((m = read(pfd[i].fd,buf,BUFSIZE)) == 0)
-+								exit(0);
-+							
-+							while (cursor < m) {
-+								while ((buf[cursor] != '\n') && (cursor <= m))
-+									cursor++;
-+								
-+								memcpy(line, &buf[base], cursor - base + 1);
-+									
-+								if (!ok_to_write && (start = (strstr(line, "0000 DATA") == NULL))) {
-+									base += (cursor - base) + 1;
-+									cursor += 1;
-+								} else {
-+									if (ok_to_write && (strstr(line, ".\n") != NULL)) {
-+										ok_to_write = 0;
-+									}	
-+									
-+									if (ok_to_write) {
-+										write(fileout[i],sockname, strlen(sockname));
-+										write(fileout[i],": ", 2);
-+										write(fileout[i],line,cursor - base + 1);
-+									}
-+									else {
-+										if (!start) {
-+											ok_to_write = 1;
-+											start = 1;
-+										}
-+									}
-+									base += (cursor - base) + 1;
-+									cursor += 1;
-+								}
-+							}
-+
-+							break;
-+						}
-+					}
-+				} else {
-+					if((m=read(pfd[i].fd,buf,BUFSIZE)) == 0)
-+						exit(0);
-+					
-+					write(fileout[i],buf,m);
-+				}
-+			}
-+
-+			if(pfd[i].revents & POLLHUP) {
-+				--n;
-+				if (sentinel > 0)
- 					exit(0);
--				write(fileout[i],buf,m);
- 			}
--		}
--	}
-+		} /* for */
-+	} /* infinite while */
- }
diff --git a/net-misc/vde/files/vde-2.1.6-gcc43.patch b/net-misc/vde/files/vde-2.1.6-gcc43.patch
deleted file mode 100644
index 80122b26c75d..000000000000
--- a/net-misc/vde/files/vde-2.1.6-gcc43.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- slirpvde/slirpvde.c	2006-12-18 16:24:27.000000000 +0100
-+++ slirpvde/slirpvde.c	2008-07-10 15:44:39.000000000 +0200
-@@ -32,8 +32,8 @@
- 
- #include "misc.h"
- 
-+#include <limits.h>
- #ifdef VDE_DARWIN
--#	include <limits.h>
- #	if defined HAVE_SYSLIMITS_H
- #		include <syslimits.h>
- #	elif defined HAVE_SYS_SYSLIMITS_H
---- vde_plug2tap/vde_plug2tap.c	2006-12-18 14:49:57.000000000 +0100
-+++ vde_plug2tap/vde_plug2tap.c	2008-07-10 15:45:12.000000000 +0200
-@@ -30,9 +30,9 @@
- #include <linux/if_tun.h>
- #endif
- 
-+#include <limits.h>
- #ifdef VDE_DARWIN
- #	define TAP_PREFIX "/dev/"
--#	include <limits.h>
- #	if defined HAVE_SYSLIMITS_H
- #		include <syslimits.h>
- #	elif defined HAVE_SYS_SYSLIMITS_H
---- vdetaplib/libvdetap.c	2006-12-18 14:36:05.000000000 +0100
-+++ vdetaplib/libvdetap.c	2008-07-10 15:47:24.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <linux/ioctl.h>
- #include <linux/if.h>
- #include <linux/if_tun.h>
-+#include <limits.h>
- 
- #define TUNTAPPATH "/dev/net/tun"
- #define VDETAPEXEC LIBEXECDIR "/vdetap"
diff --git a/net-misc/vde/vde-1.5.7.ebuild b/net-misc/vde/vde-1.5.7.ebuild
deleted file mode 100644
index a28bfb98497c..000000000000
--- a/net-misc/vde/vde-1.5.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-1.5.7.ebuild,v 1.3 2010/10/28 09:39:29 ssuominen Exp $
-
-DESCRIPTION="vde is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${P}.tgz"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	mv Makefile Makefile.1
-	sed -e 's/ $(BIN_DIR)/ $(DESTDIR)$(BIN_DIR)/' <Makefile.1      >Makefile
-	cat Makefile
-	cd vdetaplib
-	mv Makefile Makefile.1
-	sed -e 's/ $(BIN_DIR)/ $(DESTDIR)$(BIN_DIR)/' -e 's/ $(LIB_DIR)/ $(DESTDIR)$(LIB_DIR)/' <Makefile.1      >Makefile
-	cd ..
-	cd doc
-	mv Makefile Makefile.1
-	sed -e 's/ $(MAN_DIR)/ $(DESTDIR)$(MAN_DIR)/'  <Makefile.1      >Makefile
-	cd ..
-	BIN_DIR=/usr/bin LIB_DIR=/usr/lib MAN_DIR=/usr/man emake || die
-}
-
-src_install() {
-
-	BIN_DIR=/usr/bin LIB_DIR=/usr/lib MAN_DIR=/usr/man make DESTDIR=${D} install || die
-
-	dodoc INSTALL PORTS README
-}
diff --git a/net-misc/vde/vde-2.0.2.ebuild b/net-misc/vde/vde-2.0.2.ebuild
deleted file mode 100644
index cede808365ea..000000000000
--- a/net-misc/vde/vde-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.0.2.ebuild,v 1.3 2006/10/24 03:31:57 dang Exp $
-
-inherit eutils
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/vde.init vde
-	newconfd "${FILESDIR}"/vde.conf vde
-
-	dodoc INSTALL README
-}
-
-pkg_postinst() {
-	# default group already used in kqemu
-	enewgroup qemu
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-	einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.1.6-r1.ebuild b/net-misc/vde/vde-2.1.6-r1.ebuild
deleted file mode 100644
index 8f397511eefe..000000000000
--- a/net-misc/vde/vde-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6-r1.ebuild,v 1.3 2008/07/20 14:38:55 loki_val Exp $
-
-inherit eutils
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/Unixterm_20070403.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/vde.init vde
-	newconfd "${FILESDIR}"/vde.conf vde
-
-	dodoc INSTALL README
-}
-
-pkg_postinst() {
-	# default group already used in kqemu
-	enewgroup qemu
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-	einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.1.6.ebuild b/net-misc/vde/vde-2.1.6.ebuild
deleted file mode 100644
index e3c97287131c..000000000000
--- a/net-misc/vde/vde-2.1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6.ebuild,v 1.2 2007/02/12 22:58:21 peper Exp $
-
-inherit eutils
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/vde.init vde
-	newconfd "${FILESDIR}"/vde.conf vde
-
-	dodoc INSTALL README
-}
-
-pkg_postinst() {
-	# default group already used in kqemu
-	enewgroup qemu
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-	einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.2.3.ebuild b/net-misc/vde/vde-2.2.3.ebuild
deleted file mode 100644
index 4c89c31504e8..000000000000
--- a/net-misc/vde/vde-2.2.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.2.3.ebuild,v 1.1 2009/10/21 09:43:46 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="pcap ssl"
-
-RDEPEND="pcap? ( net-libs/libpcap )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable pcap) \
-		$(use_enable ssl cryptcab)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/vde.init vde || die
-	newconfd "${FILESDIR}"/vde.conf vde || die
-
-	dodoc README Changelog || die
-}
-
-pkg_postinst() {
-	# default group already used in kqemu
-	enewgroup qemu
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-	einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.3.1.ebuild b/net-misc/vde/vde-2.3.1.ebuild
index 07f1e956955d..9131c38aa75e 100644
--- a/net-misc/vde/vde-2.3.1.ebuild
+++ b/net-misc/vde/vde-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.3.1.ebuild,v 1.1 2010/08/26 01:28:02 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.3.1.ebuild,v 1.2 2011/10/23 12:18:42 scarabeus Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-IUSE="pcap ssl"
+IUSE="pcap ssl static-libs"
 
 RDEPEND="pcap? ( net-libs/libpcap )
 	ssl? ( dev-libs/openssl )"
@@ -25,15 +25,16 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	econf \
 		$(use_enable pcap) \
-		$(use_enable ssl cryptcab)
+		$(use_enable ssl cryptcab) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/vde.init vde || die
-	newconfd "${FILESDIR}"/vde.conf vde || die
+	default
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 
-	dodoc README Changelog || die
+	newinitd "${FILESDIR}"/vde.init vde
+	newconfd "${FILESDIR}"/vde.conf vde
 }
 
 pkg_postinst() {